(when, unless): Symbol props moved from cl.el.

(add-to-invisibility-spec): Add to beginning, not end.

diff --git a/lisp/subr.el b/lisp/subr.el
index fb22bc02654f3a4d175e6e626887ce606d80926b..3f215b1970d099d758532ccf36e91e52e49845e4 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -46,10 +46,14 @@ BODY should be a list of lisp expressions."
 (defmacro when (cond &rest body)
   "(when COND BODY...): if COND yields non-nil, do BODY, else return nil."
   (list 'if cond (cons 'progn body)))
+(put 'when 'lisp-indent-function 1)
+(put 'when 'edebug-form-spec '(&rest form))
 
 (defmacro unless (cond &rest body)
   "(unless COND BODY...): if COND yields nil, do BODY, else return nil."
   (cons 'if (cons cond (cons nil body))))
+(put 'unless 'lisp-indent-function 1)
+(put 'unless 'edebug-form-spec '(&rest form))
 \f
 ;;;; Keymap support.
 
@@ -901,8 +905,8 @@ that can be added."
    ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
        (setq buffer-invisibility-spec (list arg)))
    (t
-    (setq buffer-invisibility-spec 
-         (nconc buffer-invisibility-spec (list arg))))))
+    (setq buffer-invisibility-spec
+         (cons arg buffer-invisibility-spec)))))
 
 (defun remove-from-invisibility-spec (arg)
   "Remove elements from `buffer-invisibility-spec'."