Commit 46fe9018 authored by Juri Linkov's avatar Juri Linkov
Browse files

(lazy-highlight-cleanup) <command>: Rename from

`isearch-lazy-highlight-cleanup', add alias to old name and
declare obsolete.  Add release numbers to other obsolete vars.
(isearch-done, isearch-lazy-highlight-new-loop): Rename
`isearch-lazy-highlight-cleanup' to `lazy-highlight-cleanup'.
(lazy-highlight-cleanup) <variable>: Doc fix.
(isearch-lazy-highlight-update): Rename obsolete
`isearch-lazy-highlight-face' to `lazy-highlight-face'.
parent 1ab06fdf
2005-03-18 Juri Linkov <juri@jurta.org>
* isearch.el (lazy-highlight-cleanup) <command>: Rename from
`isearch-lazy-highlight-cleanup', add alias to old name and
declare obsolete. Add release numbers to other obsolete vars.
(isearch-done, isearch-lazy-highlight-new-loop): Rename
`isearch-lazy-highlight-cleanup' to `lazy-highlight-cleanup'.
(lazy-highlight-cleanup) <variable>: Doc fix.
(isearch-lazy-highlight-update): Rename obsolete
`isearch-lazy-highlight-face' to `lazy-highlight-face'.
2005-03-18 handa <handa@m17n.org> 2005-03-18 handa <handa@m17n.org>
   
