[Emacs-diffs] emacs/lisp ChangeLog progmodes/python.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/14 16:19:28

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : python.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16903&r2=1.16904
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/python.el?cvsroot=emacs&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16903
retrieving revision 1.16904
diff -u -b -r1.16903 -r1.16904
--- ChangeLog   14 Dec 2009 09:44:13 -0000      1.16903
+++ ChangeLog   14 Dec 2009 16:19:24 -0000      1.16904
@@ -1,3 +1,8 @@
+2009-12-14  Chong Yidong  <address@hidden>
+
+       * progmodes/python.el (python-symbol-completions): Remove text
+       properties from symbol string before calling python-send-receive.
+
 2009-12-14  Nick Roberts  <address@hidden>
 
        * progmodes/gdb-mi.el (gdb-frame-handler): Only set gud-lat-frame

Index: progmodes/python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- progmodes/python.el 7 Dec 2009 20:06:31 -0000       1.102
+++ progmodes/python.el 14 Dec 2009 16:19:28 -0000      1.103
@@ -73,7 +73,6 @@
   (require 'compile)
   (require 'hippie-exp))
 
-(require 'sym-comp)
 (autoload 'comint-mode "comint")
 
 (defgroup python nil
@@ -2147,12 +2146,14 @@
   "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.