diff options
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 9e64d2b23eb..4a9f626e93d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1,5 +1,6 @@ ;;; ediff-diff.el --- diff-related utilities -;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.sunysb.edu> @@ -16,11 +17,13 @@ ;; 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. -(require 'ediff-init) +;;; Code: +(require 'ediff-init) (defvar ediff-shell (cond ((eq system-type 'emx) "cmd") ; OS/2 @@ -1161,5 +1164,4 @@ argument to `skip-chars-forward'." (provide 'ediff-diff) - ;; ediff-diff.el ends here |