diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-03-16 20:27:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-03-16 20:27:22 +0000 |
| commit | 6114b889a2aa965ef8849a0042bc7248aea16400 (patch) | |
| tree | b3740f5746e3082c45c255f90a2b279d7aa860ce /lisp/emacs-lisp | |
| parent | 80d4c82434c43cec0d673aebce49d911b7ddfe87 (diff) | |
| parent | 6939e0b1fcf6658220f6ad6057f15495d8288ed4 (diff) | |
| download | emacs-6114b889a2aa965ef8849a0042bc7248aea16400.tar.gz emacs-6114b889a2aa965ef8849a0042bc7248aea16400.tar.bz2 emacs-6114b889a2aa965ef8849a0042bc7248aea16400.zip | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-146
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-147
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-148
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-149
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-150
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-151
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-152
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-153
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-154
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-155
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-156
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-157
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-158
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-118
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 6f7e838daf0..1a290dddc58 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.142 $") +(defconst byte-compile-version "$Revision: 2.143 $") ;; This file is part of GNU Emacs. @@ -2776,7 +2776,8 @@ If FORM is a lambda or a macro, byte-compile it as a function." (defmacro byte-compile-get-constant (const) `(or (if (stringp ,const) - (assoc ,const byte-compile-constants) + (assoc-default ,const byte-compile-constants + 'equal-including-properties nil) (assq ,const byte-compile-constants)) (car (setq byte-compile-constants (cons (list ,const) byte-compile-constants))))) |