aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-08 19:47:11 -0800
committerLars Ingebrigtsen2014-02-08 19:47:11 -0800
commita54a7552bec5c535dcb8f9ca4bec990f85a32417 (patch)
treebc9feee8798a73558399ae08d9ef6ca3e0d04528
parentb8f2e9d2ae257ad4edc68228205c2e8c0d4a4d44 (diff)
downloademacs-a54a7552bec5c535dcb8f9ca4bec990f85a32417.tar.gz
emacs-a54a7552bec5c535dcb8f9ca4bec990f85a32417.zip
* icomplete.el (icomplete-with-completion-tables): Doc fix.
Fixes: debbugs:11654
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/icomplete.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91a85c9b04a..dc95d6b02c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +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).
4
3 * font-lock.el (font-lock-value-in-major-mode): Clarify the 5 * font-lock.el (font-lock-value-in-major-mode): Clarify the
4 meaning of the parameter (bug#12282). 6 meaning of the parameter (bug#12282).
5 7
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index e3635a6216e..c3e9c678676 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -150,8 +150,9 @@ icompletion is occurring."
150(defcustom icomplete-with-completion-tables t 150(defcustom icomplete-with-completion-tables t
151 "Specialized completion tables with which icomplete should operate. 151 "Specialized completion tables with which icomplete should operate.
152 152
153Icomplete does not operate with any specialized completion tables 153If this variable is a list, Icomplete will not operate with any
154except those on this list." 154specialized completion tables except those on this list. If this
155variable is t, it won't restrict completion tables."
155 :version "24.4" 156 :version "24.4"
156 :type '(choice (const :tag "All" t) 157 :type '(choice (const :tag "All" t)
157 (repeat function))) 158 (repeat function)))