summaryrefslogtreecommitdiff
path: root/lisp/w32-vars.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-03-17 20:29:55 +0200
committerEli Zaretskii <eliz@gnu.org>2015-03-17 20:29:55 +0200
commit330cf1a71787946b9fd4c74bad0e66c1bad7fa7f (patch)
tree2ad4a047aaf5003ddf5dfd5faf3e9ad8f22f4cb3 /lisp/w32-vars.el
parent508049aae95c42a3e6fe989ff403bf7cb6f88433 (diff)
downloademacs-330cf1a71787946b9fd4c74bad0e66c1bad7fa7f.tar.gz
Resurrect the lost optional fixed font menu on w32
lisp/mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is nil, construct a menu of fixed fonts. This resurrects a feature lost in Emacs 23. lisp/w32-vars.el (w32-use-w32-font-dialog): Add a ':set' function to reset mouse-appearance-menu-map, so the font dialog is recomputed the next time the menu is requested. (w32-fixed-font-alist): Fix to use correct names of Courier fonts.
Diffstat (limited to 'lisp/w32-vars.el')
-rw-r--r--lisp/w32-vars.el17
1 files changed, 12 insertions, 5 deletions
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index ae42ee7ecda..f9212be406c 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -34,10 +34,17 @@
;; Redefine the font selection to use the standard W32 dialog
(defcustom w32-use-w32-font-dialog t
- "Use the standard font dialog.
+ "If non-nil, use the standard Windows font dialog for font selection.
If nil, pop up a menu of a fixed set of fonts including fontsets, like
-X does. See `w32-fixed-font-alist' for the font menu definition."
+X does. See `w32-fixed-font-alist' for the fonts to appear in the menu.
+
+Setting this variable directly does not have any effect;
+use either \\[customize] or set `mouse-appearance-menu-map' to nil
+after changing the value of this variable."
:type 'boolean
+ :set (lambda (symbol value)
+ (set symbol value)
+ (setq mouse-appearance-menu-map nil))
:group 'w32)
(defvar w32-list-proportional-fonts nil
@@ -104,11 +111,11 @@ X does. See `w32-fixed-font-alist' for the font menu definition."
"-*-Lucida Sans Typewriter-semibold-r-*-*-16-*-*-*-c-*-iso8859-1"))
("Courier"
("Courier 10x8"
- "-*-Courier-*normal-r-*-*-*-97-*-*-c-80-iso8859-1")
+ "-*-Courier New-normal-r-*-*-*-97-*-*-c-80-iso8859-1")
("Courier 12x9"
- "-*-Courier-*normal-r-*-*-*-120-*-*-c-90-iso8859-1")
+ "-*-Courier New-normal-r-*-*-*-120-*-*-c-90-iso8859-1")
("Courier 15x12"
- "-*-Courier-*normal-r-*-*-*-150-*-*-c-120-iso8859-1")
+ "-*-Courier New-normal-r-*-*-*-150-*-*-c-120-iso8859-1")
;; For these, we specify the point height.
("")
("8" "-*-Courier New-normal-r-*-*-11-*-*-*-c-*-iso8859-1")