Mercurial > emacs
comparison lisp/emacs-lisp/bytecomp.el @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 25 Dec 2004 02:00:25 +0000 |
| parents | f2ebccfa87d4 a7985894de81 |
| children | 3ebd9bdb4fe5 |
comparison
equal
deleted
inserted
replaced
| 90067:b481c5870e10 | 90068:eac554634bfa |
|---|---|
| 2176 (put 'require 'byte-hunk-handler 'byte-compile-file-form-require) | 2176 (put 'require 'byte-hunk-handler 'byte-compile-file-form-require) |
| 2177 (defun byte-compile-file-form-require (form) | 2177 (defun byte-compile-file-form-require (form) |
| 2178 (let ((old-load-list current-load-list) | 2178 (let ((old-load-list current-load-list) |
| 2179 (args (mapcar 'eval (cdr form)))) | 2179 (args (mapcar 'eval (cdr form)))) |
| 2180 (apply 'require args) | 2180 (apply 'require args) |
| 2181 ;; Detech (require 'cl) in a way that works even if cl is already loaded. | 2181 ;; Detect (require 'cl) in a way that works even if cl is already loaded. |
| 2182 (if (member (car args) '("cl" cl)) | 2182 (if (member (car args) '("cl" cl)) |
| 2183 (setq byte-compile-warnings | 2183 (setq byte-compile-warnings |
| 2184 (remq 'cl-functions byte-compile-warnings)))) | 2184 (remq 'cl-functions byte-compile-warnings)))) |
| 2185 (byte-compile-keep-pending form 'byte-compile-normal-call)) | 2185 (byte-compile-keep-pending form 'byte-compile-normal-call)) |
| 2186 | 2186 |