From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 19 Nov 2009 22:03:36 +0000 (+0000)
Subject: (symbol-complete): Use completion-in-region.
X-Git-Tag: emacs-pretest-23.1.90~334
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31a1c4779ebf070fe4fabe06383b84a1938f900f;p=emacs.git

(symbol-complete): Use completion-in-region.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e9a2cdbe0f..67bc8e91431 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/sym-comp.el (symbol-complete): Use completion-in-region.
+
 	* filecache.el (file-cache-add-file): Use push and cons.
 	(file-cache-delete-file-regexp): Use push.
 	(file-cache-complete): Use completion-in-region.
diff --git a/lisp/progmodes/sym-comp.el b/lisp/progmodes/sym-comp.el
index ed49c9d1f83..a0f572266bd 100644
--- a/lisp/progmodes/sym-comp.el
+++ b/lisp/progmodes/sym-comp.el
@@ -143,14 +143,9 @@ to be set buffer-locally.  Variables `symbol-completion-symbol-function',
               (lambda (str)
                 (car-safe (cdr-safe
                            (funcall symbol-completion-transform-function
-                                    str))))))
-         (minibuffer-completion-table completions)
-         (minibuffer-completion-predicate predicate)
-         (ol (make-overlay (- (point) (length pattern)) (point) nil nil t)))
-      (overlay-put ol 'field 'sym-comp)
-      (unwind-protect
-          (call-interactively 'minibuffer-complete)
-        (delete-overlay ol))))
+                                    str)))))))
+    (completion-in-region (- (point) (length pattern)) (point)
+                          completions predicate)))
 
 (eval-when-compile (require 'hippie-exp))