From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 29 Apr 2011 17:24:09 +0000 (-0300)
Subject: * lisp/pcomplete.el (pcomplete-std-complete): Don't abuse
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~174
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14a7fbd8c24c542236744e24593170790453e256;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48e4530461f..4d9c16b1744 100644
--- 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 6ee617d9862..5111e632c2f 100644
--- 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.