Applied to CVS for 21.1. This fix will be in 21.1.9.
- vin
>>>>> On 31 Jan 2000 17:02:40 +0100, Andreas Jaeger <aj(a)suse.de> said:
>>>>> Jan Vroonhof writes:
Jan> Andreas Jaeger <aj(a)suse.de> writes:
>>> The user has font-menu-ignore-scaled-fonts set to t.
Jan> Did he explicitly set that? Why? Note that the default differs in 21.2
Jan> and 21.1.
>>> Why is that part of the code in 21.1.8 commented out?
Jan> Because of
Jan> 1998-08-26 Jan Vroonhof <vroonhof(a)math.ethz.ch>
Jan> * menubar-items.el (default-menubar): Remove "Font Weight"
Jan> option, there is currently no custom equivalent.. Customize-faces
Jan> is "Edit faces".
Jan> However I guess I was a bit too overzealous.
>>> ;; (if (and (member weight (aref entry 1))
>>> ;; (or (member size (aref entry 2))
>>> ;; (and (not font-menu-ignore-scaled-fonts)
>>> ;; (member 0 (aref entry 2)))))
>>> ;; (enable-menu-item item)
>>> ;; (disable-menu-item item))
>>> (if (and font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
>>> (disable-menu-item item)
>>> (enable-menu-item item))
Jan> This problem is actually a FAQ om comp.emacs.xemacs. Because I didn't
Jan> see the problem when I last looked, we've just told people to set
Jan> font-menu-ignore-scaled-fonts to nil as a work around. However, now
Jan> that I look at it again, it is extremely trivial. I forgot the part that
Jan> checked whether the size was actually available unscaled.
Jan> It should be
Jan> (if (and (not (member size (aref entry 2)))
Jan> font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
Jan> (disable-menu-item item)
Jan> (enable-menu-item item))
Jan> This whole disabling thing needs a rethink anyway, since it can make
Jan> it impossible to get from one family-size-weight combination to
Jan> another if there is not of fonts with hamming distance 1 between them.
Andreas> Are you propossing the appended patch for 21.1.9? I'd like to see
Andreas> this fixed.
Andreas> Andreas
Andreas> Index: x-font-menu.el
Andreas> ===================================================================
Andreas> RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/x-font-menu.el,v
Andreas> retrieving revision 1.5
Andreas> diff -u -r1.5 x-font-menu.el
Andreas> --- x-font-menu.el 1999/05/13 12:19:37 1.5
Andreas> +++ x-font-menu.el 2000/01/31 15:59:34
Andreas> @@ -445,15 +445,10 @@
Andreas> ;; The user can no longer easily control the weight using the menu
Andreas> ;; Note it is silly anyway as it could very well be that the font
Andreas> ;; has no common size+weight combinations with the default font.
Andreas> -;; (if (and (member weight (aref entry 1))
Andreas> -;; (or (member size (aref entry 2))
Andreas> -;; (and (not font-menu-ignore-scaled-fonts)
Andreas> -;; (member 0 (aref entry 2)))))
Andreas> -;; (enable-menu-item item)
Andreas> -;; (disable-menu-item item))
Andreas> - (if (and font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
Andreas> + (if (and (not (member size (aref entry 2)))
Andreas> + font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
Andreas> (disable-menu-item item)
Andreas> - (enable-menu-item item))
Andreas> + (enable-menu-item item))
Andreas> (if (string-equal family f)
Andreas> (select-toggle-menu-item item)
Andreas> (deselect-toggle-menu-item item))
Andreas> --
Andreas> Andreas Jaeger
Andreas> SuSE Labs aj(a)suse.de
Andreas> private aj(a)arthur.rhein-neckar.de