* lisp/pcomplete.el (pcomplete-std-complete): Don't abuse

completion-at-point.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48e4530461f68f27ab620494fefa30cf457b1813..4d9c16b1744734696d4f13cb73faa9ca6f805dd8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * pcomplete.el (pcomplete-std-complete): Don't abuse
+       completion-at-point.
+
 2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
 
        * calc/calccomp.el (math-comp-to-string-flat-term): Simplify by

diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 6ee617d986276df38c3b8bf4159ee6f7ec6d7d41..5111e632c2ff7aa21e8ac982710b2f663b2ec543 100644 (file)
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -545,8 +545,9 @@ Same as `pcomplete' but using the standard completion UI."
  ;; variables to parse args, so there's no point autoloading it.
  ;; ;;;###autoload
 (defun pcomplete-std-complete ()
-  (let ((completion-at-point-functions '(pcomplete-completions-at-point)))
-    (completion-at-point)))
+  (let ((data pcomplete-completions-at-point))
+    (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
+                          (plist-get :predicate (nthcdr 3 data)))))
 
 ;;; Pcomplete's native UI.