diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-06-01 13:21:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-06-01 13:21:22 -0700 |
| commit | f46305c86cd247b2396e73ce8bb064f69373834d (patch) | |
| tree | e4eea4ee7548f8f16035d52ea13f040aef2cba1e | |
| parent | 9133b82e6f850b96eeb8c1e2c62fbeb52f111673 (diff) | |
| parent | 20992a85041ddd8c2852eaef24fe69f9a47019a2 (diff) | |
| download | emacs-f46305c86cd247b2396e73ce8bb064f69373834d.tar.gz | |
Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/programs.texi | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 6845e39eae5..b1f9fb2a40d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2013-06-01 Glenn Morris <rgm@gnu.org> + + * programs.texi (Semantic): Fix typo. + 2013-05-30 Xue Fuqiao <xfq.free@gmail.com> * maintaining.texi (Types of Log File): Supplement some diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 459221a9088..70eecf1c97b 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1356,7 +1356,7 @@ the menu item named @samp{Source Code Parsers (Semantic)} in the @samp{Tools} menu. This enables Semantic mode, a global minor mode. When Semantic mode is enabled, Emacs automatically attempts to -parses each file you visit. Currently, Semantic understands C, C++, +parse each file you visit. Currently, Semantic understands C, C++, Scheme, Javascript, Java, HTML, and Make. Within each parsed buffer, the following commands are available: diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 269deb86abe..56c340b1da4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-01 Fabián Ezequiel Gallina <fgallina@gnu.org> + + * progmodes/python.el (python-indent-block-enders): Add break, + continue and raise keywords. + 2013-06-01 Glenn Morris <rgm@gnu.org> * pcmpl-gnu.el (pcomplete/tar): Check obsolete variable is bound. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 641563ae0ab..ccb2dcba42e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -157,7 +157,7 @@ ;; Skeletons: 6 skeletons are provided for simple inserting of class, ;; def, for, if, try and while. These skeletons are integrated with -;; dabbrev. If you have `dabbrev-mode' activated and +;; abbrev. If you have `abbrev-mode' activated and ;; `python-skeleton-autoinsert' is set to t, then whenever you type ;; the name of any of those defined and hit SPC, they will be ;; automatically expanded. As an alternative you can use the defined @@ -642,7 +642,8 @@ It makes underscores and dots word constituent chars.") These make `python-indent-calculate-indentation' subtract the value of `python-indent-offset'.") -(defvar python-indent-block-enders '("return" "pass") +(defvar python-indent-block-enders + '("break" "continue" "pass" "raise" "return") "List of words that mark the end of a block. These make `python-indent-calculate-indentation' subtract the value of `python-indent-offset' when `python-indent-context' is |