aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-01-06 19:04:32 +0000
committerEli Zaretskii2001-01-06 19:04:32 +0000
commit380866a2a5d13436018019d83d0d3bf9fa347d3f (patch)
tree027db3e1198f73bf7665366bb2061c818e43c491
parent148b5960d421f9493b3bdba431c6caeef64d7237 (diff)
downloademacs-380866a2a5d13436018019d83d0d3bf9fa347d3f.tar.gz
emacs-380866a2a5d13436018019d83d0d3bf9fa347d3f.zip
(isearch-lazy-highlight-remove-overlays): Doc fix.
(isearch-lazy-highlight-update): Doc fix.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/isearch.el8
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfbf87ea3ca..b19c88ecc3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-01-06 Eli Zaretskii <eliz@is.elta.co.il> 12001-01-06 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * isearch.el (isearch-lazy-highlight-remove-overlays): Doc fix.
4 (isearch-lazy-highlight-update): Doc fix.
5
3 * ffap.el (ffap-bindings): Doc fix. 6 * ffap.el (ffap-bindings): Doc fix.
4 7
5 * dired-x.el (dired-virtual-guess-dir): Doc fix. 8 * dired-x.el (dired-virtual-guess-dir): Doc fix.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6191c4912f5..89cf07d89c8 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -552,7 +552,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
552 552
553 ;; We must bypass input method while reading key. When a user type 553 ;; We must bypass input method while reading key. When a user type
554 ;; printable character, appropriate input method is turned on in 554 ;; printable character, appropriate input method is turned on in
555 ;; minibuffer to read multibyte charactes. 555 ;; minibuffer to read multibyte characters.
556 (or isearch-input-method-local-p 556 (or isearch-input-method-local-p
557 (make-local-variable 'input-method-function)) 557 (make-local-variable 'input-method-function))
558 (setq input-method-function nil) 558 (setq input-method-function nil)
@@ -1607,7 +1607,7 @@ If there is no completion possible, say so and continue searching."
1607 ;; properties, and then set them to nil. This way the text hidden 1607 ;; properties, and then set them to nil. This way the text hidden
1608 ;; by this overlay becomes visible. 1608 ;; by this overlay becomes visible.
1609 1609
1610 ;; Do we realy need to set the `intangible' property to t? Can we 1610 ;; Do we really need to set the `intangible' property to t? Can we
1611 ;; have the point inside an overlay with an `intangible' property? 1611 ;; have the point inside an overlay with an `intangible' property?
1612 ;; In 19.34 this does not exist so I cannot test it. 1612 ;; In 19.34 this does not exist so I cannot test it.
1613 (overlay-put ov 'isearch-invisible (overlay-get ov 'invisible)) 1613 (overlay-put ov 'isearch-invisible (overlay-get ov 'invisible))
@@ -1924,7 +1924,7 @@ This function is called when exiting an incremental search."
1924(defun isearch-lazy-highlight-remove-overlays (&optional keep-start keep-end) 1924(defun isearch-lazy-highlight-remove-overlays (&optional keep-start keep-end)
1925 "Remove lazy highlight overlays from the current buffer. 1925 "Remove lazy highlight overlays from the current buffer.
1926With optional arguments KEEP-START and KEEP-END, 1926With optional arguments KEEP-START and KEEP-END,
1927prserve any overlays in that range." 1927preserve any overlays in that range."
1928 (let ((tem isearch-lazy-highlight-overlays)) 1928 (let ((tem isearch-lazy-highlight-overlays))
1929 (while tem 1929 (while tem
1930 (if (or (null keep-start) 1930 (if (or (null keep-start)
@@ -1961,7 +1961,7 @@ search string to change)."
1961 'isearch-lazy-highlight-update)))) 1961 'isearch-lazy-highlight-update))))
1962 1962
1963(defun isearch-lazy-highlight-update () 1963(defun isearch-lazy-highlight-update ()
1964 "Update highlighting of possible other matchesfor isearch." 1964 "Update highlighting of possible other matches for isearch."
1965 (unless (and (eq isearch-lazy-highlight-window (selected-window)) 1965 (unless (and (eq isearch-lazy-highlight-window (selected-window))
1966 (equal isearch-lazy-highlight-start (window-start))) 1966 (equal isearch-lazy-highlight-start (window-start)))
1967 1967