procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 117634

Browse source
This commit is contained in:
Glenn Morris 2014-10-29 22:15:28 -07:00
commit 52b410c60a
24 changed files with 197 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/emacs-lisp/bytecomp.el
View file

@ -120,7 +120,11 @@
(require 'backquote)
(require 'macroexp)
(require 'cconv)
(eval-when-compile (require 'cl-lib))
;; During bootstrap, cl-loaddefs.el is not created yet, so loading cl-lib
;; doesn't setup autoloads for things like cl-every, which is why we have to
;; require cl-extra instead (bug#18804).
(require 'cl-extra)
(or (fboundp 'defsubst)
;; This really ought to be loaded already!
@ -3283,11 +3287,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
(byte-defop-compiler cons 2)
(byte-defop-compiler aref 2)
(byte-defop-compiler set 2)
(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767
(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767
(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767
(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767
(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767
(byte-defop-compiler (= byte-eqlsign) 2-and)
(byte-defop-compiler (< byte-lss) 2-and)
(byte-defop-compiler (> byte-gtr) 2-and)
(byte-defop-compiler (<= byte-leq) 2-and)
(byte-defop-compiler (>= byte-geq) 2-and)
(byte-defop-compiler get 2)
(byte-defop-compiler nth 2)
(byte-defop-compiler substring 2-3)
@ -3354,13 +3358,14 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
(defun byte-compile-and-folded (form)
"Compile calls to functions like `<='.
These implicitly `and' together a bunch of two-arg bytecodes."
;; FIXME: bug#18767 means we can't do it this way!
(let ((l (length form)))
(cond
((< l 3) (byte-compile-form `(progn ,(nth 1 form) t)))
((= l 3) (byte-compile-two-args form))
(t (byte-compile-form `(and (,(car form) ,(nth 1 form) ,(nth 2 form))
(,(car form) ,@(nthcdr 2 form))))))))
((cl-every #'macroexp-copyable-p (nthcdr 2 form))
(byte-compile-form `(and (,(car form) ,(nth 1 form) ,(nth 2 form))
(,(car form) ,@(nthcdr 2 form)))))
(t (byte-compile-normal-call form)))))
(defun byte-compile-three-args (form)
(if (not (= (length form) 4))

1
lisp/emacs-lisp/cl-extra.el
View file

@ -720,4 +720,5 @@ including `cl-block' and `cl-eval-when'."
;; generated-autoload-file: "cl-loaddefs.el"
;; End:
(provide 'cl-extra)
;;; cl-extra.el ends here