[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/isearch.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/isearch.el |
Date: |
Fri, 18 Mar 2005 02:06:15 -0500 |
Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.259 emacs/lisp/isearch.el:1.260
*** emacs/lisp/isearch.el:1.259 Thu Mar 17 19:22:23 2005
--- emacs/lisp/isearch.el Fri Mar 18 07:06:15 2005
***************
*** 238,262 ****
(defcustom lazy-highlight-cleanup t
"*Controls whether to remove extra highlighting after a search.
If this is nil, extra highlighting can be \"manually\" removed with
! \\[isearch-lazy-highlight-cleanup]."
:type 'boolean
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
! (make-obsolete-variable 'isearch-lazy-highlight-cleanup
'lazy-highlight-cleanup)
(defcustom lazy-highlight-initial-delay 0.25
"*Seconds to wait before beginning to lazily highlight all matches."
:type 'number
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-initial-delay
'lazy-highlight-initial-delay)
! (make-obsolete-variable 'isearch-lazy-highlight-initial-delay
'lazy-highlight-initial-delay)
(defcustom lazy-highlight-interval 0 ; 0.0625
"*Seconds between lazily highlighting successive matches."
:type 'number
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-interval 'lazy-highlight-interval)
! (make-obsolete-variable 'isearch-lazy-highlight-interval
'lazy-highlight-interval)
(defcustom lazy-highlight-max-at-a-time 20
"*Maximum matches to highlight at a time (for `lazy-highlight').
--- 238,262 ----
(defcustom lazy-highlight-cleanup t
"*Controls whether to remove extra highlighting after a search.
If this is nil, extra highlighting can be \"manually\" removed with
! \\[lazy-highlight-cleanup]."
:type 'boolean
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
! (make-obsolete-variable 'isearch-lazy-highlight-cleanup
'lazy-highlight-cleanup "22.1")
(defcustom lazy-highlight-initial-delay 0.25
"*Seconds to wait before beginning to lazily highlight all matches."
:type 'number
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-initial-delay
'lazy-highlight-initial-delay)
! (make-obsolete-variable 'isearch-lazy-highlight-initial-delay
'lazy-highlight-initial-delay "22.1")
(defcustom lazy-highlight-interval 0 ; 0.0625
"*Seconds between lazily highlighting successive matches."
:type 'number
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-interval 'lazy-highlight-interval)
! (make-obsolete-variable 'isearch-lazy-highlight-interval
'lazy-highlight-interval "22.1")
(defcustom lazy-highlight-max-at-a-time 20
"*Maximum matches to highlight at a time (for `lazy-highlight').
***************
*** 267,273 ****
(integer :tag "Some"))
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-max-at-a-time
'lazy-highlight-max-at-a-time)
! (make-obsolete-variable 'isearch-lazy-highlight-max-at-a-time
'lazy-highlight-max-at-a-time)
(defface lazy-highlight
'((((class color) (min-colors 88) (background light))
--- 267,273 ----
(integer :tag "Some"))
:group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-max-at-a-time
'lazy-highlight-max-at-a-time)
! (make-obsolete-variable 'isearch-lazy-highlight-max-at-a-time
'lazy-highlight-max-at-a-time "22.1")
(defface lazy-highlight
'((((class color) (min-colors 88) (background light))
***************
*** 284,290 ****
(put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
(defvar lazy-highlight-face 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-face 'lazy-highlight-face)
! (make-obsolete-variable 'isearch-lazy-highlight-face 'lazy-highlight-face)
;; Define isearch-mode keymap.
--- 284,290 ----
(put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
(defvar lazy-highlight-face 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-face 'lazy-highlight-face)
! (make-obsolete-variable 'isearch-lazy-highlight-face 'lazy-highlight-face
"22.1")
;; Define isearch-mode keymap.
***************
*** 768,774 ****
;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
(setq minibuffer-message-timeout
isearch-original-minibuffer-message-timeout)
(isearch-dehighlight)
! (isearch-lazy-highlight-cleanup lazy-highlight-cleanup)
(let ((found-start (window-start (selected-window)))
(found-point (point)))
(if isearch-window-configuration
--- 768,774 ----
;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
(setq minibuffer-message-timeout
isearch-original-minibuffer-message-timeout)
(isearch-dehighlight)
! (lazy-highlight-cleanup lazy-highlight-cleanup)
(let ((found-start (window-start (selected-window)))
(found-point (point)))
(if isearch-window-configuration
***************
*** 2329,2335 ****
(defvar isearch-lazy-highlight-case-fold-search nil)
(defvar isearch-lazy-highlight-regexp nil)
! (defun isearch-lazy-highlight-cleanup (&optional force)
"Stop lazy highlighting and remove extra highlighting from current buffer.
FORCE non-nil means do it whether or not `lazy-highlight-cleanup'
is nil. This function is called when exiting an incremental search if
--- 2329,2335 ----
(defvar isearch-lazy-highlight-case-fold-search nil)
(defvar isearch-lazy-highlight-regexp nil)
! (defun lazy-highlight-cleanup (&optional force)
"Stop lazy highlighting and remove extra highlighting from current buffer.
FORCE non-nil means do it whether or not `lazy-highlight-cleanup'
is nil. This function is called when exiting an incremental search if
***************
*** 2344,2349 ****
--- 2344,2352 ----
(cancel-timer isearch-lazy-highlight-timer)
(setq isearch-lazy-highlight-timer nil)))
+ (defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
+ (make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1")
+
(defun isearch-lazy-highlight-new-loop (beg end)
"Cleanup any previous `lazy-highlight' loop and begin a new one.
BEG and END specify the bounds within which highlighting should occur.
***************
*** 2365,2371 ****
(not (= (window-end) ; Window may have been split/joined.
isearch-lazy-highlight-window-end))))
;; something important did indeed change
! (isearch-lazy-highlight-cleanup t) ;kill old loop & remove overlays
(when (not isearch-error)
(setq isearch-lazy-highlight-start-limit beg
isearch-lazy-highlight-end-limit end)
--- 2368,2374 ----
(not (= (window-end) ; Window may have been split/joined.
isearch-lazy-highlight-window-end))))
;; something important did indeed change
! (lazy-highlight-cleanup t) ;kill old loop & remove overlays
(when (not isearch-error)
(setq isearch-lazy-highlight-start-limit beg
isearch-lazy-highlight-end-limit end)
***************
*** 2443,2449 ****
;; non-zero-length match
(let ((ov (make-overlay mb me)))
(push ov isearch-lazy-highlight-overlays)
! (overlay-put ov 'face isearch-lazy-highlight-face)
(overlay-put ov 'priority 0) ;lower than main overlay
(overlay-put ov 'window (selected-window))))
(if isearch-forward
--- 2446,2452 ----
;; non-zero-length match
(let ((ov (make-overlay mb me)))
(push ov isearch-lazy-highlight-overlays)
! (overlay-put ov 'face lazy-highlight-face)
(overlay-put ov 'priority 0) ;lower than main overlay
(overlay-put ov 'window (selected-window))))
(if isearch-forward