[Emacs-diffs] trunk r118053: Merge from emacs-24; up to r117555

[Glenn Morris]

------------------------------------------------------------
revno: 118053 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-05 10:19:23 -0700
message:
  Merge from emacs-24; up to r117555
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/misc.texi            misc.texi-20091113204419-o5vbwnq5f7feedwu-6267
  doc/emacs/search.texi          
search.texi-20091113204419-o5vbwnq5f7feedwu-6276
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/imenu.el                  imenu.el-20091113204419-o5vbwnq5f7feedwu-696

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-10-04 08:20:24 +0000
+++ b/doc/emacs/ChangeLog       2014-10-05 17:19:23 +0000
@@ -1,7 +1,11 @@
+2014-10-05  Glenn Morris  <address@hidden>
+
+       * misc.texi (Sorting):
+       * search.texi (Query Replace): Markup fixes.
+
 2014-10-04  Martin Rudalics  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2014-10-04 07:05:21 +0000
+++ b/doc/emacs/misc.texi       2014-10-05 17:19:23 +0000
@@ -1935,9 +1935,9 @@
 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
address@hidden 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

=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi     2014-07-03 23:52:42 +0000
+++ b/doc/emacs/search.texi     2014-10-04 16:46:21 +0000
@@ -1337,7 +1337,7 @@
 
 @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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-04 19:23:42 +0000
+++ b/lisp/ChangeLog    2014-10-05 17:19:23 +0000
@@ -1,3 +1,7 @@
+2014-10-05  Leo Liu  <address@hidden>
+
+       * imenu.el (imenu-default-goto-function): Fix typo.
+
 2014-10-04  Thomas Fitzsimmons  <address@hidden>
 
        * net/ntlm.el (ntlm-build-auth-request):

=== modified file 'lisp/imenu.el'
--- a/lisp/imenu.el     2014-02-22 21:20:49 +0000
+++ b/lisp/imenu.el     2014-10-05 00:58:38 +0000
@@ -1012,7 +1012,7 @@
     (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.