Mercurial > emacs
comparison lisp/ediff-util.el @ 33392:25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
buffer into fundamental mode.
(ediff-set-difference): Use copy-sequence if available.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Fri, 10 Nov 2000 22:35:35 +0000 |
| parents | 6306740f6938 |
| children | 798176da5262 |
comparison
equal
deleted
inserted
replaced
| 33391:f8c8c2d3538e | 33392:25fb6fc4f66b |
|---|---|
| 2711 (interactive) | 2711 (interactive) |
| 2712 (ediff-barf-if-not-control-buffer) | 2712 (ediff-barf-if-not-control-buffer) |
| 2713 (save-excursion | 2713 (save-excursion |
| 2714 (ediff-skip-unsuitable-frames)) | 2714 (ediff-skip-unsuitable-frames)) |
| 2715 (with-output-to-temp-buffer ediff-msg-buffer | 2715 (with-output-to-temp-buffer ediff-msg-buffer |
| 2716 (ediff-with-current-buffer standard-output | |
| 2717 (fundamental-mode)) | |
| 2716 (raise-frame (selected-frame)) | 2718 (raise-frame (selected-frame)) |
| 2717 (princ (ediff-version)) | 2719 (princ (ediff-version)) |
| 2718 (princ "\n\n") | 2720 (princ "\n\n") |
| 2719 (ediff-with-current-buffer ediff-buffer-A | 2721 (ediff-with-current-buffer ediff-buffer-A |
| 2720 (if buffer-file-name | 2722 (if buffer-file-name |
| 3836 | 3838 |
| 3837 (defun ediff-debug-info () | 3839 (defun ediff-debug-info () |
| 3838 (interactive) | 3840 (interactive) |
| 3839 (ediff-barf-if-not-control-buffer) | 3841 (ediff-barf-if-not-control-buffer) |
| 3840 (with-output-to-temp-buffer ediff-debug-buffer | 3842 (with-output-to-temp-buffer ediff-debug-buffer |
| 3843 (ediff-with-current-buffer standard-output | |
| 3844 (fundamental-mode)) | |
| 3841 (princ (format "\nCtl buffer: %S\n" ediff-control-buffer)) | 3845 (princ (format "\nCtl buffer: %S\n" ediff-control-buffer)) |
| 3842 (ediff-print-diff-vector (intern "ediff-difference-vector-A")) | 3846 (ediff-print-diff-vector (intern "ediff-difference-vector-A")) |
| 3843 (ediff-print-diff-vector (intern "ediff-difference-vector-B")) | 3847 (ediff-print-diff-vector (intern "ediff-difference-vector-B")) |
| 3844 (ediff-print-diff-vector (intern "ediff-difference-vector-C")) | 3848 (ediff-print-diff-vector (intern "ediff-difference-vector-C")) |
| 3845 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor")) | 3849 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor")) |
| 3886 (ediff-member (car lis1) lis2 comparison-func) | 3890 (ediff-member (car lis1) lis2 comparison-func) |
| 3887 (nconc result (list (car lis1)))) | 3891 (nconc result (list (car lis1)))) |
| 3888 (setq lis1 (cdr lis1))) | 3892 (setq lis1 (cdr lis1))) |
| 3889 (cdr result))) | 3893 (cdr result))) |
| 3890 | 3894 |
| 3891 (defun ediff-copy-list (list) | 3895 (if (fboundp 'copy-sequence) |
| 3892 (if (consp list) | 3896 (defalias 'ediff-copy-list 'copy-sequence) |
| 3897 (defun ediff-copy-list (list) | |
| 3898 (if (consp list) | |
| 3893 ;;;(let ((res nil)) | 3899 ;;;(let ((res nil)) |
| 3894 ;;; (while (consp list) (push (pop list) res)) | 3900 ;;; (while (consp list) (push (pop list) res)) |
| 3895 ;;; (prog1 (nreverse res) (setcdr res list))) | 3901 ;;; (prog1 (nreverse res) (setcdr res list))) |
| 3896 (let (res elt) | 3902 (let (res elt) |
| 3897 (while (consp list) | 3903 (while (consp list) |
| 3898 (setq elt (car list) | 3904 (setq elt (car list) |
| 3899 res (cons elt res) | 3905 res (cons elt res) |
| 3900 list (cdr list))) | 3906 list (cdr list))) |
| 3901 (nreverse res)) | 3907 (nreverse res)) |
| 3902 (car list))) | 3908 (car list)))) |
| 3903 | 3909 |
| 3904 | 3910 |
| 3905 ;; don't report error if version control package wasn't found | 3911 ;; don't report error if version control package wasn't found |
| 3906 ;;(ediff-load-version-control 'silent) | 3912 ;;(ediff-load-version-control 'silent) |
| 3907 | 3913 |