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.
This commit is contained in:
John Wiegley 2006-10-22 20:39:36 +00:00
parent 2967b4c9d7
commit 7a338befad
2 changed files with 17 additions and 1 deletions

View file

@ -1969,6 +1969,13 @@ Repeating the command scrolls the completion window."
;;;; 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 @@ The default contents correspond to the elements of `python-skeletons'.")
(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)))))