diff options
| author | Glenn Morris | 2012-12-12 21:29:15 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-12 21:29:15 -0800 |
| commit | 727f97393714c5c92aef793f0749ebfde1d14f3c (patch) | |
| tree | 1bb7d815c7b2a1f1076fa0b0afbdab70045215a0 /lisp/progmodes/python.el | |
| parent | d20704efe62cf45255252168b4f4c453a8c88430 (diff) | |
| parent | bfe6ffb652954956ca984d594deb88d45f8cfd77 (diff) | |
| download | emacs-727f97393714c5c92aef793f0749ebfde1d14f3c.tar.gz emacs-727f97393714c5c92aef793f0749ebfde1d14f3c.zip | |
Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a2c8453a011..67388c0339b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2692,17 +2692,17 @@ The skeleton will be bound to python-skeleton-NAME." | |||
| 2692 | 2692 | ||
| 2693 | (python-skeleton-define def nil | 2693 | (python-skeleton-define def nil |
| 2694 | "Function name: " | 2694 | "Function name: " |
| 2695 | "def " str " (" ("Parameter, %s: " | 2695 | "def " str "(" ("Parameter, %s: " |
| 2696 | (unless (equal ?\( (char-before)) ", ") | 2696 | (unless (equal ?\( (char-before)) ", ") |
| 2697 | str) "):" \n | 2697 | str) "):" \n |
| 2698 | "\"\"\"" - "\"\"\"" \n | 2698 | "\"\"\"" - "\"\"\"" \n |
| 2699 | > _ \n) | 2699 | > _ \n) |
| 2700 | 2700 | ||
| 2701 | (python-skeleton-define class nil | 2701 | (python-skeleton-define class nil |
| 2702 | "Class name: " | 2702 | "Class name: " |
| 2703 | "class " str " (" ("Inheritance, %s: " | 2703 | "class " str "(" ("Inheritance, %s: " |
| 2704 | (unless (equal ?\( (char-before)) ", ") | 2704 | (unless (equal ?\( (char-before)) ", ") |
| 2705 | str) | 2705 | str) |
| 2706 | & ")" | -2 | 2706 | & ")" | -2 |
| 2707 | ":" \n | 2707 | ":" \n |
| 2708 | "\"\"\"" - "\"\"\"" \n | 2708 | "\"\"\"" - "\"\"\"" \n |