[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el |
Date: |
Tue, 05 Mar 2002 00:34:20 -0500 |
Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.55 emacs/lisp/ediff.el:1.56
*** emacs/lisp/ediff.el:1.55 Sun Jan 13 04:55:20 2002
--- emacs/lisp/ediff.el Tue Mar 5 00:34:19 2002
***************
*** 6,13 ****
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix
! (defconst ediff-version "2.76.1" "The current version of Ediff")
! (defconst ediff-date "January 4, 2002" "Date of last update")
;; This file is part of GNU Emacs.
--- 6,13 ----
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix
! (defconst ediff-version "2.77" "The current version of Ediff")
! (defconst ediff-date "March 5, 2002" "Date of last update")
;; This file is part of GNU Emacs.
***************
*** 154,160 ****
;; Last directory used by an Ediff command for the ancestor file.
(defvar ediff-last-dir-ancestor nil)
;; Last directory used by an Ediff command as the output directory for merge.
! (defvar ediff-last-merge-autostore-dir)
;; Used as a startup hook to set `_orig' patch file read-only.
--- 154,160 ----
;; Last directory used by an Ediff command for the ancestor file.
(defvar ediff-last-dir-ancestor nil)
;; Last directory used by an Ediff command as the output directory for merge.
! (defvar ediff-last-merge-autostore-dir nil)
;; Used as a startup hook to set `_orig' patch file read-only.
***************
*** 688,695 ****
(or (stringp merge-autostore-dir)
(error "%s: Directory for storing merged files must be a string"
jobname)))
! (let (diffs ; var where ediff-intersect-directories returns the diff list
! file-list meta-buf)
(if (and ediff-autostore-merges
(ediff-merge-metajob jobname)
(not merge-autostore-dir))
--- 688,698 ----
(or (stringp merge-autostore-dir)
(error "%s: Directory for storing merged files must be a string"
jobname)))
! (let (;; dir-diff-struct is of the form (common-list diff-list)
! ;; It is a structure where ediff-intersect-directories returns
! ;; commonalities and differences among directories
! dir-diff-struct
! meta-buf)
(if (and ediff-autostore-merges
(ediff-merge-metajob jobname)
(not merge-autostore-dir))
***************
*** 715,723 ****
"Directory for saving merged files = Ancestor Directory.
Sure? ")
(error "Directory merge aborted")))))
! (setq file-list (ediff-intersect-directories
! jobname 'diffs
! regexp dir1 dir2 dir3 merge-autostore-dir))
(setq startup-hooks
;; this sets various vars in the meta buffer inside
;; ediff-prepare-meta-buffer
--- 718,726 ----
"Directory for saving merged files = Ancestor Directory.
Sure? ")
(error "Directory merge aborted")))))
! (setq dir-diff-struct (ediff-intersect-directories
! jobname
! regexp dir1 dir2 dir3 merge-autostore-dir))
(setq startup-hooks
;; this sets various vars in the meta buffer inside
;; ediff-prepare-meta-buffer
***************
*** 725,735 ****
;; tell what to do if the user clicks on a session record
(setq ediff-session-action-function (quote ,action))
;; set ediff-dir-difference-list
! (setq ediff-dir-difference-list (quote ,diffs)))
startup-hooks))
(setq meta-buf (ediff-prepare-meta-buffer
'ediff-filegroup-action
! file-list
"*Ediff Session Group Panel"
'ediff-redraw-directory-group-buffer
jobname
--- 728,739 ----
;; tell what to do if the user clicks on a session record
(setq ediff-session-action-function (quote ,action))
;; set ediff-dir-difference-list
! (setq ediff-dir-difference-list
! (cdr (quote ,dir-diff-struct))))
startup-hooks))
(setq meta-buf (ediff-prepare-meta-buffer
'ediff-filegroup-action
! (car dir-diff-struct)
"*Ediff Session Group Panel"
'ediff-redraw-directory-group-buffer
jobname
***************
*** 839,848 ****
end-B (window-end))))
(setq buffer-A
(ediff-clone-buffer-for-window-comparison
! buffer-A wind-A "-Window1-")
buffer-B
(ediff-clone-buffer-for-window-comparison
! buffer-B wind-B "-Window2-"))
(ediff-regions-internal
buffer-A beg-A end-A buffer-B beg-B end-B
startup-hooks job-name word-mode nil)))
--- 843,852 ----
end-B (window-end))))
(setq buffer-A
(ediff-clone-buffer-for-window-comparison
! buffer-A wind-A "-Window.A-")
buffer-B
(ediff-clone-buffer-for-window-comparison
! buffer-B wind-B "-Window.B-"))
(ediff-regions-internal
buffer-A beg-A end-A buffer-B beg-B end-B
startup-hooks job-name word-mode nil)))
***************
*** 853,870 ****
buff-name
(concat buff-name region-name
(symbol-name (gensym)))))
! (wind (ediff-get-visible-buffer-window buff-name)))
(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)
! (message
! "Mark a region in buffer %s; then type %s. Use %s to abort."
! (buffer-name cloned-buff)
! (ediff-format-bindings-of 'exit-recursive-edit)
! (ediff-format-bindings-of 'abort-recursive-edit))
! (recursive-edit)
cloned-buff))
(defun ediff-clone-buffer-for-window-comparison (buff wind region-name)
--- 857,888 ----
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)
***************
*** 910,918 ****
(let ((buffer-A
! (ediff-clone-buffer-for-region-comparison buffer-A "-Region1-"))
(buffer-B
! (ediff-clone-buffer-for-region-comparison buffer-B "-Region2-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
--- 928,936 ----
(let ((buffer-A
! (ediff-clone-buffer-for-region-comparison buffer-A "-Region.A-"))
(buffer-B
! (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
***************
*** 954,962 ****
(error "Buffer %S doesn't exist" buffer-B))
(let ((buffer-A
! (ediff-clone-buffer-for-region-comparison buffer-A "-Region1-"))
(buffer-B
! (ediff-clone-buffer-for-region-comparison buffer-B "-Region2-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
--- 972,980 ----
(error "Buffer %S doesn't exist" buffer-B))
(let ((buffer-A
! (ediff-clone-buffer-for-region-comparison buffer-A "-Region.A-"))
(buffer-B
! (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
- [Emacs-diffs] Changes to emacs/lisp/ediff.el,
Michael Kifer <=