aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Meulien2014-06-11 22:24:24 -0400
committerStefan Monnier2014-06-11 22:24:24 -0400
commit82fb2a08db1889ccd57e571e9333c17a0abeeb2e (patch)
tree6a4e55d91db62689c948dae225abb0ee07170e8b
parente016b8f1529872128f756098368c45d2cbb0ae2e (diff)
downloademacs-82fb2a08db1889ccd57e571e9333c17a0abeeb2e.tar.gz
emacs-82fb2a08db1889ccd57e571e9333c17a0abeeb2e.zip
* lisp/progmodes/python.el (class skeleton): Don't erase last char of class
name. Fixes: debbugs:17683
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el2
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 @@
12014-06-12 Matthias Meulien <orontee@gmail.com>
2
3 * progmodes/python.el (class skeleton): Don't erase last char of class
4 name (bug#17683).
5
12014-06-12 Cameron Desautels <camdez@gmail.com> (tiny change) 62014-06-12 Cameron Desautels <camdez@gmail.com> (tiny change)
2 7
3 * help.el (where-is): Use `default' arg of completing-read (bug#17705). 8 * 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."
2983 "class " str "(" ("Inheritance, %s: " 2983 "class " str "(" ("Inheritance, %s: "
2984 (unless (equal ?\( (char-before)) ", ") 2984 (unless (equal ?\( (char-before)) ", ")
2985 str) 2985 str)
2986 & ")" | -2 2986 & ")" | -1
2987 ":" \n 2987 ":" \n
2988 "\"\"\"" - "\"\"\"" \n 2988 "\"\"\"" - "\"\"\"" \n
2989 > _ \n) 2989 > _ \n)