martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* lisp/progmodes/python.el (import skeleton): New skeleton.

Browse Source 
(python-mode-map): Bind it.

Fixes: debbugs:17672
This commit is contained in:
Matthias Meulien
2014-06-11 22:35:26 -04:00
committed by Stefan Monnier
parent 7c35a92251
commit c77f4a90b2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@@ -6,6 +6,9 @@
2014-06-12 Matthias Meulien <orontee@gmail.com>
* progmodes/python.el (import skeleton): New skeleton (bug#17672).
(python-mode-map): Bind it.
* progmodes/python.el (class skeleton): Don't erase last char of class
name (bug#17683).

17
lisp/progmodes/python.el
View File

@@ -155,15 +155,13 @@
;; the shell completion in background so you should run
;; `python-shell-send-buffer' from time to time to get better results.
;; Skeletons: 6 skeletons are provided for simple inserting of class,
;; def, for, if, try and while. These skeletons are integrated with
;; abbrev. If you have `abbrev-mode' activated and
;; Skeletons: skeletons are provided for simple inserting of things like class,
;; def, for, import, if, try, and while. These skeletons are
;; integrated with abbrev. If you have `abbrev-mode' activated and
;; `python-skeleton-autoinsert' is set to t, then whenever you type
;; the name of any of those defined and hit SPC, they will be
;; automatically expanded. As an alternative you can use the defined
;; skeleton commands: `python-skeleton-class', `python-skeleton-def'
;; `python-skeleton-for', `python-skeleton-if', `python-skeleton-try'
;; and `python-skeleton-while'.
;; skeleton commands: `python-skeleton-<foo>'.
;; FFAP: You can find the filename for a given module when using ffap
;; out of the box. This feature needs an inferior python shell
@@ -253,6 +251,7 @@
(define-key map "\C-c\C-td" 'python-skeleton-def)
(define-key map "\C-c\C-tf" 'python-skeleton-for)
(define-key map "\C-c\C-ti" 'python-skeleton-if)
(define-key map "\C-c\C-tm" 'python-skeleton-import)
(define-key map "\C-c\C-tt" 'python-skeleton-try)
(define-key map "\C-c\C-tw" 'python-skeleton-while)
;; Shell interaction
@@ -2957,6 +2956,12 @@ The skeleton will be bound to python-skeleton-NAME."
> _ \n
'(python-skeleton--else) | ^)
(python-skeleton-define import nil
"Import from module: "
"from " str & " " | -5
"import "
("Identifier: " str ", ") -2 \n _)
(python-skeleton-define try nil
nil
"try:" \n