From f2357ea13b8a734d22daea14cabe8e8e2fa5713e Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Sun, 20 Jan 2008 03:56:50 +0000
Subject: Martin Svenson <phromo at gmail.com>  (tiny change)

(python-imports): Default to "None".
---
 lisp/progmodes/python.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index bef282f5e98..3a393a7a4eb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1889,7 +1889,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)
 
-- 
cgit v1.2.1


From f2c6de6aed9864b659d9abb60b109bd21d65474f Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Sun, 20 Jan 2008 04:02:15 +0000
Subject: Quote all calls to "auxiliary skeleton"s to prevent infloops.

---
 lisp/progmodes/python.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3a393a7a4eb..39fe096309d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2077,7 +2077,7 @@ The default contents correspond to the elements of `python-skeletons'."
    <			; Avoid wrong indentation after block opening.
    "elif " str ":" \n
    > _ \n nil)
-  (python-else) | ^)
+  '(python-else) | ^)
 
 (define-skeleton python-else
   "Auxiliary skeleton."
@@ -2091,24 +2091,24 @@ The default contents correspond to the elements of `python-skeletons'."
   "Condition: "
   "while " str ":" \n
   > _ \n
-  (python-else) | ^)
+  '(python-else) | ^)
 
 (def-python-skeleton for
   "Target, %s: "
   "for " str " in " (skeleton-read "Expression, %s: ") ":" \n
   > _ \n
-  (python-else) | ^)
+  '(python-else) | ^)
 
 (def-python-skeleton try/except
   nil
   "try:" \n
   > _ \n
   ("Exception, %s: "
-   < "except " str (python-target) ":" \n
+   < "except " str '(python-target) ":" \n
    > _ \n nil)
   < "except:" \n
   > _ \n
-  (python-else) | ^)
+  '(python-else) | ^)
 
 (define-skeleton python-target
   "Auxiliary skeleton."
-- 
cgit v1.2.1