From: Glenn Morris <rgm@gnu.org>
Date: Sun, 20 Jan 2008 04:01:05 +0000 (+0000)
Subject: Quote all calls to "auxiliary skeleton"s to prevent infloops.
X-Git-Tag: emacs-pretest-22.1.90~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c64cd0434447a1b5caa1755abc7a35ab5966b41;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20aadb3c658..ac7bef8b4c9 100644
--- 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 c82a55ace8e..ae863df3b5d 100644
--- 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."