(python-comment-line-p, python-blank-line-p, python-skip-out,

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

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 13fbb4a2810c227a332379f102a07ed17c8983d3..2d366f398ef6784e6bc2b491b56f6443f21fa56a 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,24 +1,24 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -26,16 +26,11 @@
 
 ;; Custom group for w32 specific settings
 (defgroup w32 nil
-  "MS-Windows specific features"
+  "MS-Windows specific features."
   :group 'environment
-  :version "21.3"
+  :version "22.1"
   :prefix "w32")
 
-(defcustom mouse-wheel-scroll-amount 4
-  "*Number of lines to scroll per click of the mouse wheel."
-  :type 'integer
-  :group 'w32)
-
 ;; Redefine the font selection to use the standard W32 dialog
 (defcustom w32-use-w32-font-dialog t
   "*Use the standard font dialog.
@@ -56,7 +51,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"
-                              "ndos" "ndos.exe")
+                              "tcc" "tcc.exe" "ndos" "ndos.exe")
   "*List of strings recognized as Windows NT/9X system shells."
   :type '(repeat string)
   :group 'w32)
@@ -137,7 +132,7 @@ X does.  See `w32-fixed-font-alist' for the font menu definition."
      ))
     "*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
+will have like Terminal and Courier.  These fonts are used in the font
 menu if the variable `w32-use-w32-font-dialog' is nil."
     :type '(list
            (string :tag "Menu Title")
@@ -146,10 +141,11 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
              (string :tag "Title")
              (repeat :inline t
               (choice :tag ""
-               (const :tag "Seperator" (""))
+               (const :tag "Separator" (""))
                (list :tag "Font Entry"
                      (string :tag "Menu text")
-                     (string :tag "Font"))))))))
+                     (string :tag "Font")))))))
+    :group 'w32)
 
 (defcustom x-select-enable-clipboard t
   "*Non-nil means cutting and pasting uses the clipboard.
@@ -157,5 +153,7 @@ 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