;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
-;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
: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 "")
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
")
: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'."
(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)
;; 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
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
))
(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 ()
;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
;; parent meta-buf
;; Check if META-BUF exists before calling this function
-;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
+;; Optional MUST-REDRAW, if non-nil, would force redrawing of the whole meta
;; buffer. Otherwise, it will just go over the buffer and update activity marks
;; and session status.
;; SESSION-NUMBER, if specified, says which session caused the update.
(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)