(dired-show-file-type): Format filename with "%s" to escape any format-like

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

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index dc31878..ffdf50a 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -5,12 +5,14 @@
 ;; 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.
@@ -28,32 +30,9 @@
 (defgroup w32 nil
   "MS-Windows specific features"
   :group 'environment
-  :version "21.3"
+  :version "21.4"
   :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.