summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-01-20 03:57:19 +0000
committerGlenn Morris <rgm@gnu.org>2008-01-20 03:57:19 +0000
commit9ce3eb9a3f063114a137e6c25328d0d100760fcb (patch)
tree950a733523f8e3fa081997fedfe52a86a8aca33a
parent569382c2b4e38392a41052a6ecbc97b92760bf4b (diff)
downloademacs-9ce3eb9a3f063114a137e6c25328d0d100760fcb.tar.gz
Martin Svenson <phromo at gmail.com> (tiny change)
(python-imports): Default to "None".
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/python.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f7c6e73504..20aadb3c658 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-20 Martin Svenson <phromo@gmail.com> (tiny change)
+
+ * progmodes/python.el (python-imports): Default to "None".
+
2008-01-19 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/sh-script.el (sh-basic-offset):
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 18494681a9d..c82a55ace8e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1866,7 +1866,8 @@ Uses `python-beginning-of-block', `python-end-of-block'."
;;;; Completion.
-(defvar python-imports nil
+;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-01/msg00076.html
+(defvar python-imports "None"
"String of top-level import statements updated by `python-find-imports'.")
(make-variable-buffer-local 'python-imports)