* lisp/erc/erc-pcomplete.el (erc-pcomplete): Set this-command.

2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ec154fb7efa..5856a592ebf 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * erc-pcomplete.el (erc-pcomplete): Set this-command.
+
 2013-09-21  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-invite-only-mode, erc-toggle-channel-mode):
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 410a3c6d04c..67eb381e75f 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -82,10 +82,8 @@ for use on `completion-at-point-function'."
   "Complete the nick before point."
   (interactive)
   (when (> (point) (erc-beg-of-input-line))
-    (let ((last-command (if (eq last-command 'erc-complete-word)
-                            'pcomplete
-                          last-command)))
-      (call-interactively 'pcomplete))
+    (setq this-command 'pcomplete)
+    (call-interactively 'pcomplete)
     t))
 
 ;;; Setup function