[Emacs-diffs] Changes to emacs/lisp/whitespace.el

[Miles Bader]

Index: emacs/lisp/whitespace.el
diff -c emacs/lisp/whitespace.el:1.35 emacs/lisp/whitespace.el:1.36
*** emacs/lisp/whitespace.el:1.35       Mon Apr 11 23:47:54 2005
--- emacs/lisp/whitespace.el    Fri Jun 10 08:13:51 2005
***************
*** 307,314 ****
    :group 'whitespace)
  
  (defcustom whitespace-display-spaces-in-color t
!   "Display the bogus whitespaces by coloring them with
! `whitespace-highlight-face'."
    :type 'boolean
    :group 'whitespace)
  
--- 307,314 ----
    :group 'whitespace)
  
  (defcustom whitespace-display-spaces-in-color t
!   "Display the bogus whitespaces by coloring them with the face
! `whitespace-highlight'."
    :type 'boolean
    :group 'whitespace)
  
***************
*** 318,335 ****
    :group 'whitespace
    :group 'faces)
  
! (defface whitespace-highlight-face '((((class color) (background light))
!                                     (:background "green1"))
!                                    (((class color) (background dark))
!                                     (:background "sea green"))
!                                    (((class grayscale mono)
!                                      (background light))
!                                     (:background "black"))
!                                    (((class grayscale mono)
!                                      (background dark))
!                                     (:background "white")))
    "Face used for highlighting the bogus whitespaces that exist in the buffer."
    :group 'whitespace-faces)
  
  (if (not (assoc 'whitespace-mode minor-mode-alist))
      (setq minor-mode-alist (cons '(whitespace-mode whitespace-mode-line)
--- 318,337 ----
    :group 'whitespace
    :group 'faces)
  
! (defface whitespace-highlight '((((class color) (background light))
!                                (:background "green1"))
!                               (((class color) (background dark))
!                                (:background "sea green"))
!                               (((class grayscale mono)
!                                 (background light))
!                                (:background "black"))
!                               (((class grayscale mono)
!                                 (background dark))
!                                (:background "white")))
    "Face used for highlighting the bogus whitespaces that exist in the buffer."
    :group 'whitespace-faces)
+ ;; backward-compatibility alias
+ (put 'whitespace-highlight-face 'face-alias 'whitespace-highlight)
  
  (if (not (assoc 'whitespace-mode minor-mode-alist))
      (setq minor-mode-alist (cons '(whitespace-mode whitespace-mode-line)
***************
*** 734,740 ****
    (if whitespace-display-spaces-in-color
        (let ((ol (whitespace-make-overlay b e)))
        (push ol whitespace-highlighted-space)
!       (whitespace-overlay-put ol 'face 'whitespace-highlight-face))))
  ;;  (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
  
  (defun whitespace-unhighlight-the-space()
--- 736,742 ----
    (if whitespace-display-spaces-in-color
        (let ((ol (whitespace-make-overlay b e)))
        (push ol whitespace-highlighted-space)
!       (whitespace-overlay-put ol 'face 'whitespace-highlight))))
  ;;  (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
  
  (defun whitespace-unhighlight-the-space()