[Emacs-diffs] Changes to emacs/lisp/replace.el

[Juri Linkov]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.192 emacs/lisp/replace.el:1.193
*** emacs/lisp/replace.el:1.192 Fri Dec  3 00:19:52 2004
--- emacs/lisp/replace.el       Sun Dec 12 22:06:30 2004
***************
*** 1214,1220 ****
  
  (defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data)
    "Make a replacement with `replace-match', editing `\\?'.
! NEXTEXT, FIXEDCASE, LITERAL are just passed on.  If NOEDIT is true, no
  check for `\\?' is made to save time.  MATCH-DATA is used for the
  replacement.  In case editing is done, it is changed to use markers.
  
--- 1214,1220 ----
  
  (defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data)
    "Make a replacement with `replace-match', editing `\\?'.
! NEWTEXT, FIXEDCASE, LITERAL are just passed on.  If NOEDIT is true, no
  check for `\\?' is made to save time.  MATCH-DATA is used for the
  replacement.  In case editing is done, it is changed to use markers.
  
***************
*** 1380,1386 ****
            (if (not query-flag)
                (let ((inhibit-read-only
                       query-replace-skip-read-only))
!                 (unless noedit
                    (replace-highlight (nth 0 real-match-data)
                                       (nth 1 real-match-data)))
                  (setq noedit
--- 1380,1386 ----
            (if (not query-flag)
                (let ((inhibit-read-only
                       query-replace-skip-read-only))
!                 (unless (or literal noedit)
                    (replace-highlight (nth 0 real-match-data)
                                       (nth 1 real-match-data)))
                  (setq noedit