aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-03-27 12:07:09 +0000
committerEli Zaretskii2004-03-27 12:07:09 +0000
commit692feebddfe2c4b0c9b48e7ea31a1362daf071a4 (patch)
tree7a2d6ebe6ee8548a3433c97e202dba2088b8c337
parent4d82882bb6f8bf596650177fbe4594ee1a2ce7a0 (diff)
downloademacs-692feebddfe2c4b0c9b48e7ea31a1362daf071a4.tar.gz
emacs-692feebddfe2c4b0c9b48e7ea31a1362daf071a4.zip
(woman-change-fonts): Rename local variable
woman-font-alist to font-alist to avoid a compiler warning.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/woman.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42329aa0432..ab3ac98ea9d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-03-27 Francis J. Wright <F.J.Wright@qmul.ac.uk>
2
3 * woman.el (woman-change-fonts): Rename local variable
4 woman-font-alist to font-alist to avoid a compiler warning.
5
12004-03-27 Dave Love <fx@gnu.org> 62004-03-27 Dave Love <fx@gnu.org>
2 7
3 * emacs-lisp/rx.el (rx): Doc fix. 8 * 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."
3239 ;; Paragraph .LP/PP/HP/IP/TP and font .B/.BI etc. macros reset font. 3239 ;; Paragraph .LP/PP/HP/IP/TP and font .B/.BI etc. macros reset font.
3240 ;; Should .SH/.SS reset font? 3240 ;; Should .SH/.SS reset font?
3241 ;; Font size setting macros (?) should reset font. 3241 ;; Font size setting macros (?) should reset font.
3242 (let ((woman-font-alist woman-font-alist) ; for local updating 3242 (let ((font-alist woman-font-alist) ; for local updating
3243 (previous-pos (point)) 3243 (previous-pos (point))
3244 (previous-font 'default) 3244 (previous-font 'default)
3245 (current-font 'default)) 3245 (current-font 'default))
@@ -3270,15 +3270,15 @@ If optional arg CONCAT is non-nil then join arguments."
3270 ;; Get font name: 3270 ;; Get font name:
3271 (or font 3271 (or font
3272 (let ((fontstring (match-string 0))) 3272 (let ((fontstring (match-string 0)))
3273 (setq font (assoc fontstring woman-font-alist) 3273 (setq font (assoc fontstring font-alist)
3274 ;; NB: woman-font-alist contains VARIABLE NAMES. 3274 ;; NB: font-alist contains VARIABLE NAMES.
3275 font (if font 3275 font (if font
3276 (cdr font) 3276 (cdr font)
3277 (WoMan-warn "Unknown font %s." fontstring) 3277 (WoMan-warn "Unknown font %s." fontstring)
3278 ;; Output this message once only per call ... 3278 ;; Output this message once only per call ...
3279 (setq woman-font-alist 3279 (setq font-alist
3280 (cons (cons fontstring 'woman-unknown-face) 3280 (cons (cons fontstring 'woman-unknown-face)
3281 woman-font-alist)) 3281 font-alist))
3282 'woman-unknown-face) 3282 'woman-unknown-face)
3283 ))) 3283 )))
3284 ;; Delete font control line or escape sequence: 3284 ;; Delete font control line or escape sequence: