diff options
| author | Glenn Morris | 2008-01-20 03:57:19 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-01-20 03:57:19 +0000 |
| commit | 9ce3eb9a3f063114a137e6c25328d0d100760fcb (patch) | |
| tree | 950a733523f8e3fa081997fedfe52a86a8aca33a /lisp | |
| parent | 569382c2b4e38392a41052a6ecbc97b92760bf4b (diff) | |
| download | emacs-9ce3eb9a3f063114a137e6c25328d0d100760fcb.tar.gz emacs-9ce3eb9a3f063114a137e6c25328d0d100760fcb.zip | |
Martin Svenson <phromo at gmail.com> (tiny change)
(python-imports): Default to "None".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 3 |
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 @@ | |||
| 1 | 2008-01-20 Martin Svenson <phromo@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * progmodes/python.el (python-imports): Default to "None". | ||
| 4 | |||
| 1 | 2008-01-19 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-01-19 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * progmodes/sh-script.el (sh-basic-offset): | 7 | * 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'." | |||
| 1866 | 1866 | ||
| 1867 | ;;;; Completion. | 1867 | ;;;; Completion. |
| 1868 | 1868 | ||
| 1869 | (defvar python-imports nil | 1869 | ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-01/msg00076.html |
| 1870 | (defvar python-imports "None" | ||
| 1870 | "String of top-level import statements updated by `python-find-imports'.") | 1871 | "String of top-level import statements updated by `python-find-imports'.") |
| 1871 | (make-variable-buffer-local 'python-imports) | 1872 | (make-variable-buffer-local 'python-imports) |
| 1872 | 1873 | ||