summaryrefslogtreecommitdiff
path: root/lisp/minibuffer.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-05-25 13:57:59 -0400
committerEli Zaretskii <eliz@gnu.org>2022-05-25 13:57:59 -0400
commit97bb31be9f4e06060f2d192b049c3cdb47aca2f5 (patch)
tree1c7e537561f05e65f43689dc9603056f96962402 /lisp/minibuffer.el
parent9661c82920cf2b75300266bbd9da9e45b9471173 (diff)
parent86b49d58652a8f59a3489bf15b367ec224e17ae7 (diff)
downloademacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.gz
emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.bz2
emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.zip
Merge from origin/emacs-28
86b49d5865 ; * etc/NEWS: Announce changes in 'desktop-kill'. (Bug#55... d5ccf2621a ; Fix last change f1c1fd7184 Improve documentation of mail-user-agent. b05d1e9b98 ; * lisp/desktop.el: Update the commentary. (Bug#55560) 139bfa1a08 More fixes in abbrev.el doc strings d80dea6036 Add note about Tramp completion to completion-styles doc s... 9e7c0cf57d Remove mention of removed nnimap-nov-is-evil variable 90aae0bca2 Improve documentation strings and prompts in abbrev.el dfa3e6f424 Restore the Fselect_window call in gui_consider_frame_title. de35e9728f Advise against settings in the MS-Windows system registry 3ffa3d3403 ; Minor addition to make-tarball.txt 7dc026f9ea Fix kmacro-keymap binding after previous change 4f0fd54bc4 Add glossary entries for "interactively" af1c05a3c4 Fix the name of a kmacro command. # Conflicts: # etc/NEWS # lisp/abbrev.el
Diffstat (limited to 'lisp/minibuffer.el')
-rw-r--r--lisp/minibuffer.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 8287007d322..6694340e021 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1001,7 +1001,11 @@ and DOC describes the way this style of completion works.")
The available styles are listed in `completion-styles-alist'.
Note that `completion-category-overrides' may override these
-styles for specific categories, such as files, buffers, etc."
+styles for specific categories, such as files, buffers, etc.
+
+Note that Tramp host name completion (e.g., \"/ssh:ho<TAB>\")
+currently doesn't work if this list doesn't contain at least one
+of `basic', `emacs22' or `emacs21'."
:type completion--styles-type
:version "23.1")