1689 |
(info (ediff-get-meta-info meta-buf pos)) |
(info (ediff-get-meta-info meta-buf pos)) |
1690 |
(session-buf (ediff-get-session-buffer info)) |
(session-buf (ediff-get-session-buffer info)) |
1691 |
(session-number (ediff-get-session-number-at-pos pos meta-buf)) |
(session-number (ediff-get-session-number-at-pos pos meta-buf)) |
1692 |
|
(default-regexp (eval ediff-default-filtering-regexp)) |
1693 |
merge-autostore-dir file1 file2 file3 regexp) |
merge-autostore-dir file1 file2 file3 regexp) |
1694 |
|
|
1695 |
(setq file1 (ediff-get-session-objA-name info) |
(setq file1 (ediff-get-session-objA-name info) |
1718 |
;; do ediff/ediff-merge on subdirectories |
;; do ediff/ediff-merge on subdirectories |
1719 |
(if (ediff-buffer-live-p session-buf) |
(if (ediff-buffer-live-p session-buf) |
1720 |
(ediff-show-meta-buffer session-buf) |
(ediff-show-meta-buffer session-buf) |
1721 |
(setq regexp (read-string "Filter through regular expression: " |
(setq regexp |
1722 |
nil 'ediff-filtering-regexp-history)) |
(read-string |
1723 |
|
(if (stringp default-regexp) |
1724 |
|
(format |
1725 |
|
"Filter through regular expression (default %s): " |
1726 |
|
default-regexp) |
1727 |
|
"Filter through regular expression: ") |
1728 |
|
nil |
1729 |
|
'ediff-filtering-regexp-history |
1730 |
|
(eval ediff-default-filtering-regexp))) |
1731 |
(ediff-directories-internal |
(ediff-directories-internal |
1732 |
file1 file2 file3 regexp |
file1 file2 file3 regexp |
1733 |
ediff-session-action-function |
ediff-session-action-function |