* language/thai-util.el: Fix categorization of Thai characters in * language/thai-util.el: Fix categorization of Thai characters in
......
...@@ -238,25 +238,25 @@ and `lazy-highlight-interval')." ...@@ -238,25 +238,25 @@ and `lazy-highlight-interval')."
(defcustom lazy-highlight-cleanup t (defcustom lazy-highlight-cleanup t
"*Controls whether to remove extra highlighting after a search. "*Controls whether to remove extra highlighting after a search.
If this is nil, extra highlighting can be \"manually\" removed with If this is nil, extra highlighting can be \"manually\" removed with
\\[isearch-lazy-highlight-cleanup]." \\[lazy-highlight-cleanup]."
:type 'boolean :type 'boolean
:group 'lazy-highlight) :group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup) (defvaralias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
(make-obsolete-variable '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 (defcustom lazy-highlight-initial-delay 0.25
"*Seconds to wait before beginning to lazily highlight all matches." "*Seconds to wait before beginning to lazily highlight all matches."
:type 'number :type 'number
:group 'lazy-highlight) :group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-initial-delay 'lazy-highlight-initial-delay) (defvaralias 'isearch-lazy-highlight-initial-delay 'lazy-highlight-initial-delay)
(make-obsolete-variable '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 (defcustom lazy-highlight-interval 0 ; 0.0625
"*Seconds between lazily highlighting successive matches." "*Seconds between lazily highlighting successive matches."
:type 'number :type 'number
:group 'lazy-highlight) :group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-interval 'lazy-highlight-interval) (defvaralias 'isearch-lazy-highlight-interval 'lazy-highlight-interval)
(make-obsolete-variable '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 (defcustom lazy-highlight-max-at-a-time 20
"*Maximum matches to highlight at a time (for `lazy-highlight'). "*Maximum matches to highlight at a time (for `lazy-highlight').
...@@ -267,7 +267,7 @@ A value of nil means highlight all matches." ...@@ -267,7 +267,7 @@ A value of nil means highlight all matches."
(integer :tag "Some")) (integer :tag "Some"))
:group 'lazy-highlight) :group 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-max-at-a-time 'lazy-highlight-max-at-a-time) (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) (make-obsolete-variable 'isearch-lazy-highlight-max-at-a-time 'lazy-highlight-max-at-a-time "22.1")
(defface lazy-highlight (defface lazy-highlight
'((((class color) (min-colors 88) (background light)) '((((class color) (min-colors 88) (background light))
...@@ -284,7 +284,7 @@ A value of nil means highlight all matches." ...@@ -284,7 +284,7 @@ A value of nil means highlight all matches."
(put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight) (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
(defvar lazy-highlight-face 'lazy-highlight) (defvar lazy-highlight-face 'lazy-highlight)
(defvaralias 'isearch-lazy-highlight-face 'lazy-highlight-face) (defvaralias 'isearch-lazy-highlight-face 'lazy-highlight-face)
(make-obsolete-variable 'isearch-lazy-highlight-face 'lazy-highlight-face) (make-obsolete-variable 'isearch-lazy-highlight-face 'lazy-highlight-face "22.1")
;; Define isearch-mode keymap. ;; Define isearch-mode keymap.
...@@ -768,7 +768,7 @@ is treated as a regexp. See \\[isearch-forward] for more info." ...@@ -768,7 +768,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
(setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout)
(isearch-dehighlight) (isearch-dehighlight)
(isearch-lazy-highlight-cleanup lazy-highlight-cleanup) (lazy-highlight-cleanup lazy-highlight-cleanup)
(let ((found-start (window-start (selected-window))) (let ((found-start (window-start (selected-window)))
(found-point (point))) (found-point (point)))
(if isearch-window-configuration (if isearch-window-configuration
...@@ -2329,7 +2329,7 @@ since they have special meaning in a regexp." ...@@ -2329,7 +2329,7 @@ since they have special meaning in a regexp."
(defvar isearch-lazy-highlight-case-fold-search nil) (defvar isearch-lazy-highlight-case-fold-search nil)
(defvar isearch-lazy-highlight-regexp nil) (defvar isearch-lazy-highlight-regexp nil)
(defun isearch-lazy-highlight-cleanup (&optional force) (defun lazy-highlight-cleanup (&optional force)
"Stop lazy highlighting and remove extra highlighting from current buffer. "Stop lazy highlighting and remove extra highlighting from current buffer.
FORCE non-nil means do it whether or not `lazy-highlight-cleanup' FORCE non-nil means do it whether or not `lazy-highlight-cleanup'
is nil. This function is called when exiting an incremental search if is nil. This function is called when exiting an incremental search if
...@@ -2344,6 +2344,9 @@ is nil. This function is called when exiting an incremental search if ...@@ -2344,6 +2344,9 @@ is nil. This function is called when exiting an incremental search if
(cancel-timer isearch-lazy-highlight-timer) (cancel-timer isearch-lazy-highlight-timer)
(setq isearch-lazy-highlight-timer nil))) (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) (defun isearch-lazy-highlight-new-loop (beg end)
"Cleanup any previous `lazy-highlight' loop and begin a new one. "Cleanup any previous `lazy-highlight' loop and begin a new one.
BEG and END specify the bounds within which highlighting should occur. BEG and END specify the bounds within which highlighting should occur.
...@@ -2365,7 +2368,7 @@ by other Emacs features." ...@@ -2365,7 +2368,7 @@ by other Emacs features."
(not (= (window-end) ; Window may have been split/joined. (not (= (window-end) ; Window may have been split/joined.
isearch-lazy-highlight-window-end)))) isearch-lazy-highlight-window-end))))
;; something important did indeed change ;; something important did indeed change
(isearch-lazy-highlight-cleanup t) ;kill old loop & remove overlays (lazy-highlight-cleanup t) ;kill old loop & remove overlays
(when (not isearch-error) (when (not isearch-error)
(setq isearch-lazy-highlight-start-limit beg (setq isearch-lazy-highlight-start-limit beg
isearch-lazy-highlight-end-limit end) isearch-lazy-highlight-end-limit end)
...@@ -2443,7 +2446,7 @@ Attempt to do the search exactly the way the pending isearch would." ...@@ -2443,7 +2446,7 @@ Attempt to do the search exactly the way the pending isearch would."
;; non-zero-length match ;; non-zero-length match
(let ((ov (make-overlay mb me))) (let ((ov (make-overlay mb me)))
(push ov isearch-lazy-highlight-overlays) (push ov isearch-lazy-highlight-overlays)
(overlay-put ov 'face isearch-lazy-highlight-face) (overlay-put ov 'face lazy-highlight-face)
(overlay-put ov 'priority 0) ;lower than main overlay (overlay-put ov 'priority 0) ;lower than main overlay
(overlay-put ov 'window (selected-window)))) (overlay-put ov 'window (selected-window))))
(if isearch-forward (if isearch-forward
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment