(common-lisp-indent-function-1): Indent "without-" forms just

like "with-" and "do-".  Use regexp-opt.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4b91906c04ffaeb30ff7d75236f0179375bc163..c840ab6c22c5a3ec69e54f13fb73add81bdcd834 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 2e6265d4dfd407b095abadbf8e3b620a4be98506..c5e13a4c00f4cc8d438d53747798e1fb1e790696 100644 (file)
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -216,8 +216,12 @@ If nil, indent backquoted lists as data, i.e., like quoted lists."
                     (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)