diff options
author | Glenn Morris <rgm@gnu.org> | 2008-01-20 04:01:05 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2008-01-20 04:01:05 +0000 |
commit | 6c64cd0434447a1b5caa1755abc7a35ab5966b41 (patch) | |
tree | ad3c2df6c20a85ebfe9e53e6c0d10c81f9a2dff8 | |
parent | 9ce3eb9a3f063114a137e6c25328d0d100760fcb (diff) | |
download | emacs-6c64cd0434447a1b5caa1755abc7a35ab5966b41.tar.gz |
Quote all calls to "auxiliary skeleton"s to prevent infloops.
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/progmodes/python.el | 10 |
2 files changed, 10 insertions, 5 deletions
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." |