Lines Matching +defs:from +defs:dir
42 ;; through them. You can also copy difference regions from one buffer to
56 ;; region from file_orig to file, thereby undoing any particular patch that
66 ;; This package builds upon the ideas borrowed from emerge.el and several
67 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
113 (defvar ediff-last-dir-patch)
144 (defcustom ediff-use-last-dir nil
150 (defvar ediff-last-dir-A nil)
152 (defvar ediff-last-dir-B nil)
154 (defvar ediff-last-dir-C nil)
156 (defvar ediff-last-dir-ancestor nil)
158 (defvar ediff-last-merge-autostore-dir nil)
175 (dired-get-marked-files 'no-dir)
198 (let ((dir-A (if ediff-use-last-dir
199 ediff-last-dir-A
201 dir-B f)
204 dir-A
208 (setq dir-B
209 (if ediff-use-last-dir
210 ediff-last-dir-B
218 dir-B)))
234 (let ((dir-A (if ediff-use-last-dir
235 ediff-last-dir-A
237 dir-B dir-C f ff)
240 dir-A
244 (setq dir-B
245 (if ediff-use-last-dir
246 ediff-last-dir-B
254 dir-B)))
257 (setq dir-C (if ediff-use-last-dir
258 ediff-last-dir-C
266 dir-C)))
294 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
307 (if last-dir
308 (set last-dir (expand-file-name (file-name-directory file))))
346 (ediff-find-file 'file-A 'buf-A 'ediff-last-dir-A 'startup-hooks)
349 (ediff-find-file 'file-B 'buf-B 'ediff-last-dir-B 'startup-hooks)
357 'ediff-last-dir-ancestor 'ediff-last-dir-C)
376 ;; The code is taken from `diff-backup'.
484 ;; If ediff-use-last-dir, use ediff-last-dir-A.
488 (cond (ediff-use-last-dir ediff-last-dir-A)
503 (let ((dir-A (ediff-get-default-directory-name))
507 "Directory A to compare:" dir-A nil 'must-match))
509 (if ediff-use-last-dir
510 ediff-last-dir-B
511 (ediff-strip-last-dir f))
536 (let ((dir-A (ediff-get-default-directory-name))
540 "Directory to compare with revision:" dir-A nil 'must-match)
565 (let ((dir-A (ediff-get-default-directory-name))
568 (list (setq f (read-directory-name "Directory A to compare:" dir-A nil))
570 (if ediff-use-last-dir
571 ediff-last-dir-B
572 (ediff-strip-last-dir f))
575 (if ediff-use-last-dir
576 ediff-last-dir-C
577 (ediff-strip-last-dir f))
596 (defun ediff-merge-directories (dir1 dir2 regexp &optional merge-autostore-dir)
601 (let ((dir-A (ediff-get-default-directory-name))
605 dir-A nil 'must-match))
607 (if ediff-use-last-dir
608 ediff-last-dir-B
609 (ediff-strip-last-dir f))
622 nil merge-autostore-dir
629 (defun ediff-merge-directories-with-ancestor (dir1 dir2 ancestor-dir regexp
631 merge-autostore-dir)
638 (let ((dir-A (ediff-get-default-directory-name))
641 (list (setq f (read-directory-name "Directory A to merge:" dir-A nil))
643 (if ediff-use-last-dir
644 ediff-last-dir-B
645 (ediff-strip-last-dir f))
648 (if ediff-use-last-dir
649 ediff-last-dir-C
650 (ediff-strip-last-dir f))
662 dir1 dir2 ancestor-dir regexp
664 nil merge-autostore-dir
669 &optional merge-autostore-dir)
674 (let ((dir-A (ediff-get-default-directory-name))
678 "Directory to merge with revisions:" dir-A nil 'must-match)
690 nil merge-autostore-dir
699 merge-autostore-dir)
704 (let ((dir-A (ediff-get-default-directory-name))
709 dir-A nil 'must-match)
722 nil merge-autostore-dir
741 merge-autostore-dir)
754 (if merge-autostore-dir
755 (or (stringp merge-autostore-dir)
758 (let (;; dir-diff-struct is of the form (common-list diff-list)
761 dir-diff-struct
765 (not merge-autostore-dir))
766 (setq merge-autostore-dir
768 (if ediff-use-last-dir
769 ediff-last-merge-autostore-dir
770 (ediff-strip-last-dir dir1))
774 (if merge-autostore-dir
775 (cond ((and (stringp dir1) (string= merge-autostore-dir dir1))
779 ((and (stringp dir2) (string= merge-autostore-dir dir2))
783 ((and (stringp dir3) (string= merge-autostore-dir dir3))
788 (setq dir-diff-struct (ediff-intersect-directories
790 regexp dir1 dir2 dir3 merge-autostore-dir))
797 ;; set ediff-dir-difference-list
798 (setq ediff-dir-difference-list
799 (cdr (quote ,dir-diff-struct))))
803 (car dir-diff-struct)
815 merge-autostore-dir)
818 (if merge-autostore-dir
819 (or (stringp merge-autostore-dir)
825 (not merge-autostore-dir))
826 (setq merge-autostore-dir
828 (if ediff-use-last-dir
829 ediff-last-merge-autostore-dir
830 (ediff-strip-last-dir dir1))
833 ;; verify merge-autostore-dir != dir1
834 (if (and merge-autostore-dir
836 (string= merge-autostore-dir dir1))
843 jobname regexp dir1 merge-autostore-dir))
1088 (let ((dir-A (if ediff-use-last-dir
1089 ediff-last-dir-A
1091 dir-B f)
1094 dir-A
1098 (setq dir-B
1099 (if ediff-use-last-dir
1100 ediff-last-dir-B
1108 dir-B)))
1132 (let ((dir-A (if ediff-use-last-dir
1133 ediff-last-dir-A
1135 dir-B dir-ancestor f ff)
1138 dir-A
1142 (setq dir-B
1143 (if ediff-use-last-dir
1144 ediff-last-dir-B
1152 dir-B)))
1155 (setq dir-ancestor
1156 (if ediff-use-last-dir
1157 ediff-last-dir-ancestor
1165 dir-ancestor)))
1308 (defun run-ediff-from-cvs-buffer (pos)
1311 file and then run `run-ediff-from-cvs-buffer'."
1330 (let (source-dir source-file)
1335 (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
1346 source-dir nil nil (ediff-get-default-file-name)))
1392 (if ediff-use-last-dir
1393 ediff-last-dir-A
1429 (message "") ; kill the message from `locate-library'
1505 "^Output from `diff' not found$"