[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106053: * lisp/isearch.el (isearch-l
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106053: * lisp/isearch.el (isearch-lazy-highlight-word): New variable. |
Date: |
Tue, 11 Oct 2011 18:00:42 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106053
fixes bug(s): http://debbugs.gnu.org/9727
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 18:00:42 +0300
message:
* lisp/isearch.el (isearch-lazy-highlight-word): New variable.
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
modified:
lisp/ChangeLog
lisp/isearch.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-11 07:28:27 +0000
+++ b/lisp/ChangeLog 2011-10-11 15:00:42 +0000
@@ -1,3 +1,9 @@
+2011-10-11 Juri Linkov <address@hidden>
+
+ * isearch.el (isearch-lazy-highlight-word): New variable.
+ (isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
+ Use it. (Bug#9727)
+
2011-10-11 Glenn Morris <address@hidden>
* progmodes/f90.el (f90-next-statement): Ignore preprocessor lines,
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2011-09-18 20:28:45 +0000
+++ b/lisp/isearch.el 2011-10-11 15:00:42 +0000
@@ -2617,6 +2617,7 @@
(defvar isearch-lazy-highlight-case-fold-search nil)
(defvar isearch-lazy-highlight-regexp nil)
(defvar isearch-lazy-highlight-space-regexp nil)
+(defvar isearch-lazy-highlight-word nil)
(defvar isearch-lazy-highlight-forward nil)
(defvar isearch-lazy-highlight-error nil)
@@ -2655,6 +2656,8 @@
isearch-case-fold-search))
(not (eq isearch-lazy-highlight-regexp
isearch-regexp))
+ (not (eq isearch-lazy-highlight-word
+ isearch-word))
(not (= (window-start)
isearch-lazy-highlight-window-start))
(not (= (window-end) ; Window may have been split/joined.
@@ -2675,11 +2678,12 @@
isearch-lazy-highlight-window-end (window-end)
isearch-lazy-highlight-start (point)
isearch-lazy-highlight-end (point)
+ isearch-lazy-highlight-wrapped nil
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-regexp isearch-regexp
isearch-lazy-highlight-space-regexp search-whitespace-regexp
+ isearch-lazy-highlight-word isearch-word
isearch-lazy-highlight-forward isearch-forward)
(unless (equal isearch-string "")
(setq isearch-lazy-highlight-timer
@@ -2693,6 +2697,7 @@
(let ((case-fold-search isearch-lazy-highlight-case-fold-search)
(isearch-regexp isearch-lazy-highlight-regexp)
(search-spaces-regexp isearch-lazy-highlight-space-regexp)
+ (isearch-word isearch-lazy-highlight-word)
(search-invisible nil) ; don't match invisible text
(retry t)
(success nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106053: * lisp/isearch.el (isearch-lazy-highlight-word): New variable.,
Juri Linkov <=