summaryrefslogtreecommitdiff
path: root/lisp/ediff-mult.el
diff options
context:
space:
mode:
authorErik Naggum <erik@naggum.no>1996-01-14 07:34:30 +0000
committerErik Naggum <erik@naggum.no>1996-01-14 07:34:30 +0000
commit9cd5830fc150859fd828783fafe807036f641c0f (patch)
tree92b353a31fed07964155b45734ea17a4f3294bf0 /lisp/ediff-mult.el
parent6a8cea1cd7a411eae7420ac78a1a675fec07f985 (diff)
downloademacs-9cd5830fc150859fd828783fafe807036f641c0f.tar.gz
Update FSF's address.
Diffstat (limited to 'lisp/ediff-mult.el')
-rw-r--r--lisp/ediff-mult.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 319edf30fa7..31b63f49623 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,5 +1,6 @@
;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
@@ -16,11 +17,12 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
-;;; Notes:
-;;
;; Users are strongly encourage to add functionality to this file.
;; In particular, epatch needs to be enhanced to work with multi-file
;; patches. The present file contains all the infrastructure needed for that.
@@ -79,6 +81,8 @@
;; that do the layout of the meta- and differences buffers and of
;; ediff-dir-action.
+;;; Code:
+
(require 'ediff-init)
;; meta-buffer