[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog progmodes/python.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog progmodes/python.el |
Date: |
Thu, 12 Feb 2009 18:16:31 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/02/12 18:16:30
Modified files:
lisp : ChangeLog
lisp/progmodes : python.el
Log message:
(python-use-skeletons): Re-add.
(def-python-skeleton): Use it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15315&r2=1.15316
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/python.el?cvsroot=emacs&r1=1.93&r2=1.94
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15315
retrieving revision 1.15316
diff -u -b -r1.15315 -r1.15316
--- ChangeLog 12 Feb 2009 18:13:20 -0000 1.15315
+++ ChangeLog 12 Feb 2009 18:16:26 -0000 1.15316
@@ -1,5 +1,8 @@
2009-02-12 Stefan Monnier <address@hidden>
+ * 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.
Index: progmodes/python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- progmodes/python.el 3 Feb 2009 04:13:17 -0000 1.93
+++ progmodes/python.el 12 Feb 2009 18:16:30 -0000 1.94
@@ -2205,6 +2205,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)
+
(define-abbrev-table 'python-mode-abbrev-table ()
"Abbrev table for Python mode."
:case-fixed t
@@ -2221,9 +2228,10 @@
`(progn
;; Usual technique for inserting a skeleton, but expand
;; to the original abbrev instead if in a comment or string.
+ (when python-use-skeletons
(define-abbrev python-mode-abbrev-table ,name ""
',function
- nil t) ; system abbrev
+ nil t)) ; system abbrev
(define-skeleton ,function
,(format "Insert Python \"%s\" template." name)
,@elements)))))
- [Emacs-diffs] emacs/lisp ChangeLog progmodes/python.el,
Stefan Monnier <=