diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/obsolete | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.bz2 emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'lisp/obsolete')
| -rw-r--r-- | lisp/obsolete/fast-lock.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 569771143e3..e2fb338242f 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -337,7 +337,7 @@ If a number, only buffers greater than this size have processing messages." :group 'fast-lock) (defvar fast-lock-save-faces - (when (save-match-data (string-match "XEmacs" (emacs-version))) + (when (featurep 'xemacs) ;; XEmacs uses extents for everything, so we have to pick the right ones. font-lock-face-list) "Faces that will be saved in a Font Lock cache file. @@ -768,7 +768,7 @@ See `fast-lock-get-face-properties'." ;; Functions for XEmacs: -(when (save-match-data (string-match "XEmacs" (emacs-version))) +(when (featurep 'xemacs) ;; ;; It would be better to use XEmacs' `map-extents' over extents with a ;; `font-lock' property, but `face' properties are on different extents. |