# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 1084813200 0
# Node ID c2f8040b4ece3491775122599178c55e7022d7ed
# Parent  333119854d83a13ba4b8113046a721b4bb9710da
(common-lisp-indent-function-1): Indent "without-" forms just
like "with-" and "do-".  Use regexp-opt.

diff -r 333119854d83 -r c2f8040b4ece lisp/ChangeLog
--- 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.
diff -r 333119854d83 -r c2f8040b4ece lisp/emacs-lisp/cl-indent.el
--- 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)