Mercurial > emacs
changeset 55636:c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
like "with-" and "do-". Use regexp-opt.
author | Sam Steingold <sds@gnu.org> |
---|---|
date | Mon, 17 May 2004 17:00:00 +0000 |
parents | 333119854d83 |
children | 239a750fdcfa |
files | lisp/ChangeLog lisp/emacs-lisp/cl-indent.el |
diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 17 15:20:16 2004 +0000 +++ b/lisp/ChangeLog Mon May 17 17:00:00 2004 +0000 @@ -1,3 +1,8 @@ +2004-05-17 Sam Steingold <sds@gnu.org> + + * emacs-lisp/cl-indent.el (common-lisp-indent-function-1): Indent + "without-" forms just like "with-" and "do-". Use regexp-opt. + 2004-05-16 Kim F. Storm <storm@cua.dk> * emacs-lisp/timer.el (timer-event-handler): Fix last change.
--- a/lisp/emacs-lisp/cl-indent.el Mon May 17 15:20:16 2004 +0000 +++ b/lisp/emacs-lisp/cl-indent.el Mon May 17 17:00:00 2004 +0000 @@ -216,8 +216,12 @@ (cond ((string-match "\\`def" function) (setq tentative-defun t)) - ((string-match "\\`\\(with\\|do\\)-" - function) + ((string-match + (eval-when-compile + (concat "\\`\\(" + (regexp-opt '("with" "without" "do")) + "\\)-")) + function) (setq method '(&lambda &body)))))) ;; backwards compatibility. Bletch. ((eq method 'defun)