Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6845e39eae5dd63ea6728420312bb7d3ccd60e5a..b1f9fb2a40d3cda10979aa945c06b4550f06f5b9 100644 (file)
--- 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 459221a9088331a0022d69ddc4edb3a2d6902d06..70eecf1c97b12c4d30f1fde9cafee1bd48eb1ca2 100644 (file)
--- 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 269deb86abe74d4d718f5822a61c07848136488f..56c340b1da4b914262657af6464df77755740cdb 100644 (file)
--- 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 641563ae0abbb1c6b2a489c1535d567372b1c72a..ccb2dcba42e7c543552bdfa7359a08450cf1ebcb 100644 (file)
--- 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