Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org

This commit is contained in:
Glenn Morris 2012-12-12 21:29:15 -08:00
commit 727f973937
30 changed files with 4767 additions and 128 deletions

View file

@ -2692,17 +2692,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