Allow specifying local ELPA mirrors in package-archives.

[gnu-emacs] / lisp / w32-vars.el

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 3d9db27bb6ee218ed30778930f834d3f79721548..d1e8edc40be0a8194d5f3d49b63a1e5d807e41b5 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,9 +1,10 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -39,10 +40,9 @@ 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
   "Disable startup warning when using \"system\" shells."
@@ -52,7 +52,7 @@ X does.  See `w32-fixed-font-alist' for the font menu definition."
 (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)
 
@@ -147,13 +147,6 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
                      (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)
 
-;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
 ;;; w32-vars.el ends here