Update copyright year to 2015

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

diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 9e6f5769c8f1b2600b17defd26cf211d2dd4c6df..c81afce016da43b12560af6a86472c470967692e 100644 (file)
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -1,6 +1,6 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
-;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -110,14 +110,11 @@
   :prefix "ediff-"
   :group 'ediff)
 
-
-;; compiler pacifier
-(eval-when-compile
-  (require 'ediff-ptch)
-  (require 'ediff))
-;; end pacifier
-
 (require 'ediff-init)
+(require 'ediff-diff)
+(require 'ediff-wind)
+(require 'ediff-util)
+
 
 ;; meta-buffer
 (ediff-defvar-local ediff-meta-buffer nil "")
@@ -143,7 +140,7 @@ Useful commands (type ? to hide them and free up screen):
  uh/um:\tunmark all sessions marked for hiding/operation
  n,SPC:\tnext session
  p,DEL:\tprevious session
-     E:\tbrowse Ediff on-line manual
+     E:\tbrowse Ediff manual
      T:\ttoggle truncation of long file names
      q:\tquit this session group
 ")
@@ -217,8 +214,9 @@ This can be toggled with `ediff-toggle-filename-truncation'."
   :type 'hook
   :group 'ediff-mult)
 
-(defcustom ediff-before-session-group-setup-hooks nil
-  "Hooks to run before Ediff arranges the window for group-level operations.
+(defcustom ediff-before-session-group-setup-hooks
+  nil ;FIXME: Bad name (should be -hook or -functions) and never run??
+  "Hook run before Ediff arranges the window for group-level operations.
 It is used by commands such as `ediff-directories'.
 This hook can be used to save the previous window config, which can be restored
 on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'."
@@ -1117,7 +1115,7 @@ behavior."
     (setq overl
          (if (featurep 'xemacs)
              (map-extents
-              (lambda (ext maparg)
+              (lambda (ext _maparg)
                 (if (and
                      (ediff-overlay-get ext 'ediff-meta-info)
                      (eq (ediff-overlay-get ext 'ediff-meta-session-number)
@@ -1446,7 +1444,7 @@ Useful commands:
 
 
 ;; argument is ignored
-(defun ediff-redraw-registry-buffer (&optional ignore)
+(defun ediff-redraw-registry-buffer (&optional _ignore)
   (ediff-with-current-buffer ediff-registry-buffer
     (let ((point (point))
          elt bufAname bufBname bufCname cur-diff total-diffs pt
@@ -1466,7 +1464,7 @@ Useful commands:
      R in any Ediff session:   display session registry
      n,SPC: next session
      p,DEL: previous session
-         E: browse Ediff on-line manual
+         E: browse Ediff manual
          q: bury registry
 
 
@@ -1794,6 +1792,14 @@ all marked sessions must be active."
            ))
       (error "The patch buffer wasn't found"))))
 
+(declare-function ediff-directories-internal "ediff"
+                 (dir1 dir2 dir3 regexp action jobname
+                       &optional startup-hooks merge-autostore-dir))
+
+(declare-function ediff-directory-revisions-internal "ediff"
+                 (dir1 regexp action jobname
+                       &optional startup-hooks merge-autostore-dir))
+
 
 ;; This function executes in meta buffer.  It knows where event happened.
 (defun ediff-filegroup-action ()
@@ -2359,6 +2365,8 @@ If this is a session registry buffer then just bury it."
            (setq point (point-min)))
        point))))
 
+(autoload 'ediff-patch-file-internal "ediff-ptch")
+
 ;; this is the action invoked when the user selects a patch from the meta
 ;; buffer.
 (defun ediff-patch-file-form-meta (file &optional startup-hooks)