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

[Eli Zaretskii]

Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.56 emacs/lisp/ediff.el:1.57
*** emacs/lisp/ediff.el:1.56    Tue Mar  5 00:34:19 2002
--- emacs/lisp/ediff.el Wed Mar 20 01:36:18 2002
***************
*** 851,905 ****
       buffer-A beg-A end-A buffer-B beg-B end-B
       startup-hooks job-name word-mode nil)))
       
- ;; Suggested by Hannu Koivisto <address@hidden>
- (defun ediff-clone-buffer-for-region-comparison (buff-name region-name)
-   (let ((cloned-buff (ediff-make-indirect-buffer
-                     buff-name
-                     (concat buff-name region-name
-                             (symbol-name (gensym)))))
-       (wind (ediff-get-visible-buffer-window buff-name))
-       (pop-up-windows t)
-       other-wind
-       msg-buf)
-     (ediff-with-current-buffer cloned-buff
-       (setq ediff-temp-indirect-buffer t))
-     (if (window-live-p wind)
-       (set-window-buffer wind cloned-buff))
-     (pop-to-buffer cloned-buff)
-     (with-temp-buffer
-       (erase-buffer)
-       (insert
-        (format "\n   *******  Mark a region in buffer %s  *******\n"
-              (buffer-name cloned-buff)))
-       (insert
-        (format "\n\t      When done, type %s       Use %s to abort\n    "
-              (ediff-format-bindings-of 'exit-recursive-edit)
-              (ediff-format-bindings-of 'abort-recursive-edit)))
-       (goto-char (point-min))
-       (setq msg-buf (current-buffer))
-       (other-window 1)
-       (set-window-buffer (selected-window) msg-buf)
-       (shrink-window-if-larger-than-buffer)
-       (select-window wind)
-       (recursive-edit)
-       )
-     cloned-buff))
- 
- (defun ediff-clone-buffer-for-window-comparison (buff wind region-name)
-   (let ((cloned-buff (ediff-make-indirect-buffer
-                     buff
-                     (concat (buffer-name buff)
-                             region-name (symbol-name (gensym))))))
-     (ediff-with-current-buffer cloned-buff
-       (setq ediff-temp-indirect-buffer t))
-     (set-window-buffer wind cloned-buff)
-     cloned-buff))
- 
- (defun ediff-make-indirect-buffer (base-buf indirect-buf-name)
-   (ediff-cond-compile-for-xemacs-or-emacs
-    (make-indirect-buffer base-buf indirect-buf-name) ; xemacs
-    (make-indirect-buffer base-buf indirect-buf-name 'clone) ; emacs
-    ))
  
  ;;;###autoload
  (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
--- 851,856 ----
***************
*** 1237,1243 ****
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's latest version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
--- 1188,1194 ----
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
***************
*** 1269,1275 ****
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's latest version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
--- 1220,1226 ----
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
***************
*** 1385,1391 ****
    (let (rev1 rev2)
      (setq rev1
          (read-string
!          (format "Version 1 to compare (default: %s's latest version): "
                   (file-name-nondirectory file)))
          rev2
          (read-string 
--- 1336,1342 ----
    (let (rev1 rev2)
      (setq rev1
          (read-string
!          (format "Version 1 to compare (default: %s's working version): "
                   (file-name-nondirectory file)))
          rev2
          (read-string