[Emacs-diffs] emacs-24 r116851: lisp/align.el (align-region): Do not fail when end-mark is nil (bug#17088).

[Juanma Barranquero]

------------------------------------------------------------
revno: 116851
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17088
author: Nicolas Richard <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-03-24 17:54:24 +0100
message:
  lisp/align.el (align-region): Do not fail when end-mark is nil (bug#17088).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/align.el                  align.el-20091113204419-o5vbwnq5f7feedwu-1758

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-24 08:53:56 +0000
+++ b/lisp/ChangeLog    2014-03-24 16:54:24 +0000
@@ -1,3 +1,7 @@
+2014-03-24  Nicolas Richard  <address@hidden>
+
+       * align.el (align-region): Do not fail when end-mark is nil (bug#17088).
+
 2014-03-24  Dmitry Gutov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-expression-expansion-re):

=== modified file 'lisp/align.el'
--- a/lisp/align.el     2014-03-21 01:12:57 +0000
+++ b/lisp/align.el     2014-03-24 16:54:24 +0000
@@ -1603,7 +1603,7 @@
            rule-index (1+ rule-index)))
     ;; This function can use a lot of temporary markers, so instead of
     ;; waiting for the next GC we delete them immediately (Bug#10047).
-    (set-marker end-mark nil)
+    (when end-mark (set-marker end-mark nil))
     (dolist (m markers)
       (set-marker m nil))