diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/align.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 029cbaa8d95..3f72f421773 100644 --- 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 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)) |