mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 638-652) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 202) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
This commit is contained in:
commit
a73d7753f9
184 changed files with 27171 additions and 14227 deletions
|
|
@ -2317,6 +2317,7 @@ since they have special meaning in a regexp."
|
|||
(defvar isearch-lazy-highlight-window-end nil)
|
||||
(defvar isearch-lazy-highlight-case-fold-search nil)
|
||||
(defvar isearch-lazy-highlight-regexp nil)
|
||||
(defvar isearch-lazy-highlight-space-regexp nil)
|
||||
|
||||
(defun lazy-highlight-cleanup (&optional force)
|
||||
"Stop lazy highlighting and remove extra highlighting from current buffer.
|
||||
|
|
@ -2370,7 +2371,8 @@ by other Emacs features."
|
|||
isearch-lazy-highlight-last-string isearch-string
|
||||
isearch-lazy-highlight-case-fold-search isearch-case-fold-search
|
||||
isearch-lazy-highlight-regexp isearch-regexp
|
||||
isearch-lazy-highlight-wrapped nil)
|
||||
isearch-lazy-highlight-wrapped nil
|
||||
isearch-lazy-highlight-space-regexp search-whitespace-regexp)
|
||||
(unless (equal isearch-string "")
|
||||
(setq isearch-lazy-highlight-timer
|
||||
(run-with-idle-timer lazy-highlight-initial-delay nil
|
||||
|
|
@ -2381,7 +2383,7 @@ by other Emacs features."
|
|||
Attempt to do the search exactly the way the pending isearch would."
|
||||
(let ((case-fold-search isearch-lazy-highlight-case-fold-search)
|
||||
(isearch-regexp isearch-lazy-highlight-regexp)
|
||||
(search-spaces-regexp search-whitespace-regexp))
|
||||
(search-spaces-regexp isearch-lazy-highlight-space-regexp))
|
||||
(condition-case nil
|
||||
(isearch-search-string
|
||||
isearch-lazy-highlight-last-string
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue