2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5422deef12..5e039a75461 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-12  Matthias Meulien  <orontee@gmail.com>
+
+        * progmodes/python.el (class skeleton): Don't erase last char of class
+        name (bug#17683).
+
 2014-06-12  Cameron Desautels  <camdez@gmail.com>  (tiny change)
 
         * help.el (where-is): Use `default' arg of completing-read (bug#17705).
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 79fbe7faa27..3a913a31193 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2983,7 +2983,7 @@ The skeleton will be bound to python-skeleton-NAME."
   "class " str "(" ("Inheritance, %s: "
                     (unless (equal ?\( (char-before)) ", ")
                     str)
-  & ")" | -2
+  & ")" | -1
   ":" \n
   "\"\"\"" - "\"\"\"" \n
   > _ \n)