From 12c9762ee62aa53bccf778856018f91dc5ee5836 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 4 Oct 2014 09:46:21 -0700 Subject: [PATCH 1/2] doc/emacs small markup fixes * doc/emacs/misc.texi (Sorting): * doc/emacs/search.texi (Query Replace): Markup fixes. --- doc/emacs/ChangeLog | 3 +++ doc/emacs/misc.texi | 6 +++--- doc/emacs/search.texi | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a712d26fa28..773e3bb51e7 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2014-10-04 Glenn Morris + * misc.texi (Sorting): + * search.texi (Query Replace): Markup fixes. + * cmdargs.texi (Misc X): * display.texi (Optional Mode Line): * misc.texi (emacsclient Options): diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 09e606fe2fe..9d660f16e19 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. From c938c07bf3505a6d418678a04ff24f25d9039160 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sun, 5 Oct 2014 08:58:38 +0800 Subject: [PATCH 2/2] * imenu.el (imenu-default-goto-function): Fix typo. --- lisp/ChangeLog | 4 ++++ lisp/imenu.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5eb29577c9a..d5eda032f74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-10-05 Leo Liu + + * imenu.el (imenu-default-goto-function): Fix typo. + 2014-10-04 Glenn Morris * frame.el (frame-monitor-attributes) 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.