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

[Juri Linkov]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.159 
emacs/lisp/textmodes/ispell.el:1.160
*** emacs/lisp/textmodes/ispell.el:1.159        Wed Mar  9 00:35:00 2005
--- emacs/lisp/textmodes/ispell.el      Fri Mar 18 10:00:03 2005
***************
*** 238,244 ****
    :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t))
    :group 'ispell)
  
! (defcustom ispell-highlight-face 'highlight
    "*The face used for Ispell highlighting.  For Emacses with overlays.
  Possible values are `highlight', `modeline', `secondary-selection',
  `region', and `underline'.
--- 238,254 ----
    :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t))
    :group 'ispell)
  
! (defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup)
!   "*Controls the lazy-highlighting of spelling errors.
! When non-nil, all text in the buffer matching the current spelling
! error is highlighted lazily using isearch lazy highlighting (see
! `lazy-highlight-initial-delay' and `lazy-highlight-interval')."
!   :type 'boolean
!   :group 'lazy-highlight
!   :group 'ispell
!   :version "22.1")
! 
! (defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 
'highlight)
    "*The face used for Ispell highlighting.  For Emacses with overlays.
  Possible values are `highlight', `modeline', `secondary-selection',
  `region', and `underline'.
***************
*** 2160,2166 ****
  otherwise it is displayed normally."
    (if highlight
        (isearch-highlight start end)
!     (isearch-dehighlight t))
    ;;(sit-for 0)
    )
  
--- 2170,2176 ----
  otherwise it is displayed normally."
    (if highlight
        (isearch-highlight start end)
!     (isearch-dehighlight))
    ;;(sit-for 0)
    )
  
***************
*** 2174,2181 ****
    (if highlight
        (progn
        (setq ispell-overlay (make-overlay start end))
        (overlay-put ispell-overlay 'face ispell-highlight-face))
!     (delete-overlay ispell-overlay)))
  
  
  (defun ispell-highlight-spelling-error (start end &optional highlight refresh)
--- 2184,2206 ----
    (if highlight
        (progn
        (setq ispell-overlay (make-overlay start end))
+       (overlay-put ispell-overlay 'priority 1) ;higher than lazy overlays
        (overlay-put ispell-overlay 'face ispell-highlight-face))
!     (delete-overlay ispell-overlay))
!   (if (and ispell-lazy-highlight (boundp 'lazy-highlight-cleanup))
!       (if highlight
!         (let ((isearch-string
!                (concat
!                 "\\b"
!                 (regexp-quote (buffer-substring-no-properties start end))
!                 "\\b"))
!               (isearch-regexp t)
!               (isearch-case-fold-search nil))
!           (isearch-lazy-highlight-new-loop
!            (if (boundp 'reg-start) reg-start)
!            (if (boundp 'reg-end)   reg-end)))
!       (lazy-highlight-cleanup lazy-highlight-cleanup)
!       (setq isearch-lazy-highlight-last-string nil))))
  
  
  (defun ispell-highlight-spelling-error (start end &optional highlight refresh)