HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk; add Bug#.
[bpt/emacs.git]
/
lisp
/
w32-vars.el
diff --git
a/lisp/w32-vars.el
b/lisp/w32-vars.el
index
2d366f3
..
c8716ef
100644
(file)
--- a/
lisp/w32-vars.el
+++ b/
lisp/w32-vars.el
@@
-1,9
+1,10
@@
;;; w32-vars.el --- MS-Windows specific user options
;;; w32-vars.el --- MS-Windows specific user options
-;; Copyright (C) 2002
, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
+;; Copyright (C) 2002
-2012
Free Software Foundation, Inc.
;; Author: Jason Rumney <jasonr@gnu.org>
;; Keywords: internal
;; Author: Jason Rumney <jasonr@gnu.org>
;; Keywords: internal
+;; Package: emacs
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-33,26
+34,25
@@
;; Redefine the font selection to use the standard W32 dialog
(defcustom w32-use-w32-font-dialog t
;; Redefine the font selection to use the standard W32 dialog
(defcustom w32-use-w32-font-dialog t
- "
*
Use the standard font dialog.
+ "Use the standard font dialog.
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."
:type 'boolean
:group 'w32)
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."
:type 'boolean
:group 'w32)
-(defcustom w32-list-proportional-fonts nil
- "*Include proportional fonts in the default font dialog."
- :type 'boolean
- :group 'w32)
+(defvar w32-list-proportional-fonts nil
+ "Include proportional fonts in the default font dialog.")
+(make-obsolete-variable 'w32-list-proportional-fonts "no longer used." "23.1")
(defcustom w32-allow-system-shell nil
(defcustom w32-allow-system-shell nil
- "
*
Disable startup warning when using \"system\" shells."
+ "Disable startup warning when using \"system\" shells."
:type 'boolean
:group 'w32)
(defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com"
"4nt" "4nt.exe" "4dos" "4dos.exe"
"tcc" "tcc.exe" "ndos" "ndos.exe")
:type 'boolean
:group 'w32)
(defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com"
"4nt" "4nt.exe" "4dos" "4dos.exe"
"tcc" "tcc.exe" "ndos" "ndos.exe")
- "
*List of strings recognized as Windows NT/9X
system shells."
+ "
List of strings recognized as Windows
system shells."
:type '(repeat string)
:group 'w32)
:type '(repeat string)
:group 'w32)
@@
-130,7
+130,7
@@
X does. See `w32-fixed-font-alist' for the font menu definition."
("11 bold italic" "-*-Courier New-bold-i-*-*-15-*-*-*-c-*-iso8859-1")
("12 bold italic" "-*-Courier New-bold-i-*-*-16-*-*-*-c-*-iso8859-1")
))
("11 bold italic" "-*-Courier New-bold-i-*-*-15-*-*-*-c-*-iso8859-1")
("12 bold italic" "-*-Courier New-bold-i-*-*-16-*-*-*-c-*-iso8859-1")
))
- "
*
Fonts suitable for use in Emacs.
+ "Fonts suitable for use in Emacs.
Initially this is a list of some fixed width fonts that most people
will have like Terminal and Courier. These fonts are used in the font
menu if the variable `w32-use-w32-font-dialog' is nil."
Initially this is a list of some fixed width fonts that most people
will have like Terminal and Courier. These fonts are used in the font
menu if the variable `w32-use-w32-font-dialog' is nil."
@@
-147,13
+147,6
@@
menu if the variable `w32-use-w32-font-dialog' is nil."
(string :tag "Font")))))))
:group 'w32)
(string :tag "Font")))))))
:group 'w32)
-(defcustom x-select-enable-clipboard t
- "*Non-nil means cutting and pasting uses the clipboard.
-This is in addition to the primary selection."
- :type 'boolean
- :group 'killing)
-
(provide 'w32-vars)
(provide 'w32-vars)
-;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
;;; w32-vars.el ends here
;;; w32-vars.el ends here