* pcomplete.el (pcomplete-here*): Backport fix for mistaken change

(bug#7959).

Fixes: debbugs:5935

2 files changed, 12 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2159eda340a..3b8da6fa373 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcomplete.el (pcomplete-here*): Backport fix for mistaken change
+        (bug#7959) and (bug#5935).
+
 2011-01-31  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
 
         * net/rcirc.el: Clean log filenames (Bug#7933).
@@ -6,8 +11,8 @@
 
 2011-01-31  Alan Mackenzie  <acm@muc.de>
 
-        * progmodes/cc-cmds.el (c-forward-over-illiterals): Continue
-        parsing if we encounter a naked # (Bug#7595).
+        * progmodes/cc-cmds.el (c-forward-over-illiterals):
+        Continue parsing if we encounter a naked # (Bug#7595).
         (c-beginning-of-statement): Avoid loop in locating the beginning
         of a macro.
 
@@ -17,8 +22,8 @@
 
 2011-01-29  Daiki Ueno  <ueno@unixuser.org>
 
-        * epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Don't
-        presume KEYEXPIRED and KEYREVOKED to be a fatal error status
+        * epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED):
+        Don't presume KEYEXPIRED and KEYREVOKED to be a fatal error status
         (Bug#7931).
 
 2011-01-29  Chong Yidong  <cyd@stupidchicken.com>
@@ -40,8 +45,8 @@
 
 2011-01-28  Kenichi Handa  <handa@m17n.org>
 
-        * international/quail.el (quail-keyboard-layout-alist): Remove
-        superfluous SPC for "pc105-uk" (bug#7927).
+        * international/quail.el (quail-keyboard-layout-alist):
+        Remove superfluous SPC for "pc105-uk" (bug#7927).
 
 2011-01-27  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index b3367dc4c74..309c266015f 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1113,7 +1113,7 @@ generate the completions list.  This means that the hook
 (defmacro pcomplete-here* (&optional form stub form-only)
   "An alternate form which does not participate in argument paring."
   (declare (debug t))
-  `(pcomplete-here (lambda () ,form) ,stub t ,form-only))
+  `(pcomplete-here ,form ,stub t ,form-only))
 
 ;; display support