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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ed1f27bd97caebdbb59065eb257d5ba0c26324..9712ccc217644091f0ba66cc9d429dab60e0db31 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2006-10-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/cperl-mode.el (cperl-mode): Don't assume

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0387c05134e816244c052fee08916fb628c721ee..4d9a49a6b8dcefcc3e62c36f9880d044b9c6fa08 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1969,6 +1969,13 @@ Repeating the command scrolls the completion window."
 \f
 ;;;; 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)))))