(rcirc-ignore-list): New option.

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

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 292439d..1b4ea8e 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,6 +1,6 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
@@ -12,15 +12,15 @@
 ;; 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:
 
@@ -28,9 +28,9 @@
 
 ;; Custom group for w32 specific settings
 (defgroup w32 nil
-  "MS-Windows specific features"
+  "MS-Windows specific features."
   :group 'environment
-  :version "21.4"
+  :version "22.1"
   :prefix "w32")
 
 ;; Redefine the font selection to use the standard W32 dialog
@@ -143,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.
@@ -155,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