Quote all calls to "auxiliary skeleton"s to prevent infloops.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20aadb3c6580af7bf783e06f6c3510921b58a215..ac7bef8b4c9daf5075c7c4463e056f2744779b20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-20  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/python.el: Quote all calls to "auxiliary skeleton"s to
+       prevent infloops.
+
 2008-01-20  Martin Svenson <phromo@gmail.com>  (tiny change)
 
        * progmodes/python.el (python-imports): Default to "None".

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c82a55ace8e531d5a809c99731ad7cb64ba588c7..ae863df3b5dc366b792b75245069b74fb1c32e84 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2052,7 +2052,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."
@@ -2066,24 +2066,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."