aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-08 19:49:02 -0800
committerLars Ingebrigtsen2014-02-08 19:49:02 -0800
commitc359b7bd77cba2b4a90fec69af577f22ebe88b69 (patch)
tree03247ae1feefcd1d07f40d368ff5a79f441b5dd0
parenta54a7552bec5c535dcb8f9ca4bec990f85a32417 (diff)
downloademacs-c359b7bd77cba2b4a90fec69af577f22ebe88b69.tar.gz
emacs-c359b7bd77cba2b4a90fec69af577f22ebe88b69.zip
(icomplete-simple-completing-p): Mention the previous variable.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/icomplete.el3
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc95d6b02c3..dae61985be1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12014-02-09 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-09 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). 3 * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654).
4 (icomplete-simple-completing-p): Mention the previous variable.
4 5
5 * font-lock.el (font-lock-value-in-major-mode): Clarify the 6 * font-lock.el (font-lock-value-in-major-mode): Clarify the
6 meaning of the parameter (bug#12282). 7 meaning of the parameter (bug#12282).
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index c3e9c678676..a02a156009c 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -237,7 +237,8 @@ Conditions are:
237 and not in the middle of macro execution, 237 and not in the middle of macro execution,
238 and the completion table is not a function (which would 238 and the completion table is not a function (which would
239 indicate some non-standard, non-simple completion mechanism, 239 indicate some non-standard, non-simple completion mechanism,
240 like file-name and other custom-func completions)." 240 like file-name and other custom-func completions),
241 and `icomplete-with-completion-tables' doesn't restrict completion."
241 242
242 (unless executing-kbd-macro 243 (unless executing-kbd-macro
243 (let ((table (icomplete--completion-table))) 244 (let ((table (icomplete--completion-table)))