From: Eli Zaretskii Date: Sat, 27 Mar 2004 12:07:09 +0000 (+0000) Subject: (woman-change-fonts): Rename local variable X-Git-Tag: ttn-vms-21-2-B4~7062 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=692feebddfe2c4b0c9b48e7ea31a1362daf071a4;p=emacs.git (woman-change-fonts): Rename local variable woman-font-alist to font-alist to avoid a compiler warning. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42329aa0432..ab3ac98ea9d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-03-27 Francis J. Wright + + * woman.el (woman-change-fonts): Rename local variable + woman-font-alist to font-alist to avoid a compiler warning. + 2004-03-27 Dave Love * emacs-lisp/rx.el (rx): Doc fix. diff --git a/lisp/woman.el b/lisp/woman.el index d25f60f58c1..d69c631f27b 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -3239,7 +3239,7 @@ If optional arg CONCAT is non-nil then join arguments." ;; Paragraph .LP/PP/HP/IP/TP and font .B/.BI etc. macros reset font. ;; Should .SH/.SS reset font? ;; Font size setting macros (?) should reset font. - (let ((woman-font-alist woman-font-alist) ; for local updating + (let ((font-alist woman-font-alist) ; for local updating (previous-pos (point)) (previous-font 'default) (current-font 'default)) @@ -3270,15 +3270,15 @@ If optional arg CONCAT is non-nil then join arguments." ;; Get font name: (or font (let ((fontstring (match-string 0))) - (setq font (assoc fontstring woman-font-alist) - ;; NB: woman-font-alist contains VARIABLE NAMES. + (setq font (assoc fontstring font-alist) + ;; NB: font-alist contains VARIABLE NAMES. font (if font (cdr font) (WoMan-warn "Unknown font %s." fontstring) ;; Output this message once only per call ... - (setq woman-font-alist + (setq font-alist (cons (cons fontstring 'woman-unknown-face) - woman-font-alist)) + font-alist)) 'woman-unknown-face) ))) ;; Delete font control line or escape sequence: