(python-use-skeletons): Re-add.

(def-python-skeleton): Use it.

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/python.el (python-use-skeletons): Re-add.
+	(def-python-skeleton): Use it.
+
 	* international/quail.el (quail-make-guidance-frame): Remove the
 	`parent-id' parameter.
 	(quail-show-guidance): Make the new window dedicated.

lisp/progmodes/python.el

@@ -2205,6 +2205,13 @@ Interactively, prompt for name."
 
 ;;;; 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)
+
 (define-abbrev-table 'python-mode-abbrev-table ()
   "Abbrev table for Python mode."
   :case-fixed t
@@ -2221,9 +2228,10 @@ Interactively, prompt for name."
     `(progn
        ;; Usual technique for inserting a skeleton, but expand
        ;; to the original abbrev instead if in a comment or string.
-       (define-abbrev python-mode-abbrev-table ,name ""
-	 ',function
-	 nil t)				; system abbrev
+       (when python-use-skeletons
+         (define-abbrev python-mode-abbrev-table ,name ""
+           ',function
+           nil t))                      ; system abbrev
        (define-skeleton ,function
 	 ,(format "Insert Python \"%s\" template." name)
 	 ,@elements)))))