diff options
| author | Chong Yidong | 2012-12-04 10:47:43 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-12-04 10:47:43 +0800 |
| commit | 770de7cf722062fb90e1d8cb344d7dfbd89013ed (patch) | |
| tree | a213f1b9fd0c6cda30733a4a495dd4a2bc21bc4b /lisp/vc/ediff-diff.el | |
| parent | c38a186c2e06e0a351d166c5ef06d7307e145f45 (diff) | |
| download | emacs-770de7cf722062fb90e1d8cb344d7dfbd89013ed.tar.gz emacs-770de7cf722062fb90e1d8cb344d7dfbd89013ed.zip | |
Obsolete longlines.el.
* longlines.el: Move to obsolete/.
* lisp/org/org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
longlines-mode.
* lisp/vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
Remove code referring to longlines mode.
Diffstat (limited to 'lisp/vc/ediff-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 145 |
1 files changed, 47 insertions, 98 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 5b31e625a00..aa7c9007200 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -453,52 +453,30 @@ one optional arguments, diff-number to refine.") | |||
| 453 | c-prev c-end) | 453 | c-prev c-end) |
| 454 | ;; else convert lines to points | 454 | ;; else convert lines to points |
| 455 | (ediff-with-current-buffer A-buffer | 455 | (ediff-with-current-buffer A-buffer |
| 456 | (let ((longlines-mode-val | 456 | (goto-char (or a-prev-pt shift-A (point-min))) |
| 457 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 457 | (forward-line (- a-begin a-prev)) |
| 458 | ;; we must disable and then restore longlines-mode | 458 | (setq a-begin-pt (point)) |
| 459 | (if (eq longlines-mode-val 1) | 459 | (forward-line (- a-end a-begin)) |
| 460 | (longlines-mode 0)) | 460 | (setq a-end-pt (point) |
| 461 | (goto-char (or a-prev-pt shift-A (point-min))) | 461 | a-prev a-end |
| 462 | (forward-line (- a-begin a-prev)) | 462 | a-prev-pt a-end-pt)) |
| 463 | (setq a-begin-pt (point)) | ||
| 464 | (forward-line (- a-end a-begin)) | ||
| 465 | (setq a-end-pt (point) | ||
| 466 | a-prev a-end | ||
| 467 | a-prev-pt a-end-pt) | ||
| 468 | (if (eq longlines-mode-val 1) | ||
| 469 | (longlines-mode longlines-mode-val)) | ||
| 470 | )) | ||
| 471 | (ediff-with-current-buffer B-buffer | 463 | (ediff-with-current-buffer B-buffer |
| 472 | (let ((longlines-mode-val | 464 | (goto-char (or b-prev-pt shift-B (point-min))) |
| 473 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 465 | (forward-line (- b-begin b-prev)) |
| 474 | (if (eq longlines-mode-val 1) | 466 | (setq b-begin-pt (point)) |
| 475 | (longlines-mode 0)) | 467 | (forward-line (- b-end b-begin)) |
| 476 | (goto-char (or b-prev-pt shift-B (point-min))) | 468 | (setq b-end-pt (point) |
| 477 | (forward-line (- b-begin b-prev)) | 469 | b-prev b-end |
| 478 | (setq b-begin-pt (point)) | 470 | b-prev-pt b-end-pt)) |
| 479 | (forward-line (- b-end b-begin)) | ||
| 480 | (setq b-end-pt (point) | ||
| 481 | b-prev b-end | ||
| 482 | b-prev-pt b-end-pt) | ||
| 483 | (if (eq longlines-mode-val 1) | ||
| 484 | (longlines-mode longlines-mode-val)) | ||
| 485 | )) | ||
| 486 | (if (ediff-buffer-live-p C-buffer) | 471 | (if (ediff-buffer-live-p C-buffer) |
| 487 | (ediff-with-current-buffer C-buffer | 472 | (ediff-with-current-buffer C-buffer |
| 488 | (let ((longlines-mode-val | 473 | (goto-char (or c-prev-pt (point-min))) |
| 489 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 474 | (forward-line (- c-begin c-prev)) |
| 490 | (if (eq longlines-mode-val 1) | 475 | (setq c-begin-pt (point)) |
| 491 | (longlines-mode 0)) | 476 | (forward-line (- c-end c-begin)) |
| 492 | (goto-char (or c-prev-pt (point-min))) | 477 | (setq c-end-pt (point) |
| 493 | (forward-line (- c-begin c-prev)) | 478 | c-prev c-end |
| 494 | (setq c-begin-pt (point)) | 479 | c-prev-pt c-end-pt))) |
| 495 | (forward-line (- c-end c-begin)) | ||
| 496 | (setq c-end-pt (point) | ||
| 497 | c-prev c-end | ||
| 498 | c-prev-pt c-end-pt) | ||
| 499 | (if (eq longlines-mode-val 1) | ||
| 500 | (longlines-mode longlines-mode-val)) | ||
| 501 | ))) | ||
| 502 | (setq diff-list | 480 | (setq diff-list |
| 503 | (nconc | 481 | (nconc |
| 504 | diff-list | 482 | diff-list |
| @@ -1085,65 +1063,36 @@ delimiter regions")) | |||
| 1085 | c-prev c-end) | 1063 | c-prev c-end) |
| 1086 | ;; else convert lines to points | 1064 | ;; else convert lines to points |
| 1087 | (ediff-with-current-buffer A-buffer | 1065 | (ediff-with-current-buffer A-buffer |
| 1088 | (let ((longlines-mode-val | 1066 | (goto-char (or a-prev-pt shift-A (point-min))) |
| 1089 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 1067 | (forward-line (- a-begin a-prev)) |
| 1090 | ;; we must disable and then restore longlines-mode | 1068 | (setq a-begin-pt (point)) |
| 1091 | (if (eq longlines-mode-val 1) | 1069 | (forward-line (- a-end a-begin)) |
| 1092 | (longlines-mode 0)) | 1070 | (setq a-end-pt (point) |
| 1093 | (goto-char (or a-prev-pt shift-A (point-min))) | 1071 | a-prev a-end |
| 1094 | (forward-line (- a-begin a-prev)) | 1072 | a-prev-pt a-end-pt)) |
| 1095 | (setq a-begin-pt (point)) | ||
| 1096 | (forward-line (- a-end a-begin)) | ||
| 1097 | (setq a-end-pt (point) | ||
| 1098 | a-prev a-end | ||
| 1099 | a-prev-pt a-end-pt) | ||
| 1100 | (if (eq longlines-mode-val 1) | ||
| 1101 | (longlines-mode longlines-mode-val)) | ||
| 1102 | )) | ||
| 1103 | (ediff-with-current-buffer B-buffer | 1073 | (ediff-with-current-buffer B-buffer |
| 1104 | (let ((longlines-mode-val | 1074 | (goto-char (or b-prev-pt shift-B (point-min))) |
| 1105 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 1075 | (forward-line (- b-begin b-prev)) |
| 1106 | (if (eq longlines-mode-val 1) | 1076 | (setq b-begin-pt (point)) |
| 1107 | (longlines-mode 0)) | 1077 | (forward-line (- b-end b-begin)) |
| 1108 | (goto-char (or b-prev-pt shift-B (point-min))) | 1078 | (setq b-end-pt (point) |
| 1109 | (forward-line (- b-begin b-prev)) | 1079 | b-prev b-end |
| 1110 | (setq b-begin-pt (point)) | 1080 | b-prev-pt b-end-pt)) |
| 1111 | (forward-line (- b-end b-begin)) | ||
| 1112 | (setq b-end-pt (point) | ||
| 1113 | b-prev b-end | ||
| 1114 | b-prev-pt b-end-pt) | ||
| 1115 | (if (eq longlines-mode-val 1) | ||
| 1116 | (longlines-mode longlines-mode-val)) | ||
| 1117 | )) | ||
| 1118 | (ediff-with-current-buffer C-buffer | 1081 | (ediff-with-current-buffer C-buffer |
| 1119 | (let ((longlines-mode-val | 1082 | (goto-char (or c-prev-pt shift-C (point-min))) |
| 1120 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 1083 | (forward-line (- c-begin c-prev)) |
| 1121 | (if (eq longlines-mode-val 1) | 1084 | (setq c-begin-pt (point)) |
| 1122 | (longlines-mode 0)) | 1085 | (forward-line (- c-end c-begin)) |
| 1123 | (goto-char (or c-prev-pt shift-C (point-min))) | 1086 | (setq c-end-pt (point) |
| 1124 | (forward-line (- c-begin c-prev)) | 1087 | c-prev c-end |
| 1125 | (setq c-begin-pt (point)) | 1088 | c-prev-pt c-end-pt)) |
| 1126 | (forward-line (- c-end c-begin)) | ||
| 1127 | (setq c-end-pt (point) | ||
| 1128 | c-prev c-end | ||
| 1129 | c-prev-pt c-end-pt) | ||
| 1130 | (if (eq longlines-mode-val 1) | ||
| 1131 | (longlines-mode longlines-mode-val)) | ||
| 1132 | )) | ||
| 1133 | (if (ediff-buffer-live-p anc-buffer) | 1089 | (if (ediff-buffer-live-p anc-buffer) |
| 1134 | (ediff-with-current-buffer anc-buffer | 1090 | (ediff-with-current-buffer anc-buffer |
| 1135 | (let ((longlines-mode-val | 1091 | (forward-line (- c-or-anc-begin anc-prev)) |
| 1136 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | 1092 | (setq anc-begin-pt (point)) |
| 1137 | (if (eq longlines-mode-val 1) | 1093 | (forward-line (- c-or-anc-end c-or-anc-begin)) |
| 1138 | (longlines-mode 0)) | 1094 | (setq anc-end-pt (point) |
| 1139 | (forward-line (- c-or-anc-begin anc-prev)) | 1095 | anc-prev c-or-anc-end))) |
| 1140 | (setq anc-begin-pt (point)) | ||
| 1141 | (forward-line (- c-or-anc-end c-or-anc-begin)) | ||
| 1142 | (setq anc-end-pt (point) | ||
| 1143 | anc-prev c-or-anc-end) | ||
| 1144 | (if (eq longlines-mode-val 1) | ||
| 1145 | (longlines-mode longlines-mode-val)) | ||
| 1146 | ))) | ||
| 1147 | (setq diff-list | 1096 | (setq diff-list |
| 1148 | (nconc | 1097 | (nconc |
| 1149 | diff-list | 1098 | diff-list |