2004-11-15 change of `vc.el' makes it pass string as a face name to
`find-face'. But both in 21.4 and 21.5 `find-face' signals an error
if argument is neither face nor symbol.
Certainly having `find-face' use string argument as a name of symbol
that is face name makes sense, but until this is implemented, need the
patch.
* vc.el (vc-annotate-display): Pass symbol to `find-face' as face
name, not string. Fix 2004-11-15 change.
--- vc.el 24 Nov 2004 22:36:27 -0000 1.1.3.2
+++ vc.el 29 Nov 2004 23:41:35 -0000
@@ -2462,10 +2462,15 @@
(vc-annotate-color-map))))
((cons nil vc-annotate-very-old-color))))
;; substring from index 1 to remove any leading `#' in the name
- (face-name (concat "vc-annotate-face-" (substring (cdr color) 1)))
;; Make the face if not done.
- (face (cond ((find-face face-name))
- ((make-face (intern face-name)))))
+ (face
+ (let
+ ((face-name
+ (intern
+ (concat
+ "vc-annotate-face-" (substring (cdr color) 1)))))
+ (cond ((find-face face-name))
+ ((make-face face-name)))))
(point (point))
(foo (forward-line 1))
(overlay (cond ((if (string-match "XEmacs" emacs-version)
Show replies by thread