851 |
buffer-A beg-A end-A buffer-B beg-B end-B |
buffer-A beg-A end-A buffer-B beg-B end-B |
852 |
startup-hooks job-name word-mode nil))) |
startup-hooks job-name word-mode nil))) |
853 |
|
|
|
;; Suggested by Hannu Koivisto <azure@iki.fi> |
|
|
(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 |
|
|
)) |
|
854 |
|
|
855 |
;;;###autoload |
;;;###autoload |
856 |
(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks) |
(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks) |
1188 |
(setq rev1 |
(setq rev1 |
1189 |
(read-string |
(read-string |
1190 |
(format |
(format |
1191 |
"Version 1 to merge (default: %s's latest version): " |
"Version 1 to merge (default: %s's working version): " |
1192 |
(if (stringp file) |
(if (stringp file) |
1193 |
(file-name-nondirectory file) "current buffer"))) |
(file-name-nondirectory file) "current buffer"))) |
1194 |
rev2 |
rev2 |
1220 |
(setq rev1 |
(setq rev1 |
1221 |
(read-string |
(read-string |
1222 |
(format |
(format |
1223 |
"Version 1 to merge (default: %s's latest version): " |
"Version 1 to merge (default: %s's working version): " |
1224 |
(if (stringp file) |
(if (stringp file) |
1225 |
(file-name-nondirectory file) "current buffer"))) |
(file-name-nondirectory file) "current buffer"))) |
1226 |
rev2 |
rev2 |
1336 |
(let (rev1 rev2) |
(let (rev1 rev2) |
1337 |
(setq rev1 |
(setq rev1 |
1338 |
(read-string |
(read-string |
1339 |
(format "Version 1 to compare (default: %s's latest version): " |
(format "Version 1 to compare (default: %s's working version): " |
1340 |
(file-name-nondirectory file))) |
(file-name-nondirectory file))) |
1341 |
rev2 |
rev2 |
1342 |
(read-string |
(read-string |