* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',

`defconst', `define-condition', `with-slots'.
* font-lock.el (lisp-font-lock-keywords-2): Added `with-' and `do-'.

3 files changed, 18 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f7916cc214..f3f1158998e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-07  Sam Steingold  <sds@gnu.org>
+
+        * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
+        `defconst', `define-condition', `with-slots'.
+        * font-lock.el (lisp-font-lock-keywords-2): Added `with-' and `do-'.
+
 2000-08-03  Miles Bader  <miles@gnu.org>
 
         * comint.el (comint-use-prompt-regexp-instead-of-fields):
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 295a85b7aed..c74b5d66d51 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -382,13 +382,13 @@ by `lisp-body-indent'."
            (catch 1)
            (cond        (&rest (&whole 2 &rest 1)))
            (defvar      (4 2 2))
-           (defclass    ((&whole 4 &rest (&whole 2 &rest 1))
-                         &rest (&whole 2 &rest 1)))
+           (defclass    (6 4 (&whole 2 &rest 1) (&whole 2 &rest 1)))
            (defconstant . defvar)
            (defcustom   (4 2 2 2))
            (defparameter . defvar)
-           (define-modify-macro
-                        (4 &body))
+           (defconst     . defcustom)
+           (define-condition  . defclass)
+           (define-modify-macro (4 &body))
            (defsetf     (4 &lambda 4 &body))
            (defun       (4 &lambda &body))
            (define-setf-method . defun)
@@ -421,10 +421,8 @@ by `lisp-body-indent'."
            (handler-bind . let) (restart-bind . let)
            (locally 1)
            ;(loop ...)
-           (multiple-value-bind
-                        ((&whole 6 &rest 1) 4 &body))
-           (multiple-value-call
-                        (4 &body))
+           (multiple-value-bind ((&whole 6 &rest 1) 4 &body))
+           (multiple-value-call (4 &body))
            (multiple-value-prog1 1)
            (multiple-value-setq (4 2))
            (multiple-value-setf . multiple-value-setq)
@@ -446,6 +444,7 @@ by `lisp-body-indent'."
            (unwind-protect (5 &body))
            (when 1)
            (with-output-to-string (4 2))
+           (with-slots . multiple-value-bind)
            (with-standard-io-syntax (2)))))
   (while l
     (put (caar l) 'common-lisp-indent-function
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index adaa514574a..4a0c7f0d58c 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -186,7 +186,7 @@
 ;; doesn't work.  Or maybe it allows you to think less and drift off to sleep.
 ;;
 ;; So, here are my opinions/advice/guidelines:
-;; 
+;;
 ;; - Highlight conceptual objects, such as function and variable names, and
 ;;   different objects types differently, i.e., (a) and (b) above, highlight
 ;;   function names differently to variable names.
@@ -1113,7 +1113,7 @@ The value of this variable is used when Font Lock mode is turned on."
         ;;   `fontified' text props around since jit-lock-mode is also off.
         ;; - font-lock-default-fontify-buffer fails: this is not run
         ;;   any more anyway.   -sm
-        ;; 
+        ;;
         ;; (jit-lock-mode
         ;;  (jit-lock-after-unfontify-buffer))
         (lazy-lock-mode
@@ -2177,6 +2177,9 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
       ;;
       ;; ELisp and CLisp `&' keywords as types.
       '("\\&\\sw+\\>" . font-lock-type-face)
+      ;;
+      ;; CL `with-' and `do-' constructs
+      '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
       )))
   "Gaudy level highlighting for Lisp modes.")