Displaying X-Face's in BBDB buffers will break when XEmacs 22 comes out. This fixes that, and also makes it work now for SXEmacs. :-)
BBDB patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: lisp/bbdb-gui.el
Index: ChangeLog
===================================================================
RCS file: /cvsroot/bbdb/bbdb/ChangeLog,v
retrieving revision 2.185
diff -u -p -U0 -r2.185 ChangeLog
--- ChangeLog 11 Aug 2005 03:25:51 -0000 2.185
+++ ChangeLog 1 Sep 2005 06:12:38 -0000
@@ -0,0 +1,7 @@
+2005-09-01 Steve Youngs <[EMAIL PROTECTED]>
+
+ * lisp/bbdb-gui.el (bbdb-hack-x-face): Use `emacs-version>='
+ instead of `string-match' against `emacs-version'. This fixes
+ X-Face display in SXEmacs now, and also in future versions of
+ XEmacs beyond 21.x.
+
Index: lisp/bbdb-gui.el
===================================================================
RCS file: /cvsroot/bbdb/bbdb/lisp/bbdb-gui.el,v
retrieving revision 1.33
diff -u -p -u -r1.33 bbdb-gui.el
--- lisp/bbdb-gui.el 25 Jun 2003 15:58:06 -0000 1.33
+++ lisp/bbdb-gui.el 1 Sep 2005 06:12:34 -0000
@@ -265,14 +265,14 @@ as of GNU Emacs 20.7"
(symbol-value (intern ;; compiler
"highlight-headers-hack-x-face-p"))) ;; ick.
(and (featurep 'xemacs)
- (string-match "^21\\." emacs-version)))) ;; XXX
+ (emacs-version>= 21)))) ;; XXX
() ;; nothing doing
(setq face (bbdb-split face "\n"))
(while face
(cond
;; ripped pretty much verbatim from VM; X Faces for recent XEmacsen.
- ((string-match "^21\\." emacs-version) ;; XXX how far back can I go?
+ ((emacs-version>= 21) ;; XXX how far back can I go?
(condition-case nil
(let* ((h (concat "X-Face: " (car face))) ;; from vm-display-xface
(g (intern h vm-xface-cache)))
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| Te audire no possum. |
| Musa sapientum fixa est in aure. |
|----------------------------------<[EMAIL PROTECTED]>---|
pgp5uppc6uzgY.pgp
Description: PGP signature
