Mercurial > emacs
comparison lisp/ediff-mult.el @ 14169:83f275dcd93a
Update FSF's address.
author | Erik Naggum <erik@naggum.no> |
---|---|
date | Sun, 14 Jan 1996 07:34:30 +0000 |
parents | 187735b53d52 |
children | c768f6d7daaa |
comparison
equal
deleted
inserted
replaced
14168:3b925cc52931 | 14169:83f275dcd93a |
---|---|
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 ;;; Copyright (C) 1995 Free Software Foundation, Inc. | 2 |
3 ;; Copyright (C) 1995 Free Software Foundation, Inc. | |
3 | 4 |
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> |
5 | 6 |
6 ;; This file is part of GNU Emacs. | 7 ;; This file is part of GNU Emacs. |
7 | 8 |
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 ;; GNU General Public License for more details. | 17 ;; GNU General Public License for more details. |
17 | 18 |
18 ;; You should have received a copy of the GNU General Public License | 19 ;; You should have received a copy of the GNU General Public License |
19 ;; along with GNU Emacs; see the file COPYING. If not, write to | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
21 | 22 ;; Boston, MA 02111-1307, USA. |
22 ;;; Notes: | 23 |
23 ;; | 24 ;;; Commentary: |
25 | |
24 ;; Users are strongly encourage to add functionality to this file. | 26 ;; Users are strongly encourage to add functionality to this file. |
25 ;; In particular, epatch needs to be enhanced to work with multi-file | 27 ;; In particular, epatch needs to be enhanced to work with multi-file |
26 ;; patches. The present file contains all the infrastructure needed for that. | 28 ;; patches. The present file contains all the infrastructure needed for that. |
27 ;; | 29 ;; |
28 ;; Generally, to to implement a new multisession capability within Ediff, | 30 ;; Generally, to to implement a new multisession capability within Ediff, |
76 ;; | 78 ;; |
77 ;; Implementing this requires writing an collating function, which should pair | 79 ;; Implementing this requires writing an collating function, which should pair |
78 ;; up appropriate files. It will also require a generalization of the functions | 80 ;; up appropriate files. It will also require a generalization of the functions |
79 ;; that do the layout of the meta- and differences buffers and of | 81 ;; that do the layout of the meta- and differences buffers and of |
80 ;; ediff-dir-action. | 82 ;; ediff-dir-action. |
83 | |
84 ;;; Code: | |
81 | 85 |
82 (require 'ediff-init) | 86 (require 'ediff-init) |
83 | 87 |
84 ;; meta-buffer | 88 ;; meta-buffer |
85 (ediff-defvar-local ediff-meta-buffer nil "") | 89 (ediff-defvar-local ediff-meta-buffer nil "") |