[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111020: * progmodes/python.el (python-skeleton-class)

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 111020
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-12-11 04:22:55 -0300
message:
  * progmodes/python.el (python-skeleton-class)
  (python-skeleton-def): Do not add space after defun name.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-09 03:44:59 +0000
+++ b/lisp/ChangeLog    2012-12-11 07:22:55 +0000
@@ -1,3 +1,8 @@
+2012-12-11  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-skeleton-class)
+       (python-skeleton-def): Do not add space after defun name.
+
 2012-12-09  Chong Yidong  <address@hidden>
 
        * simple.el (set-mark-default-inactive): Mark as obsolete, for

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-11-26 23:31:06 +0000
+++ b/lisp/progmodes/python.el  2012-12-11 07:22:55 +0000
@@ -2681,17 +2681,17 @@
 
 (python-skeleton-define def nil
   "Function name: "
-  "def " str " ("  ("Parameter, %s: "
-                    (unless (equal ?\( (char-before)) ", ")
-                    str) "):" \n
-                    "\"\"\"" - "\"\"\"" \n
-                    > _ \n)
+  "def " str "(" ("Parameter, %s: "
+                  (unless (equal ?\( (char-before)) ", ")
+                  str) "):" \n
+                  "\"\"\"" - "\"\"\"" \n
+                  > _ \n)
 
 (python-skeleton-define class nil
   "Class name: "
-  "class " str " (" ("Inheritance, %s: "
-                     (unless (equal ?\( (char-before)) ", ")
-                     str)
+  "class " str "(" ("Inheritance, %s: "
+                    (unless (equal ?\( (char-before)) ", ")
+                    str)
   & ")" | -2
   ":" \n
   "\"\"\"" - "\"\"\"" \n