; Fix documentation of 'minibuffer-sort-by-history'

* etc/NEWS:
* lisp/minibuffer.el (completions-sort): Doc fix.

diff --git a/etc/NEWS b/etc/NEWS
index 93cecfe2d323429cbf6fe0c66a9a002fd350e2bc..17816e5f17298e0d430dd490e7d1bb34f31b8737 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -653,8 +653,8 @@ is t by default.
 
 *** New value 'historical' for user option 'completions-sort'
 When 'completions-sort' is set to 'historical', completion candidates
-will be sorted by their chronological order in the minibuffer history,
-with more recent candidates appearing first.
+will be first sorted alphabetically, and then re-sorted by their order
+in the minibuffer history, with more recent candidates appearing first.
 
 ** Pcomplete
 

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d35a487a6cf575f7129b603dc97661522e1c04a0..e5c5fd62f8c63b0227e0f1ec51edf217b7fafa74 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1323,7 +1323,9 @@ If it's nil, sorting is disabled.
 If it's the symbol `alphabetical', candidates are sorted by
 `minibuffer-sort-alphabetically'.
 If it's the symbol `historical', candidates are sorted by
-`minibuffer-sort-by-history'.
+`minibuffer-sort-by-history', which first sorts alphabetically,
+and then rearranges the order according to the order of the
+candidates in the minibuffer history.
 If it's a function, the function is called to sort the candidates.
 The sorting function takes a list of completion candidate
 strings, which it may modify; it should return a sorted list,