Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

.dir-locals.el

@@ -1,3 +1,6 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
          (fill-column . 70)

admin/unidata/uvs.el

@@ -1,4 +1,4 @@
-;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts.
+;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
@@ -30,7 +30,7 @@
 ;;; Code:
 
 (defun uvs-fields-total-size (fields)
-  (apply '+ (mapcar (lambda (field) (get field 'uvs-field-size)) fields)))
+  (apply #'+ (mapcar (lambda (field) (get field 'uvs-field-size)) fields)))
 
 ;;; Fields in Format 14 header.
 (defconst uvs-format-14-header-fields
@@ -85,7 +85,8 @@ where selectors and bases are sorted in ascending order."
 		    "\\(?:" (regexp-quote collection-id) "\\)"
 		    "[[:blank:]]*;[[:blank:]]*"
 		    "\\([^\n[:blank:]]+\\)"
-		    "[[:blank:]]*$") nil t)
+		    "[[:blank:]]*$")
+	    nil t)
       (let* ((base (string-to-number (match-string 1) 16))
 	     (selector (string-to-number (match-string 2) 16))
 	     (sequence-id (match-string 3))
@@ -105,7 +106,7 @@ where selectors and bases are sorted in ascending order."
   "Convert integer VALUE to a list of SIZE bytes.
 The most significant byte comes first."
   (let (result)
-    (dotimes (i size)
+    (dotimes (_ size)
       (push (logand value #xff) result)
       (setq value (ash value -8)))
     result))
@@ -118,17 +119,17 @@ respectively.  Byte length of each value is determined by the
   (while fields
     (let ((field (car fields))
 	  (value (car values)))
-      (insert (apply 'unibyte-string
+      (insert (apply #'unibyte-string
 		     (uvs-int-to-bytes value (get field 'uvs-field-size))))
       (setq fields (cdr fields) values (cdr values)))))
 
 (defun uvs-insert-alist-as-bytes (uvs-alist)
   "Insert UVS-ALIST as a sequence of bytes to the current buffer."
   (let* ((nrecords (length uvs-alist))	; # of selectors
 	 (total-nmappings
-	  (apply '+ (mapcar
-		     (lambda (selector-bgs) (length (cdr selector-bgs)))
-		     uvs-alist)))
+	  (apply #'+ (mapcar
+		      (lambda (selector-bgs) (length (cdr selector-bgs)))
+		      uvs-alist)))
 	 (non-default-offset
 	  (+ uvs-format-14-header-size
 	     (* uvs-variation-selector-record-size nrecords))))
@@ -158,23 +159,23 @@ respectively.  Byte length of each value is determined by the
 				    (car base-glyph)
 				    (cdr base-glyph))))))
 
-(defun uvs-dump (&optional bytes-per-line separator separator-eol line-prefix)
+(defun uvs-dump (&optional bytes-per-line separator separator-eol bol-prefix)
   "Print the current buffer as in representation of C array contents."
   (or bytes-per-line (setq bytes-per-line 8))
   (or separator (setq separator ", "))
   (or separator-eol (setq separator-eol ","))
-  (or line-prefix (setq line-prefix "    "))
+  (or bol-prefix (setq bol-prefix "    "))
   (goto-char (point-min))
   (while (> (- (point-max) (point)) bytes-per-line)
-    (princ line-prefix)
+    (princ bol-prefix)
     (princ (mapconcat (lambda (byte) (format "0x%02x" byte))
 		      (string-to-unibyte
 		       (buffer-substring (point) (+ (point) bytes-per-line)))
 		      separator))
     (princ separator-eol)
     (terpri)
     (forward-char bytes-per-line))
-  (princ line-prefix)
+  (princ bol-prefix)
   (princ (mapconcat (lambda (byte) (format "0x%02x" byte))
 		    (string-to-unibyte
 		     (buffer-substring (point) (point-max)))

doc/emacs/buffers.texi

@@ -725,6 +725,22 @@ of directories.
 the variable @code{icomplete-mode} to @code{t} (@pxref{Easy
 Customization}).
 
+@findex fido-mode
+@cindex fido mode
+
+  An alternative to Icomplete mode is Fido mode.  This is very similar
+to Icomplete mode, but retains some functionality from a popular
+extension called Ido mode (in fact the name is derived from ``Fake
+Ido'').  Among other things, in Fido mode, @kbd{C-s} and @kbd{C-r} are
+also used to rotate the completions list, @kbd{C-k} can be used to
+delete files and kill buffers in-list.  Another noteworthy aspect is
+that @code{flex} is used as the default completion style
+(@pxref{Completion Styles}).
+
+  To enable Fido mode, type @kbd{M-x fido-mode}, or customize
+the variable @code{fido-mode} to @code{t} (@pxref{Easy
+Customization}).
+
 @node Buffer Menus
 @subsection Customizing Buffer Menus
 

doc/emacs/frames.texi

@@ -592,9 +592,9 @@ command can be helpful.  It describes the character at point, and
 names the font that it's rendered in.
 
 @cindex fontconfig
-  On X, there are four different ways to express a font name.  The
-first is to use a @dfn{Fontconfig pattern}.  Fontconfig patterns have
-the following form:
+  There are four different ways to express a font name.  The first is
+to use a @dfn{Fontconfig pattern}.  Fontconfig patterns have the
+following form:
 
 @example
 @var{fontname}[-@var{fontsize}][:@var{name1}=@var{values1}][:@var{name2}=@var{values2}]...
@@ -650,6 +650,10 @@ For a more detailed description of Fontconfig patterns, see the
 Fontconfig manual, which is distributed with Fontconfig and available
 online at @url{https://fontconfig.org/fontconfig-user.html}.
 
+On MS-Windows, only the subset of the form
+@var{fontname}[-@var{fontsize}] is supported for all fonts; the full
+Fontconfig pattern might not work for all of them.
+
 @cindex GTK font pattern
   The second way to specify a font is to use a @dfn{GTK font pattern}.
 These have the syntax
@@ -685,12 +689,15 @@ Monospace 12
 Monospace Bold Italic 12
 @end example
 
+On MS-Windows, only the subset @var{fontname} is supported.
+
 @cindex XLFD
 @cindex X Logical Font Description
   The third way to specify a font is to use an @dfn{XLFD} (@dfn{X
 Logical Font Description}).  This is the traditional method for
-specifying fonts under X@.  Each XLFD consists of fourteen words or
-numbers, separated by dashes, like this:
+specifying fonts under X, and is also supported on MS-Windows.  Each
+XLFD consists of fourteen words or numbers, separated by dashes, like
+this:
 
 @example
 -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
@@ -774,6 +781,8 @@ equivalent to
 -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
 @end example
 
+This form is not supported on MS-Windows.
+
 @cindex client-side fonts
 @cindex server-side fonts
   On X, Emacs recognizes two types of fonts: @dfn{client-side} fonts,

doc/emacs/msdos.texi

@@ -1133,6 +1133,15 @@ file.  (If the function returns @code{nil}, you have no fonts
 installed that can display characters from the scripts which need this
 facility.)
 
+@vindex w32-use-w32-font-dialog
+@vindex w32-fixed-font-alist
+The variable @code{w32-use-w32-font-dialog} controls the way fonts can
+be selected via @kbd{S-mouse-1} (@code{mouse-appearance-menu}).  If
+the value is @code{t}, the default, Emacs uses the standard Windows
+font selection dialog.  If the value is @code{nil}, Emacs instead pops
+a menu of a fixed set of fonts.  The fonts to appear in the menu are
+determined by @code{w32-fixed-font-alist}.
+
 @node Windows Misc
 @section Miscellaneous Windows-specific features
 

doc/emacs/package.texi

@@ -85,23 +85,32 @@ The following commands are available in the package menu:
 
 @table @kbd
 @item h
+@kindex h @r{(Package Menu)}
+@findex package-menu-quick-help
 Print a short message summarizing how to use the package menu
 (@code{package-menu-quick-help}).
 
 @item ?
 @itemx @key{RET}
+@kindex ? @r{(Package Menu)}
+@kindex RET @r{(Package Menu)}
+@findex package-menu-describe-package
 Display a help buffer for the package on the current line
 (@code{package-menu-describe-package}), similar to the help window
 displayed by the @kbd{C-h P} command (@pxref{Packages}).
 
 @item i
+@kindex i @r{(Package Menu)}
+@findex package-menu-mark-install
 Mark the package on the current line for installation
 (@code{package-menu-mark-install}).  If the package status is
 @samp{available}, this adds an @samp{I} character to the start of the
 line; typing @kbd{x} (see below) will download and install the
 package.
 
 @item d
+@kindex d @r{(Package Menu)}
+@findex package-menu-mark-delete
 Mark the package on the current line for deletion
 (@code{package-menu-mark-delete}).  If the package status is
 @samp{installed}, this adds a @samp{D} character to the start of the
@@ -110,52 +119,74 @@ line; typing @kbd{x} (see below) will delete the package.
 entails.
 
 @item ~
+@kindex ~ @r{(Package Menu)}
+@findex package-menu-mark-obsolete-for-deletion
 Mark all obsolete packages for deletion
 (@code{package-menu-mark-obsolete-for-deletion}).  This marks for
 deletion all the packages whose status is @samp{obsolete}.
 
 @item u
 @itemx @key{DEL}
+@kindex u @r{(Package Menu)}
+@findex package-menu-mark-unmark
 Remove any installation or deletion mark previously added to the
-current line by an @kbd{i} or @kbd{d} command.
+current line by an @kbd{i} or @kbd{d} command
+(@code{package-menu-mark-unmark}).
 
 @item U
+@kindex U @r{(Package Menu)}
+@findex package-menu-mark-upgrades
 Mark all package with a newer available version for upgrading
 (@code{package-menu-mark-upgrades}).  This places an installation mark
 on the new available versions, and a deletion mark on the old
 installed versions.
 
 @item x
+@kindex x @r{(Package Menu)}
 @vindex package-menu-async
+@findex package-menu-execute
 Download and install all packages marked with @kbd{i}, and their
 dependencies; also, delete all packages marked with @kbd{d}
 (@code{package-menu-execute}).  This also removes the marks.
 
+@item g
 @item r
-Refresh the package list (@code{package-menu-refresh}).  This fetches
-the list of available packages from the package archive again, and
-recomputes the package list.
+@kindex g @r{(Package Menu)}
+@kindex r @r{(Package Menu)}
+Refresh the package list (@code{revert-buffer}).  This fetches the
+list of available packages from the package archive again, and
+redisplays the package list.
 
 @item / k
+@kindex / k @r{(Package Menu)}
+@findex package-menu-filter-by-keyword
 Filter the package list by keyword
 (@code{package-menu-filter-by-keyword}).  This prompts for a keyword
 (e.g., @samp{games}), then shows only the packages that relate to that
 keyword.
 
 @item / n
+@kindex / n @r{(Package Menu)}
+@findex package-menu-filter-by-name
 Filter the package list by name (@code{package-menu-filter-by-name}).
 This prompts for a string, then shows only the packages whose names
 match a regexp with that value.
 
 @item / /
+@kindex / / @r{(Package Menu)}
+@findex package-menu-clear-filter
 Clear filter currently applied to the package list
 (@code{package-menu-clear-filter}).
 
 @item H
+@kindex H @r{(Package Menu)}
+@findex package-menu-hide-package
 Permanently hide packages that match a regexp
 (@code{package-menu-hide-package}).
 
 @item (
+@kindex ( @r{(Package Menu)}
+@findex package-menu-toggle-hiding
 Toggle visibility of old versions of packages and also of versions
 from lower-priority archives (@code{package-menu-toggle-hiding}).
 @end table

doc/emacs/windows.texi

@@ -181,12 +181,12 @@ the minibuffer window to one of the other windows, and later switch
 back and finish supplying the minibuffer argument that is requested.
 @xref{Minibuffer Edit}.
 
-@findex next-multiframe-window
+@findex next-window-any-frame
 The @code{other-window} command will normally only switch to the next
 window in the current frame (unless otherwise configured).  If you
 work in a multi-frame environment and you want windows in all frames
 to be part of the cycle, you can rebind @kbd{C-x o} to the
-@code{next-multiframe-window} command.  (@xref{Rebinding}, for how to
+@code{next-window-any-frame} command.  (@xref{Rebinding}, for how to
 rebind a command.)
 
 @kindex C-M-v

doc/lispref/display.texi

@@ -2248,10 +2248,8 @@ is equivalent to a Lisp symbol with the same name.}.  Named faces are
 defined using the @code{defface} macro (@pxref{Defining Faces}).
 Emacs comes with several standard named faces (@pxref{Basic Faces}).
 
-  Many parts of Emacs require named faces, and do not accept
-anonymous faces.  These include the functions documented in
-@ref{Attribute Functions}, and the variable @code{font-lock-keywords}
-(@pxref{Search-based Fontification}).  Unless otherwise stated, we
+  Some parts of Emacs require named faces (e.g., the functions
+documented in @ref{Attribute Functions}).  Unless otherwise stated, we
 will use the term @dfn{face} to refer only to named faces.
 
 @defun facep object
@@ -2467,16 +2465,18 @@ or a fontset.  @xref{Low-Level Font}, for information about font
 objects, font specs, and font entities.  @xref{Fontsets}, for
 information about fontsets.
 
-When specifying this attribute using @code{set-face-attribute}
-(@pxref{Attribute Functions}), you may also supply a font spec, a font
-entity, or a string.  Emacs converts such values to an appropriate
-font object, and stores that font object as the actual attribute
-value.  If you specify a string, the contents of the string should be
-a font name (@pxref{Fonts,,, emacs, The GNU Emacs Manual}); if the
-font name is an XLFD containing wildcards, Emacs chooses the first
-font matching those wildcards.  Specifying this attribute also changes
-the values of the @code{:family}, @code{:foundry}, @code{:width},
-@code{:height}, @code{:weight}, and @code{:slant} attributes.
+@anchor{face-font-attribute}
+When specifying this attribute using @code{set-face-attribute} or
+@code{set-face-font} (@pxref{Attribute Functions}), you may also
+supply a font spec, a font entity, or a string.  Emacs converts such
+values to an appropriate font object, and stores that font object as
+the actual attribute value.  If you specify a string, the contents of
+the string should be a font name (@pxref{Fonts,,, emacs, The GNU Emacs
+Manual}); if the font name is an XLFD containing wildcards, Emacs
+chooses the first font matching those wildcards.  Specifying this
+attribute also changes the values of the @code{:family},
+@code{:foundry}, @code{:width}, @code{:height}, @code{:weight}, and
+@code{:slant} attributes.
 
 @cindex inheritance, for faces
 @item :inherit
@@ -2834,7 +2834,14 @@ This sets the @code{:stipple} attribute of @var{face} to
 @end deffn
 
 @deffn Command set-face-font face font &optional frame
-This sets the @code{:font} attribute of @var{face} to @var{font}.
+Change the font-related attributes of @var{face} to those of
+@var{font} (a string or a font object).  @xref{face-font-attribute},
+for the supported formats of the @var{font} argument.  This function
+sets the attribute @code{:font} of the face, and indirectly also the
+@code{:family}, @code{:foundry}, @code{:width}, @code{:height},
+@code{:weight}, and @code{:slant} attributes, as defined by the font.
+If @var{frame} is non-@code{nil}, only change the attributes on the
+specified frame.
 @end deffn
 
 @defun set-face-bold face bold-p &optional frame
@@ -3661,7 +3668,10 @@ The font name (a string), in either XLFD, Fontconfig, or GTK+ format.
 @itemx :slant
 @itemx :width
 These have the same meanings as the face attributes of the same name.
-@xref{Face Attributes}.
+@xref{Face Attributes}.  @code{:family} and @code{:foundry} are
+strings, while the other three are symbols.  As example values,
+@code{:slant} may be @code{italic}, @code{:weight} may be @code{bold}
+and @code{:width} may be @code{normal}.
 
 @item :size
 The font size---either a non-negative integer that specifies the pixel