From 74be16492f8ef62f57c1ede79a08ddebc6847091 Mon Sep 17 00:00:00 2001
From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
Date: Mon, 24 Mar 2014 17:54:24 +0100
Subject: lisp/align.el (align-region): Do not fail when end-mark is nil
 (bug#17088).

---
 lisp/align.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/align.el')

diff --git a/lisp/align.el b/lisp/align.el
index 9038adf624c..3b54aba264f 100644
--- 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))
 
-- 
cgit v1.2.1