aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-04-12 21:24:10 -0400
committerStefan Monnier2010-04-12 21:24:10 -0400
commit5b31b787b743ecc6d2e7454a57deaf12ca312f01 (patch)
treef4180aa49ab07ec103ec244bcf19c4c1d265c9fd
parent3b7e1d5fe9e2876b870dd49ac459639bad7a7e17 (diff)
downloademacs-5b31b787b743ecc6d2e7454a57deaf12ca312f01.tar.gz
emacs-5b31b787b743ecc6d2e7454a57deaf12ca312f01.zip
* pcomplete.el (pcomplete-here*): Fix mistaken change (bug#5935).
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/pcomplete.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48a88fd0d0a..aade0e50854 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-04-13 Stefan Monnier <monnier@iro.umontreal.ca> 12010-04-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * pcomplete.el (pcomplete-here*): Fix mistaken change (bug#5935).
4
3 * emacs-lisp/easy-mmode.el (define-minor-mode): Passing a nil argument 5 * emacs-lisp/easy-mmode.el (define-minor-mode): Passing a nil argument
4 to the minor mode function now turns the mode ON unconditionally. 6 to the minor mode function now turns the mode ON unconditionally.
5 7
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 80f09492fee..65c05ae7487 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1113,7 +1113,7 @@ generate the completions list. This means that the hook
1113(defmacro pcomplete-here* (&optional form stub form-only) 1113(defmacro pcomplete-here* (&optional form stub form-only)
1114 "An alternate form which does not participate in argument paring." 1114 "An alternate form which does not participate in argument paring."
1115 (declare (debug t)) 1115 (declare (debug t))
1116 `(pcomplete-here (lambda () ,form) ,stub t ,form-only)) 1116 `(pcomplete-here ,form ,stub t ,form-only))
1117 1117
1118;; display support 1118;; display support
1119 1119