Mercurial > emacs
changeset 73459:664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
* progmodes/python.el (python-use-skeletons): python-mode was
auto-inserting templates (for those with abbrev-mode on), not only
by default -- *but without a configuration variable to disable
it*. This rendered python-mode completely useless for me, so I
have added `python-use-skeletons', which is now off by default.
| author | John Wiegley <johnw@newartisans.com> |
|---|---|
| date | Sun, 22 Oct 2006 20:37:16 +0000 |
| parents | 520f07d7cc57 |
| children | 1ba9051bf981 |
| files | lisp/progmodes/python.el |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/python.el Sun Oct 22 17:32:30 2006 +0000 +++ b/lisp/progmodes/python.el Sun Oct 22 20:37:16 2006 +0000 @@ -1969,6 +1969,13 @@ ;;;; Skeletons +(defcustom python-use-skeletons nil + "Non-nil means template skeletons will be automagically inserted. +This happens when pressing \"if<SPACE>\", for example, to prompt for +the if condition." + :type 'boolean + :group 'python) + (defvar python-skeletons nil "Alist of named skeletons for Python mode. Elements are of the form (NAME . EXPANDER-FUNCTION).") @@ -1986,7 +1993,8 @@ (function (intern (concat "python-insert-" name)))) `(progn (add-to-list 'python-skeletons ',(cons name function)) - (define-abbrev python-mode-abbrev-table ,name "" ',function nil t) + (if python-use-skeletons + (define-abbrev python-mode-abbrev-table ,name "" ',function nil t)) (define-skeleton ,function ,(format "Insert Python \"%s\" template." name) ,@elements)))))