[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el
|
From: |
Michael Kifer |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el |
|
Date: |
Sun, 10 Jul 2005 14:46:27 -0400 |
Index: emacs/lisp/ediff-diff.el
diff -c emacs/lisp/ediff-diff.el:1.45 emacs/lisp/ediff-diff.el:1.46
*** emacs/lisp/ediff-diff.el:1.45 Mon Jul 4 23:08:53 2005
--- emacs/lisp/ediff-diff.el Sun Jul 10 18:46:24 2005
***************
*** 459,482 ****
c-prev c-end)
;; else convert lines to points
(ediff-with-current-buffer A-buffer
! (forward-line (- a-begin a-prev))
! (setq a-begin-pt (point))
! (forward-line (- a-end a-begin))
! (setq a-end-pt (point)
! a-prev a-end))
(ediff-with-current-buffer B-buffer
! (forward-line (- b-begin b-prev))
! (setq b-begin-pt (point))
! (forward-line (- b-end b-begin))
! (setq b-end-pt (point)
! b-prev b-end))
(if (ediff-buffer-live-p C-buffer)
(ediff-with-current-buffer C-buffer
! (forward-line (- c-begin c-prev))
! (setq c-begin-pt (point))
! (forward-line (- c-end c-begin))
! (setq c-end-pt (point)
! c-prev c-end)))
(setq diff-list
(nconc
diff-list
--- 459,504 ----
c-prev c-end)
;; else convert lines to points
(ediff-with-current-buffer A-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
! ;; we must disable and then restore longlines-mode
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- a-begin a-prev))
! (setq a-begin-pt (point))
! (forward-line (- a-end a-begin))
! (setq a-end-pt (point)
! a-prev a-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! ))
(ediff-with-current-buffer B-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- b-begin b-prev))
! (setq b-begin-pt (point))
! (forward-line (- b-end b-begin))
! (setq b-end-pt (point)
! b-prev b-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! ))
(if (ediff-buffer-live-p C-buffer)
(ediff-with-current-buffer C-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- c-begin c-prev))
! (setq c-begin-pt (point))
! (forward-line (- c-end c-begin))
! (setq c-end-pt (point)
! c-prev c-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! )))
(setq diff-list
(nconc
diff-list
***************
*** 1060,1089 ****
c-prev c-end)
;; else convert lines to points
(ediff-with-current-buffer A-buffer
! (forward-line (- a-begin a-prev))
! (setq a-begin-pt (point))
! (forward-line (- a-end a-begin))
! (setq a-end-pt (point)
! a-prev a-end))
(ediff-with-current-buffer B-buffer
! (forward-line (- b-begin b-prev))
! (setq b-begin-pt (point))
! (forward-line (- b-end b-begin))
! (setq b-end-pt (point)
! b-prev b-end))
(ediff-with-current-buffer C-buffer
! (forward-line (- c-begin c-prev))
! (setq c-begin-pt (point))
! (forward-line (- c-end c-begin))
! (setq c-end-pt (point)
! c-prev c-end))
(if (ediff-buffer-live-p anc-buffer)
(ediff-with-current-buffer anc-buffer
! (forward-line (- c-or-anc-begin anc-prev))
! (setq anc-begin-pt (point))
! (forward-line (- c-or-anc-end c-or-anc-begin))
! (setq anc-end-pt (point)
! anc-prev c-or-anc-end)))
(setq diff-list
(nconc
diff-list
--- 1082,1140 ----
c-prev c-end)
;; else convert lines to points
(ediff-with-current-buffer A-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1
0)))
! ;; we must disable and then restore longlines-mode
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- a-begin a-prev))
! (setq a-begin-pt (point))
! (forward-line (- a-end a-begin))
! (setq a-end-pt (point)
! a-prev a-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! ))
(ediff-with-current-buffer B-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1
0)))
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- b-begin b-prev))
! (setq b-begin-pt (point))
! (forward-line (- b-end b-begin))
! (setq b-end-pt (point)
! b-prev b-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! ))
(ediff-with-current-buffer C-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode) 1
0)))
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- c-begin c-prev))
! (setq c-begin-pt (point))
! (forward-line (- c-end c-begin))
! (setq c-end-pt (point)
! c-prev c-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! ))
(if (ediff-buffer-live-p anc-buffer)
(ediff-with-current-buffer anc-buffer
! (let ((longlines-mode-val
! (if (and (boundp 'longlines-mode) longlines-mode)
1 0)))
! (if (eq longlines-mode-val 1)
! (longlines-mode 0))
! (forward-line (- c-or-anc-begin anc-prev))
! (setq anc-begin-pt (point))
! (forward-line (- c-or-anc-end c-or-anc-begin))
! (setq anc-end-pt (point)
! anc-prev c-or-anc-end)
! (if (eq longlines-mode-val 1)
! (longlines-mode longlines-mode-val))
! )))
(setq diff-list
(nconc
diff-list
***************
*** 1424,1430 ****
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;;; End:
-
;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
;;; ediff-diff.el ends here
--- 1475,1480 ----