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

Author: Yuuki Harano

admin/merge-gnulib

@@ -50,7 +50,7 @@ GNULIB_MODULES='
 AVOIDED_MODULES='
   btowc close dup fchdir fstat langinfo lock
   malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
-  openat-die opendir raise
+  openat-die opendir pthread-h raise
   save-cwd select setenv sigprocmask stat stdarg stdbool
   threadlib tzset unsetenv utime utime-h
   wchar wcrtomb wctype-h

doc/emacs/ack.texi

@@ -285,7 +285,7 @@ Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German,
 Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte,
 Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize,
 Piotr Zieliński, and others also wrote various Org mode components.
-For more information, @pxref{History and acknowledgments,,, org, The Org Manual}.
+For more information, @pxref{History and Acknowledgments,,, org, The Org Manual}.
 
 @item
 Scott Draves wrote @file{tq.el}, help functions for maintaining

doc/emacs/calendar.texi

@@ -1599,7 +1599,7 @@ variables' values are 120.
   The timeclock package adds up time intervals, so you can (for
 instance) keep track of how much time you spend working on particular
 projects.  (A more advanced alternative is to use the Org Mode's
-facilities for clocking time, @pxref{Clocking work time,,,org, The Org
+facilities for clocking time, @pxref{Clocking Work Time,,,org, The Org
 Manual}).
 
 @findex timeclock-in

doc/emacs/frames.texi

@@ -1302,9 +1302,9 @@ variable @code{tab-bar-tab-name-function}.
 @end table
 
 @vindex tab-bar-new-tab-choice
-  By default, a new tab starts with the current buffer that was
-current before calling the command that adds a new tab.  To start a
-new tab with other buffers, customize the variable
+  By default, a new tab starts with the buffer that was
+current before calling the command that adds a new tab.
+To start a new tab with other buffers, customize the variable
 @code{tab-bar-new-tab-choice}.
 
   The following commands are used to delete and operate on tabs:

doc/emacs/killing.texi

@@ -219,6 +219,8 @@ Kill to the end of the sentence (@code{kill-sentence}).
 Kill the following balanced expression (@code{kill-sexp}).  @xref{Expressions}.
 @item M-z @var{char}
 Kill through the next occurrence of @var{char} (@code{zap-to-char}).
+@item M-x zap-up-to-char @var{char}
+Kill up to, but not including, the next occurrence of @var{char}.
 @end table
 
 @kindex C-w
@@ -248,6 +250,10 @@ search backward and kill text before point.  A history of previously
 used characters is maintained and can be accessed via the
 @kbd{M-p}/@kbd{M-n} keystrokes.  This is mainly useful if the
 character to be used has to be entered via a complicated input method.
+@findex zap-up-to-char
+A similar command @code{zap-up-to-char} kills from point up to, but
+not including the next occurrence of a character, with numeric
+argument acting as a repeat count.
 
 @node Kill Options
 @subsection Options for Killing

doc/emacs/maintaining.texi

@@ -946,6 +946,7 @@ the file contents without distraction from the annotations.
 
 @node VC Change Log
 @subsection VC Change Log
+@cindex VC change log
 
 @table @kbd
 @item C-x v l
@@ -993,15 +994,25 @@ version-controlled directory tree (RCS, SCCS, CVS, and SRC do not
 support this feature).  With a prefix argument, the command prompts
 for the maximum number of revisions to display.  A numeric prefix
 argument specifies the maximum number of revisions without prompting.
-When the numeric prefix argument is @kbd{M-1}, the command prompts
-for the revision ID, and displays its log entry with a diff of changes.
+When the numeric prefix argument is 1, as in @w{@kbd{C-1 C-x v L}} or
+@w{@kbd{C-u 1 C-x v L}}, the command prompts for the revision ID, and
+displays the log entry of that revision together with the changes
+(diffs) it introduced.  (Some less capable version control systems,
+such as RCS and CVS, don't have commands to show a revision log with
+its diffs; for them the command displays only the log entry, and you
+can request to show the diffs by typing @kbd{d} or @kbd{D}, see
+below.)
 
   The @kbd{C-x v L} history is shown in a compact form, usually
 showing only the first line of each log entry.  However, you can type
 @key{RET} (@code{log-view-toggle-entry-display}) in the
 @file{*vc-change-log*} buffer to reveal the entire log entry for the
 revision at point.  A second @key{RET} hides it again.
 
+@kindex C-x v I
+@kindex C-x v O
+@findex vc-log-incoming
+@findex vc-log-outgoing
   On a decentralized version control system, the @kbd{C-x v I}
 (@code{vc-log-incoming}) command displays a log buffer showing the
 changes that will be applied, the next time you run the version
@@ -1014,6 +1025,8 @@ specific repository.  Similarly, @kbd{C-x v O}
 another repository, the next time you run the push command; with a
 prefix argument, it prompts for a specific destination repository.
 
+@cindex VC log buffer, commands in
+@cindex vc-log buffer
   In the @file{*vc-change-log*} buffer, you can use the following keys
 to move between the logs of revisions and of files, and to examine and
 compare past revisions (@pxref{Old Revisions}):
@@ -1426,11 +1439,13 @@ Mercurial in its normal mode of operation, each branch has its own
 working directory tree, so switching between branches just involves
 switching directories.  On Git, branches are normally @dfn{co-located}
 in the same directory, and switching between branches is done using
-the @command{git checkout} command, which changes the contents of the
+the @kbd{git checkout} command, which changes the contents of the
 working tree to match the branch you switch to.  Bazaar also supports
-co-located branches, in which case the @command{bzr switch} command
+co-located branches, in which case the @kbd{bzr switch} command
 will switch branches in the current directory.  With Subversion, you
-switch to another branch using the @command{svn switch} command.
+switch to another branch using the @kbd{svn switch} command.  With
+Mercurial, command @kbd{hg update} is used to swith to another
+branch.
 
   The VC command to switch to another branch in the current directory
 is @kbd{C-x v r @var{branch-name} @key{RET}} (@code{vc-retrieve-tag}).
@@ -1477,8 +1492,8 @@ On a decentralized version control system, the command @kbd{C-x v P}
 (@code{vc-push}) updates another location with changes from the
 current branch.  With a prefix argument, it prompts for the exact
 version control command to run, which lets you specify where to push
-changes; the default is @command{bzr push} with Bazaar, @command{git
-push} with Git, and @command{hg push} with Mercurial.  The default
+changes; the default is @kbd{bzr push} with Bazaar, @kbd{git
+push} with Git, and @kbd{hg push} with Mercurial.  The default
 commands always push to a default location determined by the version
 control system from your branch configuration.
 
@@ -1507,11 +1522,11 @@ control system.
 
   Amongst decentralized version control systems, @kbd{C-x v +} is
 currently supported only by Bazaar, Git, and Mercurial.  With Bazaar,
-it calls @command{bzr pull} for ordinary branches (to pull from a
-master branch into a mirroring branch), and @command{bzr update} for a
+it calls @kbd{bzr pull} for ordinary branches (to pull from a
+master branch into a mirroring branch), and @kbd{bzr update} for a
 bound branch (to pull from a central repository).  With Git, it calls
-@command{git pull} to fetch changes from a remote repository and merge
-it into the current branch.  With Mercurial, it calls @command{hg pull
+@kbd{git pull} to fetch changes from a remote repository and merge
+it into the current branch.  With Mercurial, it calls @kbd{hg pull
 -u} to fetch changesets from the default remote repository and update
 the working directory.
 
@@ -1542,11 +1557,12 @@ two branches.
 
   On a decentralized version control system, merging is done with the
 command @kbd{C-x v m} (@code{vc-merge}).  On Bazaar, this prompts for
-the exact arguments to pass to @command{bzr merge}, offering a
+the exact arguments to pass to @kbd{bzr merge}, offering a
 sensible default if possible.  On Git, this prompts for the name of a
 branch to merge from, with completion (based on the branch names known
-to the current repository).  The output from running the merge command
-is shown in a separate buffer.
+to the current repository).  With Mercurial, this prompts for argument
+to pass to @kbd{hg merge}.  The output from running the merge
+command is shown in a separate buffer.
 
   On a centralized version control system like CVS, @kbd{C-x v m}
 prompts for a branch ID, or a pair of revision IDs (@pxref{Switching

doc/emacs/text.texi

@@ -1452,7 +1452,7 @@ org-agenda}.  This command prompts for what you want to see: a list of
 things to do this week, a list of TODO items with specific keywords,
 etc.
 @ifnottex
-@xref{Agenda views,,,org, The Org Manual}, for details.
+@xref{Agenda Views,,,org, The Org Manual}, for details.
 @end ifnottex
 
 @node Org Authoring

doc/lispref/display.texi

@@ -2893,7 +2893,7 @@ This function returns the name of the font of face @var{face}.
 
 If the optional argument @var{frame} is specified, it returns the name
 of the font of @var{face} for that frame.  If @var{frame} is omitted or
-@code{nil}, the selected frame is used.  And, in this case, if the
+@code{nil}, the selected frame is used.  In the latter case, if the
 optional third argument @var{character} is supplied, it returns the font
 name used for @var{character}.
 @end defun
@@ -3934,12 +3934,14 @@ was remapped.  @xref{Face Remapping}.
 
 @defun default-font-width
 This function returns the average width in pixels of the font used by
-the current buffer's default face.
+the current buffer's default face, as that face is defined for the
+selected frame.
 @end defun
 
 @defun default-font-height
 This function returns the height in pixels of the font used by the
-current buffer's default face.
+current buffer's default face, as that face is defined for the
+selected frame.
 @end defun
 
 @defun window-font-width &optional window face

doc/lispref/files.texi

@@ -489,8 +489,6 @@ its copyright notice.
 @c Emacs 19 feature
 @defopt after-save-hook
 This normal hook runs after a buffer has been saved in its visited file.
-One use of this hook is in Fast Lock mode; it uses this hook to save the
-highlighting information in a cache file.
 @end defopt
 
 @defopt file-precious-flag