[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/replace.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/replace.el |
Date: |
Wed, 16 Feb 2005 04:49:45 -0500 |
Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.203 emacs/lisp/replace.el:1.204
*** emacs/lisp/replace.el:1.203 Wed Feb 9 15:50:41 2005
--- emacs/lisp/replace.el Wed Feb 16 09:49:45 2005
***************
*** 1435,1441 ****
query-replace-skip-read-only))
(unless (or literal noedit)
(replace-highlight (nth 0 real-match-data)
! (nth 1 real-match-data)))
(setq noedit
(replace-match-maybe-edit
next-replacement nocasify literal
--- 1435,1442 ----
query-replace-skip-read-only))
(unless (or literal noedit)
(replace-highlight (nth 0 real-match-data)
! (nth 1 real-match-data)
! start end))
(setq noedit
(replace-match-maybe-edit
next-replacement nocasify literal
***************
*** 1451,1457 ****
;; `real-match-data'.
(while (not done)
(set-match-data real-match-data)
! (replace-highlight (match-beginning 0) (match-end 0))
;; Bind message-log-max so we don't fill up the message log
;; with a bunch of identical messages.
(let ((message-log-max nil))
--- 1452,1459 ----
;; `real-match-data'.
(while (not done)
(set-match-data real-match-data)
! (replace-highlight (match-beginning 0) (match-end 0)
! start end)
;; Bind message-log-max so we don't fill up the message log
;; with a bunch of identical messages.
(let ((message-log-max nil))
***************
*** 1627,1641 ****
(defvar replace-overlay nil)
! (defun replace-highlight (beg end)
(if query-replace-highlight
(if replace-overlay
! (move-overlay replace-overlay beg end (current-buffer))
! (setq replace-overlay (make-overlay beg end))
(overlay-put replace-overlay 'priority 1) ;higher than lazy overlays
(overlay-put replace-overlay 'face 'query-replace)))
! (if query-replace-lazy-highlight
! (isearch-lazy-highlight-new-loop)))
(defun replace-dehighlight ()
(when replace-overlay
--- 1629,1643 ----
(defvar replace-overlay nil)
! (defun replace-highlight (match-beg match-end range-beg range-end)
(if query-replace-highlight
(if replace-overlay
! (move-overlay replace-overlay match-beg match-end (current-buffer))
! (setq replace-overlay (make-overlay match-beg match-end))
(overlay-put replace-overlay 'priority 1) ;higher than lazy overlays
(overlay-put replace-overlay 'face 'query-replace)))
! (when query-replace-lazy-highlight
! (isearch-lazy-highlight-new-loop range-beg range-end)))
(defun replace-dehighlight ()
(when replace-overlay