Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

4 files changed, 17 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fd19c4a467..5e26ee1fca1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-21  Chong Yidong  <cyd@gnu.org>
+
+        * sort.el (sort-subr): Doc fix (Bug#13056).
+
+2012-12-21  Bastien Guerry  <bzg@gnu.org>
+
+        * progmodes/etags.el (tags-search): Fix typo.  Bug #13232.
+
 2012-12-21  Michael Albinus  <michael.albinus@gmx.de>
 
         * simple.el (process-file): Overwrite stderr file, if exists.
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 095a7229c60..167fd36fe82 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -9735,7 +9735,7 @@ If FILE-LIST-FORM is non-nil, it should be a form that, when
 evaluated, will return a list of file names.  The search will be
 restricted to these files.
 
-Aleso see the documentation of the `tags-file-name' variable.
+Also see the documentation of the `tags-file-name' variable.
 
 \(fn REGEXP &optional FILE-LIST-FORM)" t nil)
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 067d89781d2..b3728a3abf3 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1869,7 +1869,7 @@ If FILE-LIST-FORM is non-nil, it should be a form that, when
 evaluated, will return a list of file names.  The search will be
 restricted to these files.
 
-Aleso see the documentation of the `tags-file-name' variable."
+Also see the documentation of the `tags-file-name' variable."
   (interactive "sTags search (regexp): ")
   (if (and (equal regexp "")
            (eq (car tags-loop-scan) 're-search-forward)
diff --git a/lisp/sort.el b/lisp/sort.el
index cd0b4433ab3..7a3adfdc5e3 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -77,8 +77,13 @@ ENDKEYFUN moves from the start of the sort key to the end of the sort key.
 ENDKEYFUN may be nil if STARTKEYFUN returns a value or if it would be the
 same as ENDRECFUN.
 
-PREDICATE is the function to use to compare keys.  If keys are numbers,
-it defaults to `<', otherwise it defaults to `string<'."
+PREDICATE, if non-nil, is the predicate function for comparing
+keys; it is called with two arguments, the keys to compare, and
+should return non-nil if the first key should sort before the
+second key.  If PREDICATE is nil, comparison is done with `<' if
+the keys are numbers, with `compare-buffer-substrings' if the
+keys are cons cells (the car and cdr of each cons cell are taken
+as start and end positions), and with `string<' otherwise."
   ;; Heuristically try to avoid messages if sorting a small amt of text.
   (let ((messages (> (- (point-max) (point-min)) 50000)))
     (save-excursion