diff options
| author | Miles Bader <miles@gnu.org> | 2004-11-12 07:43:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-11-12 07:43:06 +0000 |
| commit | 77229aad98d5c81a559fb1ba5161ed2a7f13aec4 (patch) | |
| tree | 3789a210517a59869183070fa3abc71e99088f5f /lisp/emacs-lisp | |
| parent | 8b7e837d9c3266e775142a4865845b3d2a8b60aa (diff) | |
| parent | 036cf769ad82564e8e18da37c0d9df65fe8f4752 (diff) | |
| download | emacs-77229aad98d5c81a559fb1ba5161ed2a7f13aec4.tar.gz emacs-77229aad98d5c81a559fb1ba5161ed2a7f13aec4.tar.bz2 emacs-77229aad98d5c81a559fb1ba5161ed2a7f13aec4.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
Update from CVS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 18913893642..62919c5b5c7 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1,6 +1,7 @@ ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler -;; Copyright (c) 1991,1994,2000,01,02,2004 Free Software Foundation, Inc. +;; Copyright (c) 1991, 1994, 2000, 2001, 2002, 2004 +;; Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> @@ -266,7 +267,7 @@ (cdr (assq name byte-compile-function-environment))))) (if (and (consp fn) (eq (car fn) 'autoload)) (error "File `%s' didn't define `%s'" (nth 1 fn) name)) - (if (symbolp fn) + (if (and (symbolp fn) (not (eq fn t))) (byte-compile-inline-expand (cons fn (cdr form))) (if (byte-code-function-p fn) (let (string) @@ -2037,5 +2038,5 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance." byte-optimize-lapcode)))) nil) -;;; arch-tag: 0f14076b-737e-4bef-aae6-908826ec1ff1 +;; arch-tag: 0f14076b-737e-4bef-aae6-908826ec1ff1 ;;; byte-opt.el ends here |