From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 14 Dec 2009 16:19:24 +0000 (+0000)
Subject: * progmodes/python.el (python-symbol-completions): Remove text
X-Git-Tag: emacs-pretest-23.1.91~90
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cffbb7542aeb3b798ae12fb01e4e4c508eb7cd0;p=emacs.git

* progmodes/python.el (python-symbol-completions): Remove text
properties from symbol string before calling python-send-receive.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50e5f878355..d0fe2e86fdd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-14  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/python.el (python-symbol-completions): Remove text
+	properties from symbol string before calling python-send-receive.
+
 2009-12-14  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-mi.el (gdb-frame-handler): Only set gud-lat-frame
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c401cdfbf54..104ea26689f 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -73,7 +73,6 @@
   (require 'compile)
   (require 'hippie-exp))
 
-(require 'sym-comp)
 (autoload 'comint-mode "comint")
 
 (defgroup python nil
@@ -2147,12 +2146,14 @@ Uses `python-beginning-of-block', `python-end-of-block'."
   "Return a list of completions of the string SYMBOL from Python process.
 The list is sorted.
 Uses `python-imports' to load modules against which to complete."
-  (when symbol
+  (when (stringp symbol)
     (let ((completions
 	   (condition-case ()
 	       (car (read-from-string
 		     (python-send-receive
-		      (format "emacs.complete(%S,%s)" symbol python-imports))))
+		      (format "emacs.complete(%S,%s)"
+			      (substring-no-properties symbol)
+			      python-imports))))
 	     (error nil))))
       (sort
        ;; We can get duplicates from the above -- don't know why.