* progmodes/python.el (python-skeleton-class)

(python-skeleton-def): Do not add space after defun name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37d6e34..c77cc28 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-11  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+       * progmodes/python.el (python-skeleton-class)
+       (python-skeleton-def): Do not add space after defun name.
+
 2012-12-09  Chong Yidong  <cyd@gnu.org>
 
        * simple.el (set-mark-default-inactive): Mark as obsolete, for

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7cd59c0..98ba437 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2681,17 +2681,17 @@ The skeleton will be bound to python-skeleton-NAME."
 
 (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