Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change.

Browse source 
* lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): Idem.
This commit is contained in:
Stefan Monnier 2012-10-11 16:36:23 -04:00
parent 389a94a53d
commit 9f1a4aa505
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -1,8 +1,6 @@
2012-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
* emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload...
* emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here.
* emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
changes to the format of load-history.

4
lisp/emacs-lisp/cl-lib.el
View file

@ -727,6 +727,10 @@ If ALIST is non-nil, the new pairs are prepended to it."
;;;###autoload
(progn
;; Make sure functions defined with cl-defsubst can be inlined even in
;; packages which do not require CL. We don't put an autoload cookie
;; directly on that function, since those cookies only go to cl-loaddefs.
(autoload 'cl--defsubst-expand "cl-macs")
;; Autoload, so autoload.el and font-lock can use it even when CL
;; is not loaded.
(put 'cl-defun 'doc-string-elt 3)

3
lisp/emacs-lisp/cl-macs.el
View file

@ -2595,9 +2595,6 @@ surrounded by (cl-block NAME ...).
,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns)))
(cl-defun ,name ,args ,@body))))
;; Make sure functions defined with cl-defsubst can be inlined even in
;; packages which do not require CL.
;;;###autoload
(defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs)
(if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole
(if (cl--simple-exprs-p argvs) (setq simple t))