Update copyright year to 2015

[gnu-emacs] / lisp / vc / ediff-ptch.el

diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 64f4ee4a6ac49659c25f3b74cc3f63ea55b517f5..80990feac354e16a1db704e876cfcf698f211e32 100644 (file)
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,6 +1,6 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
-;; Copyright (C) 1996-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -33,12 +33,8 @@
   :prefix "ediff-"
   :group 'ediff)
 
-;; compiler pacifier
-(eval-when-compile
-  (require 'ediff))
-;; end pacifier
-
 (require 'ediff-init)
+(require 'ediff-util)
 
 (defcustom ediff-patch-program  "patch"
   "Name of the program that applies patches.
@@ -472,6 +468,8 @@ are two possible targets for this patch.  However, these files do not exist."
         (set-window-buffer ediff-window-B ediff-patch-diagnostics))
        (t (display-buffer ediff-patch-diagnostics 'not-this-window))))
 
+(defvar ediff-use-last-dir)
+
 ;; prompt for file, get the buffer
 (defun ediff-prompt-for-patch-file ()
   (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch)
@@ -642,6 +640,11 @@ optional argument, then use it."
 ;;;      (eq code 0)
 ;;;    (not (eq code 2))))
 
+(autoload 'ediff-find-file "ediff")
+(declare-function ediff-buffers-internal "ediff"
+                 (buf-a buf-b buf-c startup-hooks job-name
+                        &optional merge-buffer-file))
+
 (defun ediff-patch-file-internal (patch-buf source-filename
                                            &optional startup-hooks)
   (setq source-filename (expand-file-name source-filename))
@@ -732,7 +735,7 @@ The second problem might be due to an incompatibility among these settings:
     ediff-patch-program    = %S             ediff-patch-options    = %S
     ediff-backup-extension = %S             ediff-backup-specs     = %S
 
-See Ediff on-line manual for more details on these variables.
+See Ediff manual for more details on these variables.
 In particular, check the documentation for `ediff-backup-specs'.
 
 In any of the above cases, Ediff doesn't compare files automatically.