Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-mult.el @ 82:6a378aca36af r20-0b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children 34a5b81f86ba
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff 1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
2 2
3 ;; Copyright (C) 1995, 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 6
7 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
8 8
665 (insert 665 (insert
666 " `D':\tshow differences among directories\n" 666 " `D':\tshow differences among directories\n"
667 " `=':\tmark identical files in each session\n\n")) 667 " `=':\tmark identical files in each session\n\n"))
668 668
669 (if (and (stringp regexp) (> (length regexp) 0)) 669 (if (and (stringp regexp) (> (length regexp) 0))
670 (insert (format "Filter-through regular expression: %s\n" regexp))) 670 (insert
671 (format "\n*** Filter-through regular expression: %s\n" regexp)))
671 (if (and ediff-autostore-merges (ediff-merge-metajob) 672 (if (and ediff-autostore-merges (ediff-merge-metajob)
672 (stringp merge-autostore-dir)) 673 (stringp merge-autostore-dir))
673 (insert (format 674 (insert (format
674 "\nMerges are automatically stored in directory: %s\n" 675 "\nMerges are automatically stored in directory: %s\n"
675 merge-autostore-dir))) 676 merge-autostore-dir)))
819 `q': hide this buffer 820 `q': hide this buffer
820 SPC: next line 821 SPC: next line
821 DEL: previous line\n\n") 822 DEL: previous line\n\n")
822 823
823 (if (and (stringp regexp) (> (length regexp) 0)) 824 (if (and (stringp regexp) (> (length regexp) 0))
824 (insert (format "Filter-through regular expression: %s\n" regexp))) 825 (insert
826 (format "\n*** Filter-through regular expression: %s\n" regexp)))
825 (insert "\n") 827 (insert "\n")
826 (insert (format "\n%-27s%-26s" 828 (insert (format "\n%-27s%-26s"
827 (ediff-truncate-string-left 829 (ediff-truncate-string-left
828 (ediff-abbreviate-file-name 830 (ediff-abbreviate-file-name
829 (file-name-as-directory dir1)) 831 (file-name-as-directory dir1))