7 |
;; Keywords: comparing, merging, patching, tools, unix |
;; Keywords: comparing, merging, patching, tools, unix |
8 |
|
|
9 |
(defconst ediff-version "2.78" "The current version of Ediff") |
(defconst ediff-version "2.78" "The current version of Ediff") |
10 |
(defconst ediff-date "January 25, 2003" "Date of last update") |
(defconst ediff-date "May 18, 2003" "Date of last update") |
11 |
|
|
12 |
|
|
13 |
;; This file is part of GNU Emacs. |
;; This file is part of GNU Emacs. |
508 |
ediff-last-dir-B |
ediff-last-dir-B |
509 |
(ediff-strip-last-dir f)) |
(ediff-strip-last-dir f)) |
510 |
nil) |
nil) |
511 |
(read-string "Filter through regular expression: " |
(read-string (format |
512 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
513 |
|
(eval ediff-default-filtering-regexp)) |
514 |
|
(eval ediff-default-filtering-regexp) |
515 |
|
'ediff-filtering-regexp-history) |
516 |
))) |
))) |
517 |
(ediff-directories-internal |
(ediff-directories-internal |
518 |
dir1 dir2 nil regexp 'ediff-files 'ediff-directories |
dir1 dir2 nil regexp 'ediff-files 'ediff-directories |
531 |
(let ((dir-A (ediff-get-default-directory-name))) |
(let ((dir-A (ediff-get-default-directory-name))) |
532 |
(list (ediff-read-file-name |
(list (ediff-read-file-name |
533 |
"Directory to compare with revision:" dir-A nil) |
"Directory to compare with revision:" dir-A nil) |
534 |
(read-string "Filter through regular expression: " |
(read-string (format |
535 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
536 |
|
(eval ediff-default-filtering-regexp)) |
537 |
|
(eval ediff-default-filtering-regexp) |
538 |
|
'ediff-filtering-regexp-history) |
539 |
))) |
))) |
540 |
(ediff-directory-revisions-internal |
(ediff-directory-revisions-internal |
541 |
dir1 regexp 'ediff-revision 'ediff-directory-revisions |
dir1 regexp 'ediff-revision 'ediff-directory-revisions |
565 |
ediff-last-dir-C |
ediff-last-dir-C |
566 |
(ediff-strip-last-dir f)) |
(ediff-strip-last-dir f)) |
567 |
nil) |
nil) |
568 |
(read-string "Filter through regular expression: " |
(read-string (format |
569 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
570 |
|
(eval ediff-default-filtering-regexp)) |
571 |
|
(eval ediff-default-filtering-regexp) |
572 |
|
'ediff-filtering-regexp-history) |
573 |
))) |
))) |
574 |
(ediff-directories-internal |
(ediff-directories-internal |
575 |
dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3 |
dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3 |
592 |
ediff-last-dir-B |
ediff-last-dir-B |
593 |
(ediff-strip-last-dir f)) |
(ediff-strip-last-dir f)) |
594 |
nil) |
nil) |
595 |
(read-string "Filter through regular expression: " |
(read-string (format |
596 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
597 |
|
(eval ediff-default-filtering-regexp)) |
598 |
|
(eval ediff-default-filtering-regexp) |
599 |
|
'ediff-filtering-regexp-history) |
600 |
))) |
))) |
601 |
(ediff-directories-internal |
(ediff-directories-internal |
602 |
dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories |
dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories |
629 |
ediff-last-dir-C |
ediff-last-dir-C |
630 |
(ediff-strip-last-dir f)) |
(ediff-strip-last-dir f)) |
631 |
nil) |
nil) |
632 |
(read-string "Filter through regular expression: " |
(read-string (format |
633 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
634 |
|
(eval ediff-default-filtering-regexp)) |
635 |
|
(eval ediff-default-filtering-regexp) |
636 |
|
'ediff-filtering-regexp-history) |
637 |
))) |
))) |
638 |
(ediff-directories-internal |
(ediff-directories-internal |
639 |
dir1 dir2 ancestor-dir regexp |
dir1 dir2 ancestor-dir regexp |
651 |
(let ((dir-A (ediff-get-default-directory-name))) |
(let ((dir-A (ediff-get-default-directory-name))) |
652 |
(list (ediff-read-file-name |
(list (ediff-read-file-name |
653 |
"Directory to merge with revisions:" dir-A nil) |
"Directory to merge with revisions:" dir-A nil) |
654 |
(read-string "Filter through regular expression: " |
(read-string (format |
655 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
656 |
|
(eval ediff-default-filtering-regexp)) |
657 |
|
(eval ediff-default-filtering-regexp) |
658 |
|
'ediff-filtering-regexp-history) |
659 |
))) |
))) |
660 |
(ediff-directory-revisions-internal |
(ediff-directory-revisions-internal |
661 |
dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions |
dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions |
676 |
(let ((dir-A (ediff-get-default-directory-name))) |
(let ((dir-A (ediff-get-default-directory-name))) |
677 |
(list (ediff-read-file-name |
(list (ediff-read-file-name |
678 |
"Directory to merge with revisions and ancestors:" dir-A nil) |
"Directory to merge with revisions and ancestors:" dir-A nil) |
679 |
(read-string "Filter through regular expression: " |
(read-string (format |
680 |
nil 'ediff-filtering-regexp-history) |
"Filter through regular expression (default %S): " |
681 |
|
(eval ediff-default-filtering-regexp)) |
682 |
|
(eval ediff-default-filtering-regexp) |
683 |
|
'ediff-filtering-regexp-history) |
684 |
))) |
))) |
685 |
(ediff-directory-revisions-internal |
(ediff-directory-revisions-internal |
686 |
dir1 regexp 'ediff-merge-revisions-with-ancestor |
dir1 regexp 'ediff-merge-revisions-with-ancestor |