summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-12-14 16:19:24 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-12-14 16:19:24 +0000
commit8cffbb7542aeb3b798ae12fb01e4e4c508eb7cd0 (patch)
tree43e2c82abae73b74f4b9730aeadd919b8e0c2e68 /lisp/progmodes
parente960eea6858c14dc39134438ef72040e53d94b97 (diff)
downloademacs-8cffbb7542aeb3b798ae12fb01e4e4c508eb7cd0.tar.gz
* progmodes/python.el (python-symbol-completions): Remove text
properties from symbol string before calling python-send-receive.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/python.el7
1 files changed, 4 insertions, 3 deletions
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.