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

[Miles Bader]

Index: emacs/lisp/textmodes/flyspell.el
diff -c emacs/lisp/textmodes/flyspell.el:1.67 
emacs/lisp/textmodes/flyspell.el:1.68
*** emacs/lisp/textmodes/flyspell.el:1.67       Wed Jun  8 09:47:58 2005
--- emacs/lisp/textmodes/flyspell.el    Fri Jun 10 10:46:38 2005
***************
*** 94,100 ****
    "*The maximum distance for finding duplicates of unrecognized words.
  This applies to the feature that when a word is not found in the dictionary,
  if the same spelling occurs elsewhere in the buffer,
! Flyspell uses a different face (`flyspell-duplicate-face') to highlight it.
  This variable specifies how far to search to find such a duplicate.
  -1 means no limit (search the whole buffer).
  0 means do not search for duplicate unrecognized spellings."
--- 94,100 ----
    "*The maximum distance for finding duplicates of unrecognized words.
  This applies to the feature that when a word is not found in the dictionary,
  if the same spelling occurs elsewhere in the buffer,
! Flyspell uses a different face (`flyspell-duplicate') to highlight it.
  This variable specifies how far to search to find such a duplicate.
  -1 means no limit (search the whole buffer).
  0 means do not search for duplicate unrecognized spellings."
***************
*** 444,461 ****
  ;*---------------------------------------------------------------------*/
  ;*    Highlighting                                                     */
  ;*---------------------------------------------------------------------*/
! (defface flyspell-incorrect-face
    '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
      (t (:bold t)))
    "Face used for marking a misspelled word in Flyspell."
    :group 'flyspell)
  
! (defface flyspell-duplicate-face
    '((((class color)) (:foreground "Gold3" :bold t :underline t))
      (t (:bold t)))
    "Face used for marking a misspelled word that appears twice in the buffer.
  See also `flyspell-duplicate-distance'."
    :group 'flyspell)
  
  (defvar flyspell-overlay nil)
  
--- 444,465 ----
  ;*---------------------------------------------------------------------*/
  ;*    Highlighting                                                     */
  ;*---------------------------------------------------------------------*/
! (defface flyspell-incorrect
    '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
      (t (:bold t)))
    "Face used for marking a misspelled word in Flyspell."
    :group 'flyspell)
+ ;; backward-compatibility alias
+ (put 'flyspell-incorrect-face 'face-alias 'flyspell-incorrect)
  
! (defface flyspell-duplicate
    '((((class color)) (:foreground "Gold3" :bold t :underline t))
      (t (:bold t)))
    "Face used for marking a misspelled word that appears twice in the buffer.
  See also `flyspell-duplicate-distance'."
    :group 'flyspell)
+ ;; backward-compatibility alias
+ (put 'flyspell-duplicate-face 'face-alias 'flyspell-duplicate)
  
  (defvar flyspell-overlay nil)
  
***************
*** 540,546 ****
  ;*---------------------------------------------------------------------*/
  (defun flyspell-mode-on ()
    "Turn Flyspell mode on.  Do not use this; use `flyspell-mode' instead."
!   (setq ispell-highlight-face 'flyspell-incorrect-face)
    ;; local dictionaries setup
    (or ispell-local-dictionary ispell-dictionary
        (if flyspell-default-dictionary
--- 544,550 ----
  ;*---------------------------------------------------------------------*/
  (defun flyspell-mode-on ()
    "Turn Flyspell mode on.  Do not use this; use `flyspell-mode' instead."
!   (setq ispell-highlight-face 'flyspell-incorrect)
    ;; local dictionaries setup
    (or ispell-local-dictionary ispell-dictionary
        (if flyspell-default-dictionary
***************
*** 1570,1576 ****
          (overlay-put flyspell-overlay
                       flyspell-overlay-keymap-property-name
                       flyspell-mouse-map))
!     (when (eq face 'flyspell-incorrect-face)
        (and (stringp flyspell-before-incorrect-word-string)
             (overlay-put flyspell-overlay 'before-string
                          flyspell-before-incorrect-word-string))
--- 1574,1580 ----
          (overlay-put flyspell-overlay
                       flyspell-overlay-keymap-property-name
                       flyspell-mouse-map))
!     (when (eq face 'flyspell-incorrect)
        (and (stringp flyspell-before-incorrect-word-string)
             (overlay-put flyspell-overlay 'before-string
                          flyspell-before-incorrect-word-string))
***************
*** 1610,1616 ****
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay
!                  beg end 'flyspell-incorrect-face 'highlight)))))))
  
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-duplicate-region ...                          */
--- 1614,1620 ----
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay
!                  beg end 'flyspell-incorrect 'highlight)))))))
  
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-duplicate-region ...                          */
***************
*** 1636,1642 ****
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay beg end
!                                        'flyspell-duplicate-face
                                         'highlight)))))))
  
  ;*---------------------------------------------------------------------*/
--- 1640,1646 ----
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay beg end
!                                        'flyspell-duplicate
                                         'highlight)))))))
  
  ;*---------------------------------------------------------------------*/
***************
*** 1698,1705 ****
        (let ((num (car pos)))
        (put-text-property num
                           (+ num (length flyspell-auto-correct-word))
!                          'face
!                          'flyspell-incorrect-face
                           string))
        (setq pos (cdr pos)))
      (if (fboundp 'display-message)
--- 1702,1708 ----
        (let ((num (car pos)))
        (put-text-property num
                           (+ num (length flyspell-auto-correct-word))
!                          'face 'flyspell-incorrect
                           string))
        (setq pos (cdr pos)))
      (if (fboundp 'display-message)
***************
*** 1876,1882 ****
                            ;; check if its face has changed
                            (not (eq (get-char-property 
                                      (overlay-start new-overlay) 'face) 
!                                    'flyspell-incorrect-face))))
              (setq new-overlay (car-safe overlay-list))
              (setq overlay-list (cdr-safe overlay-list)))
        
--- 1879,1885 ----
                            ;; check if its face has changed
                            (not (eq (get-char-property 
                                      (overlay-start new-overlay) 'face) 
!                                    'flyspell-incorrect))))
              (setq new-overlay (car-safe overlay-list))
              (setq overlay-list (cdr-safe overlay-list)))