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

[Kenichi Handa]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.161 emacs/lisp/replace.el:1.162
*** emacs/lisp/replace.el:1.161 Wed Nov  6 00:08:16 2002
--- emacs/lisp/replace.el       Wed Nov 13 02:06:07 2002
***************
*** 773,779 ****
                            title-face prefix-face match-face keep-props)
    (with-current-buffer out-buf
      (setq buffer-read-only nil)
!     (let ((globalcount 0))
        ;; Map over all the buffers
        (dolist (buf buffers)
        (when (buffer-live-p buf)
--- 773,780 ----
                            title-face prefix-face match-face keep-props)
    (with-current-buffer out-buf
      (setq buffer-read-only nil)
!     (let ((globalcount 0)
!         (coding nil))
        ;; Map over all the buffers
        (dolist (buf buffers)
        (when (buffer-live-p buf)
***************
*** 789,794 ****
--- 790,800 ----
                (headerpt (with-current-buffer out-buf (point))))
            (save-excursion
              (set-buffer buf)
+             (or coding
+                 ;; Set CODING only if the current buffer locally
+                 ;; binds buffer-file-coding-system.
+                 (not (local-variable-p 'buffer-file-coding-system))
+                 (setq coding buffer-file-coding-system))
              (save-excursion
                (goto-char (point-min)) ;; begin searching in the buffer
                (while (not (eobp))
***************
*** 878,883 ****
--- 884,894 ----
                                          `(font-lock-face ,title-face))
                                        `(occur-title ,buf))))
                (goto-char (point-min)))))))
+       (if coding
+         ;; CODING is buffer-file-coding-system of the first buffer
+         ;; that locally binds it.  Let's use it also for the output
+         ;; buffer.
+         (set-buffer-file-coding-system coding))
        ;; Return the number of matches
        globalcount)))