lisp/align.el (align-region): Do not fail when end-mark is nil (bug#17088).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 029cbaa8d95ffdf64da22cd8f61d4af4d61c110a..3f72f421773cbed3c0cf89d0e409a624ab8ee417 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-24  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+       * align.el (align-region): Do not fail when end-mark is nil (bug#17088).
+
 2014-03-24  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-expression-expansion-re):

diff --git a/lisp/align.el b/lisp/align.el
index 9038adf624c2df43ea0d3bae1fd27c9e40c73eb5..3b54aba264f5d28a6dee5e89034c2f4d153bc40f 100644 (file)
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1603,7 +1603,7 @@ aligner would have dealt with are."
            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))