* lisp/net/tramp.el (tramp-default-method): scp is the default method.

[bpt/emacs.git] / lisp / w32-vars.el

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index dc31878..0918ed4 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,24 +1,26 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 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.
 
-;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -26,34 +28,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")
 
-;; mwheel.el should probably be adapted to accept mouse-wheel events
-;; then this could go.
-(defcustom mouse-wheel-scroll-amount '(5  ((shift) . 1) ((control) . nil))
-  "*Amount to scroll windows by when spinning the mouse wheel.
-This is actually a cons cell, where the first item is the amount to scroll
-on a normal wheel event. The rest is ignored on Windows, see mwheel.el if
-you wish to implement modifier keys."
-  :group 'w32
-  :group 'mouse
-  :type '(cons
-         (choice :tag "Normal"
-                 (const :tag "Full screen" :value nil)
-                 (integer :tag "Specific # of lines")
-                 (float :tag "Fraction of window"))
-          (repeat
-           (cons
-            (repeat (choice :tag "modifier" (const alt) (const control) (const hyper)
-                            (const meta) (const shift) (const super)))
-            (choice :tag "scroll amount"
-                    (const :tag "Full screen" :value nil)
-                    (integer :tag "Specific # of lines")
-                    (float :tag "Fraction of window"))))))
-
 ;; Redefine the font selection to use the standard W32 dialog
 (defcustom w32-use-w32-font-dialog t
   "*Use the standard font dialog.
@@ -164,10 +143,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.
@@ -176,4 +156,5 @@ This is in addition to the primary selection."
   :group 'killing)
 
 
+;;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
 ;;; w32-vars.el ends here