Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca

5 files changed, 15 insertions, 7 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4014725adf0..59d4280e789 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,11 @@
+2014-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * misc.texi (Sorting):
+        * search.texi (Query Replace): Markup fixes.
+
 2014-10-04  Martin Rudalics  <rudalics@gmx.at>
 
-        * frames.texi (Scroll Bars): Describe use of horizontal scroll
-        bars.
+        * frames.texi (Scroll Bars): Describe use of horizontal scroll bars.
 
 2014-10-04  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 1a865c70cdd..af4d21fe180 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1935,9 +1935,9 @@ They divide the text of the region into many @dfn{sort records},
 identify a @dfn{sort key} for each record, and then reorder the records
 into the order determined by the sort keys.  The records are ordered so
 that their keys are in alphabetical order, or, for numeric sorting, in
-numeric order.  In alphabetic sorting, all upper-case letters `A' through
-`Z' come before lower-case `a', in accord with the @acronym{ASCII} character
-sequence.
+numeric order.  In alphabetic sorting, all upper-case letters @samp{A}
+through @samp{Z} come before lower-case @samp{a}, in accordance with the
+@acronym{ASCII} character sequence.
 
   The various sort commands differ in how they divide the text into sort
 records and in which part of each record is used as the sort key.  Most of
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 64ecf165349..bdfb534e186 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1337,7 +1337,7 @@ to replace all remaining occurrences without asking again.
 
 @item Y @r{(Upper-case)}
 to replace all remaining occurrences in all remaining buffers in
-multi-buffer replacements (like the Dired `Q' command which performs
+multi-buffer replacements (like the Dired @key{Q} command that performs
 query replace on selected files).  It answers this question and all
 subsequent questions in the series with "yes", without further
 user interaction.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a88ac6b37a..039387ed4af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-05  Leo Liu  <sdl.web@gmail.com>
+
+        * imenu.el (imenu-default-goto-function): Fix typo.
+
 2014-10-04  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
         * net/ntlm.el (ntlm-build-auth-request):
diff --git a/lisp/imenu.el b/lisp/imenu.el
index e5f33a5efb9..3159b6cc563 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1012,7 +1012,7 @@ to `imenu-update-menubar'.")
     (imenu item)
     nil))
 
-(defun imenu-default-goto-function (_name position &optional _rest)
+(defun imenu-default-goto-function (_name position &rest _rest)
   "Move to the given position.
 
 NAME is ignored.  POSITION is where to move.  REST is also ignored.