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/ChangeLog | 9 +++++++++ lisp/progmodes/python.el | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30ab6bda2a..e24f103978 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-01-20 Glenn Morris + + * progmodes/python.el: Quote all calls to "auxiliary skeleton"s to + prevent infloops. + +2008-01-20 Martin Svenson (tiny change) + + * progmodes/python.el (python-imports): Default to "None". + 2008-01-19 Tom Tromey * vc-svn.el (vc-svn-after-dir-status): New function. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3a393a7a4e..39fe096309 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.3