Merge from origin/emacs-25

[gnu-emacs] / lisp / obsolete / old-whitespace.el

diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index 02c8115f23a961a685aa7cf7b12b918d903a93ae..63af3693b5c72ebf4e43ec27da0cb4f8ee431ad7 100644 (file)
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -1,6 +1,6 @@
 ;;; whitespace.el --- warn about and clean bogus whitespaces in the file
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
 ;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
 ;; Keywords: convenience
@@ -259,7 +259,7 @@ These are mostly programming and documentation modes.  But you may add other
 modes that you want whitespaces checked in by adding something like the
 following to your `.emacs':
 
-\(setq whitespace-modes (cons 'my-mode (cons 'my-other-mode
+\(setq whitespace-modes (cons \\='my-mode (cons \\='my-other-mode
                                            whitespace-modes))\)
 
 Or, alternately, you can use the Emacs `customize' command to set this."
@@ -288,12 +288,6 @@ To disable timer scans, set this to zero."
   :type 'boolean
   :group 'whitespace)
 
-(defgroup whitespace-faces nil
-  "Faces used in whitespace."
-  :prefix "whitespace-"
-  :group 'whitespace
-  :group 'faces)
-
 (defface whitespace-highlight '((((class color) (background light))
                                 (:background "green1"))
                                (((class color) (background dark))
@@ -305,7 +299,7 @@ To disable timer scans, set this to zero."
                                  (background dark))
                                 (:background "white")))
   "Face used for highlighting the bogus whitespaces that exist in the buffer."
-  :group 'whitespace-faces)
+  :group 'whitespace)
 (define-obsolete-face-alias 'whitespace-highlight-face
   'whitespace-highlight "22.1")