From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 9 Dec 2023 09:25:58 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca709f9c0667c8919396f86dc41d8ad4b921c7c6;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

ca709f9c0667c8919396f86dc41d8ad4b921c7c6
diff --cc etc/NEWS
index e76c8ccaa6a,17816e5f172..6dd0f9b5e4e
--- a/etc/NEWS
+++ b/etc/NEWS
@@@ -651,10 -651,10 +651,10 @@@ the minibuffer contents instead.  This 
  controlled with the new user option 'completion-auto-deselect', which
  is t by default.
  
 -*** New value 'historical' for user option 'completions-sort'
 +*** 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