diff options
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/enriched.el | 10 |
2 files changed, 18 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3aea439ec9b..cc94cc34ce4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2000-07-25 Gerd Moellmann <gerd@gnu.org> + + * find-dired.el: Update copyright notice. + (find-dired): Offer to kill a running `find'. + + * enriched.el (enriched-face-ans): For a `foreground-color' + property, return '(("x-color" COLOR))' so that COLOR will be + output as a parameter of the x-color annotation. Likewise for the + `background-color' property. In the case of normal face + properties, don't return annotations for unspecified foreground + and background face attributes. + 2000-07-25 Kenichi Handa <handa@etl.go.jp> * language/japan-util.el (japanese-katakana-region): Fix handling diff --git a/lisp/enriched.el b/lisp/enriched.el index a6c11d1bc6b..5d64b7ee346 100644 --- a/lisp/enriched.el +++ b/lisp/enriched.el @@ -349,9 +349,9 @@ One annotation each for foreground color, background color, italic, etc." (defun enriched-face-ans (face) "Return annotations specifying FACE." (cond ((and (consp face) (eq (car face) 'foreground-color)) - (list "x-color" (cdr face))) + (list (list "x-color" (cdr face)))) ((and (consp face) (eq (car face) 'background-color)) - (list "x-bg-color" (cdr face))) + (list (list "x-bg-color" (cdr face)))) ((string-match "^fg:" (symbol-name face)) (list (list "x-color" (substring (symbol-name face) 3)))) ((string-match "^bg:" (symbol-name face)) @@ -361,8 +361,10 @@ One annotation each for foreground color, background color, italic, etc." (props (face-font face t)) (ans (cdr (format-annotate-single-property-change 'face nil props enriched-translations)))) - (if fg (setq ans (cons (list "x-color" fg) ans))) - (if bg (setq ans (cons (list "x-bg-color" bg) ans))) + (unless (eq fg 'unspecified) + (setq ans (cons (list "x-color" fg) ans))) + (unless (eq bg 'unspecified) + (setq ans (cons (list "x-bg-color" bg) ans))) ans)))) ;;; |