Mercurial > emacs

comparison lisp/ediff-diff.el @ 90201:fbb2bea03df9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 474-484) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 88-91) - Merge from emacs--cvs-trunk--0 - Update FSF's address in GPL notices - Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 14 Jul 2005 08:02:00 +0000
parents f9a65d7ebd29 a4c59075cac8
children 187d6a1f84f7
comparison
equal deleted inserted replaced
90200:f9a65d7ebd29 90201:fbb2bea03df9
457 a-prev a-end 457 a-prev a-end
458 b-prev b-end 458 b-prev b-end
459 c-prev c-end) 459 c-prev c-end)
460 ;; else convert lines to points 460 ;; else convert lines to points
461 (ediff-with-current-buffer A-buffer 461 (ediff-with-current-buffer A-buffer
462 (forward-line (- a-begin a-prev)) 462 (let ((longlines-mode-val
463 (setq a-begin-pt (point)) 463 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
464 (forward-line (- a-end a-begin)) 464 ;; we must disable and then restore longlines-mode
465 (setq a-end-pt (point) 465 (if (eq longlines-mode-val 1)
466 a-prev a-end)) 466 (longlines-mode 0))
467 (forward-line (- a-begin a-prev))
468 (setq a-begin-pt (point))
469 (forward-line (- a-end a-begin))
470 (setq a-end-pt (point)
471 a-prev a-end)
472 (if (eq longlines-mode-val 1)
473 (longlines-mode longlines-mode-val))
474 ))
467 (ediff-with-current-buffer B-buffer 475 (ediff-with-current-buffer B-buffer
468 (forward-line (- b-begin b-prev)) 476 (let ((longlines-mode-val
469 (setq b-begin-pt (point)) 477 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
470 (forward-line (- b-end b-begin)) 478 (if (eq longlines-mode-val 1)
471 (setq b-end-pt (point) 479 (longlines-mode 0))
472 b-prev b-end)) 480 (forward-line (- b-begin b-prev))
481 (setq b-begin-pt (point))
482 (forward-line (- b-end b-begin))
483 (setq b-end-pt (point)
484 b-prev b-end)
485 (if (eq longlines-mode-val 1)
486 (longlines-mode longlines-mode-val))
487 ))
473 (if (ediff-buffer-live-p C-buffer) 488 (if (ediff-buffer-live-p C-buffer)
474 (ediff-with-current-buffer C-buffer 489 (ediff-with-current-buffer C-buffer
475 (forward-line (- c-begin c-prev)) 490 (let ((longlines-mode-val
476 (setq c-begin-pt (point)) 491 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
477 (forward-line (- c-end c-begin)) 492 (if (eq longlines-mode-val 1)
478 (setq c-end-pt (point) 493 (longlines-mode 0))
479 c-prev c-end))) 494 (forward-line (- c-begin c-prev))
495 (setq c-begin-pt (point))
496 (forward-line (- c-end c-begin))
497 (setq c-end-pt (point)
498 c-prev c-end)
499 (if (eq longlines-mode-val 1)
500 (longlines-mode longlines-mode-val))
501 )))
480 (setq diff-list 502 (setq diff-list
481 (nconc 503 (nconc
482 diff-list 504 diff-list
483 (list 505 (list
484 (if (ediff-buffer-live-p C-buffer) 506 (if (ediff-buffer-live-p C-buffer)
1058 a-prev a-end 1080 a-prev a-end
1059 b-prev b-end 1081 b-prev b-end
1060 c-prev c-end) 1082 c-prev c-end)
1061 ;; else convert lines to points 1083 ;; else convert lines to points
1062 (ediff-with-current-buffer A-buffer 1084 (ediff-with-current-buffer A-buffer
1063 (forward-line (- a-begin a-prev)) 1085 (let ((longlines-mode-val
1064 (setq a-begin-pt (point)) 1086 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1065 (forward-line (- a-end a-begin)) 1087 ;; we must disable and then restore longlines-mode
1066 (setq a-end-pt (point) 1088 (if (eq longlines-mode-val 1)
1067 a-prev a-end)) 1089 (longlines-mode 0))
1090 (forward-line (- a-begin a-prev))
1091 (setq a-begin-pt (point))
1092 (forward-line (- a-end a-begin))
1093 (setq a-end-pt (point)
1094 a-prev a-end)
1095 (if (eq longlines-mode-val 1)
1096 (longlines-mode longlines-mode-val))
1097 ))
1068 (ediff-with-current-buffer B-buffer 1098 (ediff-with-current-buffer B-buffer
1069 (forward-line (- b-begin b-prev)) 1099 (let ((longlines-mode-val
1070 (setq b-begin-pt (point)) 1100 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1071 (forward-line (- b-end b-begin)) 1101 (if (eq longlines-mode-val 1)
1072 (setq b-end-pt (point) 1102 (longlines-mode 0))
1073 b-prev b-end)) 1103 (forward-line (- b-begin b-prev))
1104 (setq b-begin-pt (point))
1105 (forward-line (- b-end b-begin))
1106 (setq b-end-pt (point)
1107 b-prev b-end)
1108 (if (eq longlines-mode-val 1)
1109 (longlines-mode longlines-mode-val))
1110 ))
1074 (ediff-with-current-buffer C-buffer 1111 (ediff-with-current-buffer C-buffer
1075 (forward-line (- c-begin c-prev)) 1112 (let ((longlines-mode-val
1076 (setq c-begin-pt (point)) 1113 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1077 (forward-line (- c-end c-begin)) 1114 (if (eq longlines-mode-val 1)
1078 (setq c-end-pt (point) 1115 (longlines-mode 0))
1079 c-prev c-end)) 1116 (forward-line (- c-begin c-prev))
1117 (setq c-begin-pt (point))
1118 (forward-line (- c-end c-begin))
1119 (setq c-end-pt (point)
1120 c-prev c-end)
1121 (if (eq longlines-mode-val 1)
1122 (longlines-mode longlines-mode-val))
1123 ))
1080 (if (ediff-buffer-live-p anc-buffer) 1124 (if (ediff-buffer-live-p anc-buffer)
1081 (ediff-with-current-buffer anc-buffer 1125 (ediff-with-current-buffer anc-buffer
1082 (forward-line (- c-or-anc-begin anc-prev)) 1126 (let ((longlines-mode-val
1083 (setq anc-begin-pt (point)) 1127 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1084 (forward-line (- c-or-anc-end c-or-anc-begin)) 1128 (if (eq longlines-mode-val 1)
1085 (setq anc-end-pt (point) 1129 (longlines-mode 0))
1086 anc-prev c-or-anc-end))) 1130 (forward-line (- c-or-anc-begin anc-prev))
1131 (setq anc-begin-pt (point))
1132 (forward-line (- c-or-anc-end c-or-anc-begin))
1133 (setq anc-end-pt (point)
1134 anc-prev c-or-anc-end)
1135 (if (eq longlines-mode-val 1)
1136 (longlines-mode longlines-mode-val))
1137 )))
1087 (setq diff-list 1138 (setq diff-list
1088 (nconc 1139 (nconc
1089 diff-list 1140 diff-list
1090 ;; if comparing with ancestor, then there also is a 1141 ;; if comparing with ancestor, then there also is a
1091 ;; state-of-difference marker 1142 ;; state-of-difference marker
1423 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 1474 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1424 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) 1475 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1425 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) 1476 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1426 ;;; End: 1477 ;;; End:
1427 1478
1428
1429 ;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648 1479 ;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
1430 ;;; ediff-diff.el ends here 1480 ;;; ediff-diff.el ends here