From: Sam Steingold <sds@gnu.org>
Date: Mon, 17 May 2004 17:00:00 +0000 (+0000)
Subject: (common-lisp-indent-function-1): Indent "without-" forms just
X-Git-Tag: ttn-vms-21-2-B4~6184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=410019e59c74f64a85344edcb0f72210b063b339;p=emacs.git

(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 d4b91906c04..c840ab6c22c 100644
--- 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 2e6265d4dfd..c5e13a4c00f 100644
--- 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)