[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/cl-macs.el [lexbind]

[Miles Bader]

Index: emacs/lisp/emacs-lisp/cl-macs.el
diff -c emacs/lisp/emacs-lisp/cl-macs.el:1.34.4.1 
emacs/lisp/emacs-lisp/cl-macs.el:1.34.4.2
*** emacs/lisp/emacs-lisp/cl-macs.el:1.34.4.1   Fri Apr  4 01:20:16 2003
--- emacs/lisp/emacs-lisp/cl-macs.el    Tue Oct 14 19:32:21 2003
***************
*** 1,6 ****
  ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
  
! ;; Copyright (C) 1993 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Version: 2.02
--- 1,6 ----
  ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
  
! ;; Copyright (C) 1993, 2003 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Version: 2.02
***************
*** 266,272 ****
             (nconc (let ((hdr (nreverse header)))
                      (require 'help-fns)
                      (cons (help-add-fundoc-usage
!                            (if (stringp (car hdr)) (pop hdr)) orig-args)
                            hdr))
                    (list (nconc (list 'let* bind-lets)
                                 (nreverse bind-forms) body)))))))
--- 266,277 ----
             (nconc (let ((hdr (nreverse header)))
                      (require 'help-fns)
                      (cons (help-add-fundoc-usage
!                            (if (stringp (car hdr)) (pop hdr))
!                            ;; orig-args can contain &cl-defs (an internal CL
!                            ;; thingy that I do not understand), so remove it.
!                            (let ((x (memq '&cl-defs orig-args)))
!                              (if (null x) orig-args
!                                (delq (car x) (remq (cadr x) orig-args)))))
                            hdr))
                    (list (nconc (list 'let* bind-lets)
                                 (nreverse bind-forms) body)))))))
***************
*** 486,492 ****
  Each clause looks like (KEYLIST BODY...).  EXPR is evaluated and compared
  against each key in each KEYLIST; the corresponding BODY is evaluated.
  If no clause succeeds, case returns nil.  A single atom may be used in
! place of a KEYLIST of one atom.  A KEYLIST of `t' or `otherwise' is
  allowed only in the final clause, and matches if no other keys match.
  Key values are compared by `eql'."
    (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
--- 491,497 ----
  Each clause looks like (KEYLIST BODY...).  EXPR is evaluated and compared
  against each key in each KEYLIST; the corresponding BODY is evaluated.
  If no clause succeeds, case returns nil.  A single atom may be used in
! place of a KEYLIST of one atom.  A KEYLIST of t or `otherwise' is
  allowed only in the final clause, and matches if no other keys match.
  Key values are compared by `eql'."
    (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
***************
*** 523,529 ****
    "Evals EXPR, chooses from CLAUSES on that value.
  Each clause looks like (TYPE BODY...).  EXPR is evaluated and, if it
  satisfies TYPE, the corresponding BODY is evaluated.  If no clause succeeds,
! typecase returns nil.  A TYPE of `t' or `otherwise' is allowed only in the
  final clause, and matches if no other keys match."
    (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
         (type-list nil)
--- 528,534 ----
    "Evals EXPR, chooses from CLAUSES on that value.
  Each clause looks like (TYPE BODY...).  EXPR is evaluated and, if it
  satisfies TYPE, the corresponding BODY is evaluated.  If no clause succeeds,
! typecase returns nil.  A TYPE of t or `otherwise' is allowed only in the
  final clause, and matches if no other keys match."
    (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
         (type-list nil)
***************
*** 912,918 ****
                      (setq var (prog1 other (setq other var))))
                  (setq loop-map-form
                        (list (if (memq word '(key-seq key-seqs))
!                                 'cl-map-keymap-recursively 'cl-map-keymap)
                              (list 'function (list* 'lambda (list var other)
                                                     '--cl-map)) map))))
  
--- 917,923 ----
                      (setq var (prog1 other (setq other var))))
                  (setq loop-map-form
                        (list (if (memq word '(key-seq key-seqs))
!                                 'cl-map-keymap-recursively 'map-keymap)
                              (list 'function (list* 'lambda (list var other)
                                                     '--cl-map)) map))))
  
***************
*** 2497,2503 ****
      (list 'progn
          (if p nil   ; give up if defaults refer to earlier args
            (list 'define-compiler-macro name
!                 (list* '&whole 'cl-whole '&cl-quote args)
                  (list* 'cl-defsubst-expand (list 'quote argns)
                         (list 'quote (list* 'block name body))
                         (not (or unsafe (cl-expr-access-order pbody argns)))
--- 2502,2510 ----
      (list 'progn
          (if p nil   ; give up if defaults refer to earlier args
            (list 'define-compiler-macro name
!                 (if (memq '&key args)
!                     (list* '&whole 'cl-whole '&cl-quote args)
!                   (cons '&cl-quote args))
                  (list* 'cl-defsubst-expand (list 'quote argns)
                         (list 'quote (list* 'block name body))
                         (not (or unsafe (cl-expr-access-order pbody argns)))
***************
*** 2650,2653 ****
--- 2657,2661 ----
  ;;; byte-compile-warnings: (redefine callargs free-vars unresolved obsolete 
noruntime)
  ;;; End:
  
+ ;;; arch-tag: afd947a6-b553-4df1-bba5-000be6388f46
  ;;; cl-macs.el ends here