comparison lisp/x-font-menu.el @ 359:8e84bee8ddd0 r21-1-9

Import from CVS: tag r21-1-9
author cvs
date Mon, 13 Aug 2007 10:57:55 +0200
parents 8bec6624d99b
children cc15677e0335
comparison
equal deleted inserted replaced
358:fed6e0f6a03a 359:8e84bee8ddd0
443 (setq f (aref item 0) 443 (setq f (aref item 0)
444 entry (vassoc f (aref dcache 0))) 444 entry (vassoc f (aref dcache 0)))
445 ;; The user can no longer easily control the weight using the menu 445 ;; The user can no longer easily control the weight using the menu
446 ;; Note it is silly anyway as it could very well be that the font 446 ;; Note it is silly anyway as it could very well be that the font
447 ;; has no common size+weight combinations with the default font. 447 ;; has no common size+weight combinations with the default font.
448 ;; (if (and (member weight (aref entry 1)) 448 (if (and (not (member size (aref entry 2)))
449 ;; (or (member size (aref entry 2)) 449 font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
450 ;; (and (not font-menu-ignore-scaled-fonts)
451 ;; (member 0 (aref entry 2)))))
452 ;; (enable-menu-item item)
453 ;; (disable-menu-item item))
454 (if (and font-menu-ignore-scaled-fonts (member 0 (aref entry 2)))
455 (disable-menu-item item) 450 (disable-menu-item item)
456 (enable-menu-item item)) 451 (enable-menu-item item))
457 (if (string-equal family f) 452 (if (string-equal family f)
458 (select-toggle-menu-item item) 453 (select-toggle-menu-item item)
459 (deselect-toggle-menu-item item)) 454 (deselect-toggle-menu-item item))
460 item) 455 item)
461 (aref dcache 1)))))) 456 (aref dcache 1))))))