/[emacs]/emacs/lisp/ediff.el
ViewVC logotype

Diff of /emacs/lisp/ediff.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.57.2.1 by miles, Fri Apr 4 06:20:04 2003 UTC revision 1.57.2.2 by miles, Tue Oct 14 23:50:59 2003 UTC
# Line 7  Line 7 
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.
# Line 501  the same name in both.  The third argume Line 501  the same name in both.  The third argume
501  expression; only file names that match the regexp are considered."  expression; only file names that match the regexp are considered."
502    (interactive    (interactive
503     (let ((dir-A (ediff-get-default-directory-name))     (let ((dir-A (ediff-get-default-directory-name))
504             (default-regexp (eval ediff-default-filtering-regexp))
505           f)           f)
506       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
507             (ediff-read-file-name "Directory B to compare:"             (ediff-read-file-name "Directory B to compare:"
# Line 508  expression; only file names that match t Line 509  expression; only file names that match t
509                                       ediff-last-dir-B                                       ediff-last-dir-B
510                                     (ediff-strip-last-dir f))                                     (ediff-strip-last-dir f))
511                                   nil)                                   nil)
512             (read-string "Filter through regular expression: "             (read-string
513                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
514                    (format "Filter through regular expression (default %s): "
515                             default-regexp)
516                  "Filter through regular expression: ")
517                nil
518                'ediff-filtering-regexp-history
519                (eval ediff-default-filtering-regexp))
520             )))             )))
521    (ediff-directories-internal    (ediff-directories-internal
522     dir1 dir2 nil regexp 'ediff-files 'ediff-directories     dir1 dir2 nil regexp 'ediff-files 'ediff-directories
# Line 525  expression; only file names that match t Line 532  expression; only file names that match t
532  The second argument, REGEXP, is a regular expression that filters the file  The second argument, REGEXP, is a regular expression that filters the file
533  names.  Only the files that are under revision control are taken into account."  names.  Only the files that are under revision control are taken into account."
534    (interactive    (interactive
535     (let ((dir-A (ediff-get-default-directory-name)))     (let ((dir-A (ediff-get-default-directory-name))
536             (default-regexp (eval ediff-default-filtering-regexp))
537             )
538       (list (ediff-read-file-name       (list (ediff-read-file-name
539              "Directory to compare with revision:" dir-A nil)              "Directory to compare with revision:" dir-A nil)
540             (read-string "Filter through regular expression: "             (read-string
541                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
542                    (format "Filter through regular expression (default %s): "
543                             default-regexp)
544                  "Filter through regular expression: ")
545                nil
546                'ediff-filtering-regexp-history
547                (eval ediff-default-filtering-regexp))
548             )))             )))
549    (ediff-directory-revisions-internal    (ediff-directory-revisions-internal
550     dir1 regexp 'ediff-revision 'ediff-directory-revisions     dir1 regexp 'ediff-revision 'ediff-directory-revisions
# Line 547  regular expression; only file names that Line 562  regular expression; only file names that
562    
563    (interactive    (interactive
564     (let ((dir-A (ediff-get-default-directory-name))     (let ((dir-A (ediff-get-default-directory-name))
565             (default-regexp (eval ediff-default-filtering-regexp))
566           f)           f)
567       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
568             (setq f (ediff-read-file-name "Directory B to compare:"             (setq f (ediff-read-file-name "Directory B to compare:"
# Line 559  regular expression; only file names that Line 575  regular expression; only file names that
575                                       ediff-last-dir-C                                       ediff-last-dir-C
576                                     (ediff-strip-last-dir f))                                     (ediff-strip-last-dir f))
577                                   nil)                                   nil)
578             (read-string "Filter through regular expression: "             (read-string
579                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
580                    (format "Filter through regular expression (default %s): "
581                             default-regexp)
582                  "Filter through regular expression: ")
583                nil
584                'ediff-filtering-regexp-history
585                (eval ediff-default-filtering-regexp))
586             )))             )))
587    (ediff-directories-internal    (ediff-directories-internal
588     dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3     dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
# Line 576  the same name in both.  The third argume Line 598  the same name in both.  The third argume
598  expression; only file names that match the regexp are considered."  expression; only file names that match the regexp are considered."
599    (interactive    (interactive
600     (let ((dir-A (ediff-get-default-directory-name))     (let ((dir-A (ediff-get-default-directory-name))
601             (default-regexp (eval ediff-default-filtering-regexp))
602           f)           f)
603       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
604             (ediff-read-file-name "Directory B to merge:"             (ediff-read-file-name "Directory B to merge:"
# Line 583  expression; only file names that match t Line 606  expression; only file names that match t
606                                       ediff-last-dir-B                                       ediff-last-dir-B
607                                     (ediff-strip-last-dir f))                                     (ediff-strip-last-dir f))
608                                   nil)                                   nil)
609             (read-string "Filter through regular expression: "             (read-string
610                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
611                    (format "Filter through regular expression (default %s): "
612                             default-regexp)
613                  "Filter through regular expression: ")
614                nil
615                'ediff-filtering-regexp-history
616                (eval ediff-default-filtering-regexp))
617             )))             )))
618    (ediff-directories-internal    (ediff-directories-internal
619     dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories     dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
# Line 605  without ancestor.  The fourth argument, Line 634  without ancestor.  The fourth argument,
634  only file names that match the regexp are considered."  only file names that match the regexp are considered."
635    (interactive    (interactive
636     (let ((dir-A (ediff-get-default-directory-name))     (let ((dir-A (ediff-get-default-directory-name))
637             (default-regexp (eval ediff-default-filtering-regexp))
638           f)           f)
639       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
640             (setq f (ediff-read-file-name "Directory B to merge:"             (setq f (ediff-read-file-name "Directory B to merge:"
# Line 617  only file names that match the regexp ar Line 647  only file names that match the regexp ar
647                                       ediff-last-dir-C                                       ediff-last-dir-C
648                                     (ediff-strip-last-dir f))                                     (ediff-strip-last-dir f))
649                                   nil)                                   nil)
650             (read-string "Filter through regular expression: "             (read-string
651                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
652                    (format "Filter through regular expression (default %s): "
653                             default-regexp)
654                  "Filter through regular expression: ")
655                nil
656                'ediff-filtering-regexp-history
657                (eval ediff-default-filtering-regexp))
658             )))             )))
659    (ediff-directories-internal    (ediff-directories-internal
660     dir1 dir2 ancestor-dir regexp     dir1 dir2 ancestor-dir regexp
# Line 633  only file names that match the regexp ar Line 669  only file names that match the regexp ar
669  The second argument, REGEXP, is a regular expression that filters the file  The second argument, REGEXP, is a regular expression that filters the file
670  names.  Only the files that are under revision control are taken into account."  names.  Only the files that are under revision control are taken into account."
671    (interactive    (interactive
672     (let ((dir-A (ediff-get-default-directory-name)))     (let ((dir-A (ediff-get-default-directory-name))
673             (default-regexp (eval ediff-default-filtering-regexp))
674             )
675       (list (ediff-read-file-name       (list (ediff-read-file-name
676              "Directory to merge with revisions:" dir-A nil)              "Directory to merge with revisions:" dir-A nil)
677             (read-string "Filter through regular expression: "             (read-string
678                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
679                    (format "Filter through regular expression (default %s): "
680                             default-regexp)
681                  "Filter through regular expression: ")
682                nil
683                'ediff-filtering-regexp-history
684                (eval ediff-default-filtering-regexp))
685             )))             )))
686    (ediff-directory-revisions-internal    (ediff-directory-revisions-internal
687     dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions     dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
# Line 655  names.  Only the files that are under re Line 699  names.  Only the files that are under re
699  The second argument, REGEXP, is a regular expression that filters the file  The second argument, REGEXP, is a regular expression that filters the file
700  names.  Only the files that are under revision control are taken into account."  names.  Only the files that are under revision control are taken into account."
701    (interactive    (interactive
702     (let ((dir-A (ediff-get-default-directory-name)))     (let ((dir-A (ediff-get-default-directory-name))
703             (default-regexp (eval ediff-default-filtering-regexp))
704             )
705       (list (ediff-read-file-name       (list (ediff-read-file-name
706              "Directory to merge with revisions and ancestors:" dir-A nil)              "Directory to merge with revisions and ancestors:" dir-A nil)
707             (read-string "Filter through regular expression: "             (read-string
708                          nil 'ediff-filtering-regexp-history)              (if (stringp default-regexp)
709                    (format "Filter through regular expression (default %s): "
710                             default-regexp)
711                  "Filter through regular expression: ")
712                nil
713                'ediff-filtering-regexp-history
714                (eval ediff-default-filtering-regexp))
715             )))             )))
716    (ediff-directory-revisions-internal    (ediff-directory-revisions-internal
717     dir1 regexp 'ediff-merge-revisions-with-ancestor     dir1 regexp 'ediff-merge-revisions-with-ancestor
# Line 1434  With optional NODE, goes to that node." Line 1486  With optional NODE, goes to that node."
1486    
1487  (run-hooks 'ediff-load-hook)  (run-hooks 'ediff-load-hook)
1488    
1489    ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1490  ;;; ediff.el ends here  ;;; ediff.el ends here

Legend:
Removed from v.1.57.2.1  
changed lines
  Added in v.1.57.2.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26