diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
| commit | fb74beed3cf7ed158f18508766ce0ac2685f1d9a (patch) | |
| tree | eebde8bdadc53ef70a3e8602707c8921462ef9d1 /lisp/align.el | |
| parent | 70f3e4e61fc4433ca8ac4517d247df7e7af7b248 (diff) | |
| parent | 861022ff5f7b8d6ab53c726e009208eadf4ecd41 (diff) | |
| download | emacs-fb74beed3cf7ed158f18508766ce0ac2685f1d9a.tar.gz emacs-fb74beed3cf7ed158f18508766ce0ac2685f1d9a.tar.bz2 emacs-fb74beed3cf7ed158f18508766ce0ac2685f1d9a.zip | |
Merge from origin/emacs-25
861022f * doc/misc/texinfo.tex: Revert unwanted copyright change.
46e47a5 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright.
71ea138 * lisp/align.el (align): Simplify a lambda
5618a50 * lisp/align.el (align): Fix arg order in call to `align-region'
1f680db Fix compilation next-error in buffers with selective-display
d20a948 * nsm.el (nsm-check-protocol): Fix typo in the message.
1da116f Add SHA1 warnings for high network security settings
e48bacd ; * etc/NEWS: Typo fix.
Diffstat (limited to 'lisp/align.el')
| -rw-r--r-- | lisp/align.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/align.el b/lisp/align.el index a7a98c28f12..7e439f3e073 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -888,15 +888,15 @@ on the format of these lists." (let ((sec-first end) (sec-last beg)) (align-region beg end - (or exclude-rules - align-mode-exclude-rules-list - align-exclude-rules-list) nil separator - (function - (lambda (b e mode) - (when (and mode (listp mode)) - (setq sec-first (min sec-first b) - sec-last (max sec-last e)))))) + nil ; rules + (or exclude-rules + align-mode-exclude-rules-list + align-exclude-rules-list) + (lambda (b e mode) + (when (consp mode) + (setq sec-first (min sec-first b) + sec-last (max sec-last e))))) (if (< sec-first sec-last) (align-region sec-first sec-last 'entire (or rules align-mode-rules-list align-rules-list) |