Delete the autoloads for functions defined with ibuffer-specific commands.

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

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index c6fa5694612d0caadeb2ea81b58ed69de53a64de..b8e576d72b76872ffa68700edcc341b7eedfb6ef 100644 (file)
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,8 +1,8 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 

-;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.

 
 

-;; Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Author: Michael Kifer <kifer@cs.stonybrook.edu>

 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 


@@ -26,7 +26,7 @@
 ;; Users are encouraged to add functionality to this file.
 ;; The present file contains all the infrastructure needed for that.
 ;;
 ;; Users are encouraged to add functionality to this file.
 ;; The present file contains all the infrastructure needed for that.
 ;;

-;; Generally, to to implement a new multisession capability within Ediff,
+;; Generally, to implement a new multisession capability within Ediff,

 ;; you need to tell it 
 ;;
 ;;     1. How to display the session group buffer.
 ;; you need to tell it 
 ;;
 ;;     1. How to display the session group buffer.


@@ -42,14 +42,14 @@
 ;;        in the following format:
 ;;             (descriptor (obj1 obj2 obj3) (...) ...)
 ;;        Actually, the format of this list is pretty much up to the
 ;;        in the following format:
 ;;             (descriptor (obj1 obj2 obj3) (...) ...)
 ;;        Actually, the format of this list is pretty much up to the

-;;        developer. The only thing is that it must be a list of lists,
+;;        developer.  The only thing is that it must be a list of lists,

 ;;        and the first list must describe the meta session, and subsequent
 ;;        elements must describe individual sessions.
 ;;        This descriptor must be a list of two, three, or four elements (nil
 ;;        and the first list must describe the meta session, and subsequent
 ;;        elements must describe individual sessions.
 ;;        This descriptor must be a list of two, three, or four elements (nil

-;;        or string). The function ediff-redraw-registry-buffer displays the
+;;        or string).  The function ediff-redraw-registry-buffer displays the

 ;;        second through last of these in the registry buffer. 
 ;;        Also, keep in mind that the function ediff-prepare-meta-buffer
 ;;        second through last of these in the registry buffer. 
 ;;        Also, keep in mind that the function ediff-prepare-meta-buffer

-;;        (which see) prepends the session group buffer to the descriptor and
+;;        (which see) prepends the session group buffer to the descriptor, and

 ;;        nil in front of each subsequent list (i.e., the above list 
 ;;        will become
 ;;              ((meta-buf descriptor) (nil obj1 obj2 obj3) (nil ...) ...)
 ;;        nil in front of each subsequent list (i.e., the above list 
 ;;        will become
 ;;              ((meta-buf descriptor) (nil obj1 obj2 obj3) (nil ...) ...)


@@ -61,11 +61,11 @@
 ;;        See how this is done in ediff-filegroup-action.
 ;;
 ;;        Session descriptions are of the form (obj1 obj2 obj3), which
 ;;        See how this is done in ediff-filegroup-action.
 ;;
 ;;        Session descriptions are of the form (obj1 obj2 obj3), which

-;;        describe objects relevant to the session. Usually they are names of
-;;        files, but sometimes they may be other things. For instance, obj3 is
-;;        nil for jobs that involve only two files. For patch jobs, obj2 and
-;;        obj3 are markers that specify the patch corresponding to the file
-;;        (whose name is obj1).
+;;        describe objects relevant to the session.  Usually they are names of
+;;        files, but sometimes they may be other things.  For instance, obj3
+;;        is nil for jobs that involve only two files.  For patch jobs, obj2
+;;        and obj3 are markers that specify the patch corresponding to the
+;;        file (whose name is obj1).

 ;;     4. Write a function that makes a call to ediff-prepare-meta-buffer
 ;;        passing all this info. 
 ;;        You may be able to use ediff-directories-internal as a template.
 ;;     4. Write a function that makes a call to ediff-prepare-meta-buffer
 ;;        passing all this info. 
 ;;        You may be able to use ediff-directories-internal as a template.


@@ -78,14 +78,14 @@
 ;;        ediff-directories-internal. 
 ;;
 ;; A useful addition here could be session groups selected by patterns
 ;;        ediff-directories-internal. 
 ;;
 ;; A useful addition here could be session groups selected by patterns

-;; (which are different in each directory). For instance, one may want to
+;; (which are different in each directory).  For instance, one may want to

 ;; compare files of the form abc{something}.c to files old{something}.d
 ;; compare files of the form abc{something}.c to files old{something}.d

-;; which may be in the same or different directories. Or, one may want to
+;; which may be in the same or different directories.  Or, one may want to

 ;; compare all files of the form {something} to files of the form {something}~.
 ;;
 ;; Implementing this requires writing an collating function, which should pair
 ;; compare all files of the form {something} to files of the form {something}~.
 ;;
 ;; Implementing this requires writing an collating function, which should pair

-;; up appropriate files. It will also require a generalization of the functions
-;; that do the layout of the meta- and differences buffers and of
+;; up appropriate files.  It will also require a generalization of the
+;; functions that do the layout of the meta- and differences buffers and of

 ;; ediff-filegroup-action.
 
 ;;; Code:
 ;; ediff-filegroup-action.
 
 ;;; Code:


@@ -93,7 +93,7 @@
 (provide 'ediff-mult)
 
 (defgroup ediff-mult nil
 (provide 'ediff-mult)
 
 (defgroup ediff-mult nil

-  "Multi-file and multi-buffer processing in ediff"
+  "Multi-file and multi-buffer processing in Ediff"

   :prefix "ediff-"
   :group 'ediff)
 
   :prefix "ediff-"
   :group 'ediff)
 


@@ -120,16 +120,18 @@
 (defconst ediff-meta-buffer-message "This is an Ediff Session Group Panel: %s
 
 Useful commands:
 (defconst ediff-meta-buffer-message "This is an Ediff Session Group Panel: %s
 
 Useful commands:

-     button2, `v', RET over a session line:   start that Ediff session
-     `M':\tin any session invoked from here, brings back this group panel
-     `R':\tdisplay the registry of active Ediff sessions
-     `h':\tmark session for hiding (toggle)
-     `x':\thide marked sessions; with prefix arg--unhide hidden sessions
-     `m':\tmark session for a non-hiding operation (toggle)
-     SPC:\tnext session
-     DEL:\tprevious session
-     `E':\tbrowse Ediff on-line manual
-     `q':\tquit this session group
+     button2, v, or RET over session record:   start that Ediff session
+     M:\tin sessions invoked from here, brings back this group panel
+     R:\tdisplay the registry of active Ediff sessions
+     h:\tmark session for hiding (toggle)
+     x:\thide marked sessions; with prefix arg: unhide
+     m:\tmark session for a non-hiding operation (toggle)
+ uh/um:\tunmark all sessions marked for hiding/operation
+ n,SPC:\tnext session
+ p,DEL:\tprevious session
+     E:\tbrowse Ediff on-line manual
+     T:\ttoggle truncation of long file names
+     q:\tquit this session group

 ")
 
 (ediff-defvar-local ediff-meta-buffer-map nil
 ")
 
 (ediff-defvar-local ediff-meta-buffer-map nil


@@ -139,7 +141,7 @@ Useful commands:
 directories.")
 
 ;; Variable specifying the action to take when the use invokes ediff in the
 directories.")
 
 ;; Variable specifying the action to take when the use invokes ediff in the

-;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action
+;; meta buffer.  This is usually ediff-registry-action or ediff-filegroup-action

 (ediff-defvar-local ediff-meta-action-function nil "")
 ;; Tells ediff-update-meta-buffer how to redraw it
 (ediff-defvar-local ediff-meta-redraw-function nil "")
 (ediff-defvar-local ediff-meta-action-function nil "")
 ;; Tells ediff-update-meta-buffer how to redraw it
 (ediff-defvar-local ediff-meta-redraw-function nil "")


@@ -155,25 +157,45 @@ directories.")
 ;; history var to use for filtering groups
 (defvar ediff-filtering-regexp-history nil "")
 
 ;; history var to use for filtering groups
 (defvar ediff-filtering-regexp-history nil "")
 

-;; This has the form ((ctl-buf file1 file2) (stl-buf file1 file2) ...)
-;; If ctl-buf is nil, the file-pair wasn't processed yet. If it is
-;; killed-buffer object, the file pair has been processed. If it is a live
-;; buffer, this means ediff is still working on the pair
+;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
+;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
+;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
+;; . eq-status)) ...)
+;; If ctl-buf is nil, the file-pair hasn't processed yet.  If it is
+;; killed-buffer object, the file pair has been processed.  If it is a live
+;; buffer, this means ediff is still working on the pair.
+;; Eq-status of a file is t if the file equals some other file in the same
+;; group.

 (ediff-defvar-local ediff-meta-list nil "")
 
 (ediff-defvar-local ediff-meta-list nil "")
 

+(ediff-defvar-local ediff-meta-session-number nil "")
+

 
 ;; the difference list between directories in a directory session group
 (ediff-defvar-local ediff-dir-difference-list nil "")
 (ediff-defvar-local ediff-dir-diffs-buffer nil "")
 
 
 ;; the difference list between directories in a directory session group
 (ediff-defvar-local ediff-dir-difference-list nil "")
 (ediff-defvar-local ediff-dir-diffs-buffer nil "")
 

-;; The registry of Ediff sessions. A list of control buffers.
+;; The registry of Ediff sessions.  A list of control buffers.

 (defvar ediff-session-registry nil)
 
 (defvar ediff-session-registry nil)
 

+(defcustom ediff-meta-truncate-filenames t
+  "*If non-nil, truncate long file names in the session group buffers.
+This can be toggled with `ediff-toggle-filename-truncation'."
+  :type 'hook
+  :group 'ediff-mult)

 (defcustom ediff-registry-setup-hook nil
   "*Hooks run just after the registry control panel is set up."
   :type 'hook
   :group 'ediff-mult)
 (defcustom ediff-registry-setup-hook nil
   "*Hooks run just after the registry control panel is set up."
   :type 'hook
   :group 'ediff-mult)

-(defcustom ediff-session-group-setup-hook nil
+
+(defcustom ediff-before-session-group-setup-hooks nil
+  "*Hooks to 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."
+  :type 'hook
+  :group 'ediff-hook) 
+(defcustom ediff-after-session-group-setup-hook nil

   "*Hooks run just after a meta-buffer controlling a session group, such as
 ediff-directories, is run."
   :type 'hook
   "*Hooks run just after a meta-buffer controlling a session group, such as
 ediff-directories, is run."
   :type 'hook


@@ -186,7 +208,7 @@ ediff-directories, is run."
   "*Hooks run just after the registry buffer is shown."
   :type 'hook
   :group 'ediff-mult)
   "*Hooks run just after the registry buffer is shown."
   :type 'hook
   :group 'ediff-mult)

-(defcustom ediff-show-session-group-hook nil
+(defcustom ediff-show-session-group-hook '(delete-other-windows)

   "*Hooks run just after a session group buffer is shown."
   :type 'hook
   :group 'ediff-mult)
   "*Hooks run just after a session group buffer is shown."
   :type 'hook
   :group 'ediff-mult)


@@ -198,46 +220,60 @@ buffers."
   :type 'hook
   :group 'ediff-mult)
 
   :type 'hook
   :group 'ediff-mult)
 

-;; buffer holding the multi-file patch. local to the meta buffer
+;; Buffer holding the multi-file patch.  Local to the meta buffer

 (ediff-defvar-local ediff-meta-patchbufer nil "")
 
 ;;; API for ediff-meta-list
 
 (ediff-defvar-local ediff-meta-patchbufer nil "")
 
 ;;; API for ediff-meta-list
 

+;; Structure of the meta-list:
+;; (HEADER SESSION1 SESSION2 ...)
+;;    HEADER: (GROUP-BUF REGEXP OBJA OBJB OBJC SAVE-DIR)
+;;               OBJA - first directory
+;;               OBJB - second directory
+;;               OBJC - third directory
+;; SESSION1/2/... are described below

 ;; group buffer/regexp
 ;; group buffer/regexp

-(defun ediff-get-group-buffer (meta-list)
+(defsubst ediff-get-group-buffer (meta-list)

   (nth 0 (car meta-list)))
 
   (nth 0 (car meta-list)))
 

-(defun ediff-get-group-regexp (meta-list)
+(defsubst ediff-get-group-regexp (meta-list)

   (nth 1 (car meta-list)))
 ;; group objects
   (nth 1 (car meta-list)))
 ;; group objects

-(defun ediff-get-group-objA (meta-list)
+(defsubst ediff-get-group-objA (meta-list)

   (nth 2 (car meta-list)))
   (nth 2 (car meta-list)))

-(defun ediff-get-group-objB (meta-list)
+(defsubst ediff-get-group-objB (meta-list)

   (nth 3 (car meta-list)))
   (nth 3 (car meta-list)))

-(defun ediff-get-group-objC (meta-list)
+(defsubst ediff-get-group-objC (meta-list)

   (nth 4 (car meta-list)))
   (nth 4 (car meta-list)))

-(defun ediff-get-group-merge-autostore-dir (meta-list)
+(defsubst ediff-get-group-merge-autostore-dir (meta-list)

   (nth 5 (car meta-list)))
 
   (nth 5 (car meta-list)))
 

+;; ELT is a session meta descriptor (what is being preserved as
+;; 'ediff-meta-info)
+;;  The structure is:  (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
+;;   STATUS is ?I, ?*, ?H
+;;   OBJA/B/C is (FILENAME EQSTATUS)
+;;     EQSTATUS is ?= or nil (?= means that this file is equal to some other
+;;                                    file in this session)

 ;; session buffer
 ;; session buffer

-(defun ediff-get-session-buffer (elt)
+(defsubst ediff-get-session-buffer (elt)

   (nth 0 elt))
   (nth 0 elt))

-(defun ediff-get-session-status (elt)
+(defsubst ediff-get-session-status (elt)

   (nth 1 elt))
   (nth 1 elt))

-(defun ediff-set-session-status (session-info new-status)
+(defsubst ediff-set-session-status (session-info new-status)

   (setcar (cdr session-info) new-status))
 ;; session objects
   (setcar (cdr session-info) new-status))
 ;; session objects

-(defun ediff-get-session-objA (elt)
+(defsubst ediff-get-session-objA (elt)

   (nth 2 elt))
   (nth 2 elt))

-(defun ediff-get-session-objB (elt)
+(defsubst ediff-get-session-objB (elt)

   (nth 3 elt))
   (nth 3 elt))

-(defun ediff-get-session-objC (elt)
+(defsubst ediff-get-session-objC (elt)

   (nth 4 elt))
   (nth 4 elt))

-(defun ediff-get-session-objA-name (elt)
+(defsubst ediff-get-session-objA-name (elt)

   (car (nth 2 elt)))
   (car (nth 2 elt)))

-(defun ediff-get-session-objB-name (elt)
+(defsubst ediff-get-session-objB-name (elt)

   (car (nth 3 elt)))
   (car (nth 3 elt)))

-(defun ediff-get-session-objC-name (elt)
+(defsubst ediff-get-session-objC-name (elt)

   (car (nth 4 elt)))
 ;; equality indicators
 (defsubst ediff-get-file-eqstatus (elt)
   (car (nth 4 elt)))
 ;; equality indicators
 (defsubst ediff-get-file-eqstatus (elt)


@@ -245,21 +281,46 @@ buffers."
 (defsubst ediff-set-file-eqstatus (elt value)
   (setcar (cdr elt) value))
 
 (defsubst ediff-set-file-eqstatus (elt value)
   (setcar (cdr elt) value))
 

+;; The activity marker is either or + (active session, i.e., ediff is currently
+;; run in it), or - (finished session, i.e., we've ran ediff in it and then
+;; exited).  Return nil, if session is neither active nor finished
+(defun ediff-get-session-activity-marker (session)
+  (let ((session-buf (ediff-get-session-buffer session)))
+    (cond ((null session-buf) nil) ; virgin session
+         ((ediff-buffer-live-p session-buf) ?+) ;active session
+         (t ?-))))
+
+;; checks if the session is a meta session
+(defun ediff-meta-session-p (session-info)
+  (and (stringp (ediff-get-session-objA-name session-info))
+       (file-directory-p (ediff-get-session-objA-name session-info)) 
+       (stringp (ediff-get-session-objB-name session-info))
+       (file-directory-p (ediff-get-session-objB-name session-info))
+       (if (stringp (ediff-get-session-objC-name session-info))
+          (file-directory-p (ediff-get-session-objC-name session-info)) t)))
+

 ;; set up the keymap in the meta buffer
 (defun ediff-setup-meta-map()
   (setq ediff-meta-buffer-map (make-sparse-keymap))
   (suppress-keymap ediff-meta-buffer-map)
   (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer)
 ;; set up the keymap in the meta buffer
 (defun ediff-setup-meta-map()
   (setq ediff-meta-buffer-map (make-sparse-keymap))
   (suppress-keymap ediff-meta-buffer-map)
   (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer)

+  (define-key ediff-meta-buffer-map "T" 'ediff-toggle-filename-truncation)

   (define-key ediff-meta-buffer-map "R" 'ediff-show-registry)
   (define-key ediff-meta-buffer-map "E" 'ediff-documentation)
   (define-key ediff-meta-buffer-map "v" ediff-meta-action-function)
   (define-key ediff-meta-buffer-map "\C-m" ediff-meta-action-function)
   (define-key ediff-meta-buffer-map  " "  'ediff-next-meta-item)
   (define-key ediff-meta-buffer-map "R" 'ediff-show-registry)
   (define-key ediff-meta-buffer-map "E" 'ediff-documentation)
   (define-key ediff-meta-buffer-map "v" ediff-meta-action-function)
   (define-key ediff-meta-buffer-map "\C-m" ediff-meta-action-function)
   (define-key ediff-meta-buffer-map  " "  'ediff-next-meta-item)

+  (define-key ediff-meta-buffer-map  "n"  'ediff-next-meta-item)

   (define-key ediff-meta-buffer-map  "\C-?"  'ediff-previous-meta-item)
   (define-key ediff-meta-buffer-map  "\C-?"  'ediff-previous-meta-item)

+  (define-key ediff-meta-buffer-map  "p"  'ediff-previous-meta-item)

   (define-key ediff-meta-buffer-map  [delete]  'ediff-previous-meta-item)
   (define-key ediff-meta-buffer-map  [backspace]  'ediff-previous-meta-item)
   (or (ediff-one-filegroup-metajob)
   (define-key ediff-meta-buffer-map  [delete]  'ediff-previous-meta-item)
   (define-key ediff-meta-buffer-map  [backspace]  'ediff-previous-meta-item)
   (or (ediff-one-filegroup-metajob)

-      (define-key ediff-meta-buffer-map "=" 'ediff-meta-mark-equal-files))
+      (progn
+       (define-key ediff-meta-buffer-map "=" nil)
+       (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
+       (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
+       (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))

   (if ediff-no-emacs-help-in-control-buffer
       (define-key ediff-meta-buffer-map  "\C-h"  'ediff-previous-meta-item))
   (if ediff-emacs-p
   (if ediff-no-emacs-help-in-control-buffer
       (define-key ediff-meta-buffer-map  "\C-h"  'ediff-previous-meta-item))
   (if ediff-emacs-p


@@ -299,29 +360,31 @@ Commands:
 (suppress-keymap ediff-dir-diffs-buffer-map)
 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
 (define-key ediff-dir-diffs-buffer-map " " 'next-line)
 (suppress-keymap ediff-dir-diffs-buffer-map)
 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
 (define-key ediff-dir-diffs-buffer-map " " 'next-line)

+(define-key ediff-dir-diffs-buffer-map "n" 'next-line)

 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)
 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)

+(define-key ediff-dir-diffs-buffer-map "p" 'previous-line)

 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line)
 (define-key ediff-dir-diffs-buffer-map [backspace] 'previous-line)
 
 (defun ediff-next-meta-item (count)
   "Move to the next item in Ediff registry or session group buffer.
 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line)
 (define-key ediff-dir-diffs-buffer-map [backspace] 'previous-line)
 
 (defun ediff-next-meta-item (count)
   "Move to the next item in Ediff registry or session group buffer.

-Moves in circular fashion. With numeric prefix arg, skip this many items."
+Moves in circular fashion.  With numeric prefix arg, skip this many items."

   (interactive "p")
   (or count (setq count 1))
   (interactive "p")
   (or count (setq count 1))

-  (while (< 0 count)
-    (setq count (1- count))
-    (ediff-next-meta-item1)))
+  (let (overl)
+    (while (< 0 count)
+      (setq count (1- count))
+      (ediff-next-meta-item1)
+      (setq overl (ediff-get-meta-overlay-at-pos (point)))
+      ;; skip invisible ones
+      (while (and overl (ediff-overlay-get overl 'invisible))
+       (ediff-next-meta-item1)
+       (setq overl (ediff-get-meta-overlay-at-pos (point)))))))

 
 ;; Move to the next meta item
 (defun ediff-next-meta-item1 ()
   (let (pos)
     (setq pos (ediff-next-meta-overlay-start (point)))
 
 ;; Move to the next meta item
 (defun ediff-next-meta-item1 ()
   (let (pos)
     (setq pos (ediff-next-meta-overlay-start (point)))

-;;;    ;; skip deleted
-;;;    (while (memq (ediff-get-session-status
-;;;              (ediff-get-meta-info (current-buffer) pos 'noerror))
-;;;             '(?H ?I))
-;;;      (setq pos (ediff-next-meta-overlay-start pos)))
-    

     (if pos (goto-char pos))
     (if (eq ediff-metajob-name 'ediff-registry)
        (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
     (if pos (goto-char pos))
     (if (eq ediff-metajob-name 'ediff-registry)
        (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)


@@ -333,12 +396,18 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
 
 (defun ediff-previous-meta-item (count)
   "Move to the previous item in Ediff registry or session group buffer.
 
 (defun ediff-previous-meta-item (count)
   "Move to the previous item in Ediff registry or session group buffer.

-Moves in circular fashion. With numeric prefix arg, skip this many items."
+Moves in circular fashion.  With numeric prefix arg, skip this many items."

   (interactive "p")
   (or count (setq count 1))
   (interactive "p")
   (or count (setq count 1))

-  (while (< 0 count)
-    (setq count (1- count))
-    (ediff-previous-meta-item1)))
+  (let (overl)
+    (while (< 0 count)
+      (setq count (1- count))
+      (ediff-previous-meta-item1)
+      (setq overl (ediff-get-meta-overlay-at-pos (point)))
+      ;; skip invisible ones
+      (while (and overl (ediff-overlay-get overl 'invisible))
+       (ediff-previous-meta-item1)
+       (setq overl (ediff-get-meta-overlay-at-pos (point)))))))

 
 (defun ediff-previous-meta-item1 ()
   (let (pos)
 
 (defun ediff-previous-meta-item1 ()
   (let (pos)


@@ -362,21 +431,29 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
       (file-name-as-directory file)
     file))
 
       (file-name-as-directory file)
     file))
 

+(defun ediff-toggle-filename-truncation ()
+  "Toggle truncation of long file names in session group buffers.
+Set `ediff-meta-truncate-filenames' variable if you want to change the default
+behavior."
+  (interactive)
+  (setq ediff-meta-truncate-filenames (not ediff-meta-truncate-filenames))
+  (ediff-update-meta-buffer (current-buffer) 'must-redraw))
+

 
 

-;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
+;; DIR1, DIR2, DIR3 are directories.  DIR3 can be nil.

 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
 ;;           Can be nil.
 ;; REGEXP is a regexp used to filter out files in the directories.
 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
 ;;           Can be nil.
 ;; REGEXP is a regexp used to filter out files in the directories.
 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not

-;; included in the intersection. However, a regular file that is a dir in dir3
+;; included in the intersection.  However, a regular file that is a dir in dir3

 ;; is included, since dir3 files are supposed to be ancestors for merging.
 ;; Returns a list of the form:
 ;;     ((dir1 dir2 dir3) (f1 f2 f3) (f1 f2 f3) ...)
 ;; dir3, f3 can be nil if intersecting only 2 directories.
 ;; is included, since dir3 files are supposed to be ancestors for merging.
 ;; Returns a list of the form:
 ;;     ((dir1 dir2 dir3) (f1 f2 f3) (f1 f2 f3) ...)
 ;; dir3, f3 can be nil if intersecting only 2 directories.

-;; If COMPARISON-FUNC is given, use it. Otherwise, use string=
+;; If COMPARISON-FUNC is given, use it.  Otherwise, use string=

 ;; DIFF-VAR contains the name of the variable in which to return the
 ;; difference list (which represents the differences among the contents of
 ;; DIFF-VAR contains the name of the variable in which to return the
 ;; difference list (which represents the differences among the contents of

-;; directories). The diff list is of the form:
+;; directories).  The diff list is of the form:

 ;;     ((dir1 dir2 dir3) (file . num) (file . num)...)
 ;; where num encodes the set of dirs where the file is found:
 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.
 ;;     ((dir1 dir2 dir3) (file . num) (file . num)...)
 ;; where num encodes the set of dirs where the file is found:
 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.


@@ -392,26 +469,23 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
          lis1          (delete "."  lis1)
          lis1          (delete ".." lis1)
          lis1          (mapcar 
          lis1          (delete "."  lis1)
          lis1          (delete ".." lis1)
          lis1          (mapcar 

-                        (function 
-                         (lambda (elt)
-                                 (ediff-add-slash-if-directory auxdir1 elt)))
+                        (lambda (elt)
+                          (ediff-add-slash-if-directory auxdir1 elt))

                         lis1)
          auxdir2       (file-name-as-directory dir2)
          lis2          (mapcar 
                         lis1)
          auxdir2       (file-name-as-directory dir2)
          lis2          (mapcar 

-                        (function
-                         (lambda (elt)
-                                 (ediff-add-slash-if-directory auxdir2 elt)))
+                        (lambda (elt)
+                          (ediff-add-slash-if-directory auxdir2 elt))

                         (directory-files auxdir2 nil regexp)))
 
     (if (stringp dir3)
        (setq auxdir3   (file-name-as-directory dir3)
              lis3      (mapcar 
                         (directory-files auxdir2 nil regexp)))
 
     (if (stringp dir3)
        (setq auxdir3   (file-name-as-directory dir3)
              lis3      (mapcar 

-                        (function
-                         (lambda (elt)
-                                 (ediff-add-slash-if-directory auxdir3 elt)))
+                        (lambda (elt)
+                          (ediff-add-slash-if-directory auxdir3 elt))

                         (directory-files auxdir3 nil regexp))))
 
                         (directory-files auxdir3 nil regexp))))
 

-    (if (stringp merge-autostore-dir)
+    (if (ediff-nonempty-string-p merge-autostore-dir)

        (setq merge-autostore-dir
              (file-name-as-directory merge-autostore-dir)))
     (setq common (ediff-intersection lis1 lis2 comparison-func))
        (setq merge-autostore-dir
              (file-name-as-directory merge-autostore-dir)))
     (setq common (ediff-intersection lis1 lis2 comparison-func))


@@ -437,17 +511,17 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
          difflist (sort (ediff-copy-list (delete ".." difflist))
                         'string-lessp))
 
          difflist (sort (ediff-copy-list (delete ".." difflist))
                         'string-lessp))
 

-    (setq difflist (mapcar (function (lambda (elt) (cons elt 1))) difflist))
+    (setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist))

 
     ;; check for files belonging to lis1/2/3
 
     ;; check for files belonging to lis1/2/3

-    (mapcar (function (lambda (elt) 
-                       (if (member (car elt) lis1)
-                           (setcdr elt (* (cdr elt) 2)))
-                       (if (member (car elt) lis2)
-                           (setcdr elt (* (cdr elt) 3)))
-                       (if (member (car elt) lis3)
-                           (setcdr elt (* (cdr elt) 5)))
-                       ))
+    (mapcar (lambda (elt)
+             (if (member (car elt) lis1)
+                 (setcdr elt (* (cdr elt) 2)))
+             (if (member (car elt) lis2)
+                 (setcdr elt (* (cdr elt) 3)))
+             (if (member (car elt) lis3)
+                 (setcdr elt (* (cdr elt) 5)))
+             )

            difflist)
     (setq difflist (cons (list regexp auxdir1 auxdir2 auxdir3) difflist))
     
            difflist)
     (setq difflist (cons (list regexp auxdir1 auxdir2 auxdir3) difflist))
     


@@ -457,30 +531,28 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
     ;; return result
     (cons (list regexp auxdir1 auxdir2 auxdir3 merge-autostore-dir)
          (mapcar
     ;; return result
     (cons (list regexp auxdir1 auxdir2 auxdir3 merge-autostore-dir)
          (mapcar

-          (function
-           (lambda (elt) 
-             (list (concat auxdir1 elt)
-                   (concat auxdir2 elt)
-                   (if lis3
-                       (progn
-                         ;; The following is done because:
-                         ;;   In merging with ancestor, we don't intersect
-                         ;;   with lis3. So, it is possible that elt is a
-                         ;;   file in auxdir1/2 but a directory in auxdir3
-                         ;;   Or elt may not exist in auxdir3 at all.
-                         ;;   In the first case, we add a slash at the end.
-                         ;;   In the second case, we insert nil.
-                         (setq elt (ediff-add-slash-if-directory auxdir3 elt))
-                         (if (file-exists-p (concat auxdir3 elt))
-                             (concat auxdir3 elt)))))))
+          (lambda (elt) 
+            (list (concat auxdir1 elt)
+                  (concat auxdir2 elt)
+                  (if lis3
+                      (progn
+                        ;; The following is done because:
+                        ;;   In merging with ancestor, we don't intersect
+                        ;;   with lis3.  So, it is possible that elt is a
+                        ;;   file in auxdir1/2 but a directory in auxdir3
+                        ;;   Or elt may not exist in auxdir3 at all.
+                        ;;   In the first case, we add a slash at the end.
+                        ;;   In the second case, we insert nil.
+                        (setq elt (ediff-add-slash-if-directory auxdir3 elt))
+                        (if (file-exists-p (concat auxdir3 elt))
+                            (concat auxdir3 elt))))))

           common))
     ))
 
           common))
     ))
 

-;; find directory files that are under revision.
-;; Include subdirectories, since we may visit them recursively.
-;; DIR1 is the directory to inspect.
-;; OUTPUT-DIR is the directory where to auto-store the results of merges. Can
-;; be nil.
+;; find directory files that are under revision.  Include subdirectories, since
+;; we may visit them recursively.  DIR1 is the directory to inspect.
+;; MERGE-AUTOSTORE-DIR is the directory where to auto-store the results of
+;; merges.  Can be nil.

 (defun ediff-get-directory-files-under-revision (jobname
                                                 regexp dir1
                                                 &optional merge-autostore-dir)
 (defun ediff-get-directory-files-under-revision (jobname
                                                 regexp dir1
                                                 &optional merge-autostore-dir)


@@ -488,7 +560,7 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
     (setq auxdir1 (file-name-as-directory dir1)
          lis1    (directory-files auxdir1 nil regexp))
 
     (setq auxdir1 (file-name-as-directory dir1)
          lis1    (directory-files auxdir1 nil regexp))
 

-    (if (stringp merge-autostore-dir)
+    (if (ediff-nonempty-string-p merge-autostore-dir)

        (setq merge-autostore-dir
              (file-name-as-directory merge-autostore-dir)))
 
        (setq merge-autostore-dir
              (file-name-as-directory merge-autostore-dir)))
 


@@ -497,7 +569,12 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
            lis1 (cdr lis1))
       ;; take files under revision control
       (cond ((file-directory-p (concat auxdir1 elt))
            lis1 (cdr lis1))
       ;; take files under revision control
       (cond ((file-directory-p (concat auxdir1 elt))

+            (setq common
+                  (cons (ediff-add-slash-if-directory auxdir1 elt) common)))
+           ((and (featurep 'vc-hooks) (vc-backend (concat auxdir1 elt)))

             (setq common (cons elt common)))
             (setq common (cons elt common)))

+           ;; The following two are needed only if vc-hooks isn't loaded.
+           ;; They won't recognize CVS files.

            ((file-exists-p (concat auxdir1 elt ",v"))
             (setq common (cons elt common)))
            ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))
            ((file-exists-p (concat auxdir1 elt ",v"))
             (setq common (cons elt common)))
            ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))


@@ -505,18 +582,18 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
            ) ; cond
       ) ; while
 
            ) ; cond
       ) ; while
 

-    (setq common (delete "."  common)
-         common (delete ".." common)
-         common (delete "RCS" common))
+    (setq common (delete "./"  common)
+         common (delete "../" common)
+         common (delete "RCS" common)
+         common (delete "CVS" common)
+         )

 
     ;; copying is needed because sort sorts via side effects
     (setq common (sort (ediff-copy-list common) 'string-lessp))
 
     ;; return result
     (cons (list regexp auxdir1 nil nil merge-autostore-dir)
 
     ;; copying is needed because sort sorts via side effects
     (setq common (sort (ediff-copy-list common) 'string-lessp))
 
     ;; return result
     (cons (list regexp auxdir1 nil nil merge-autostore-dir)

-         (mapcar (function (lambda (elt) 
-                             (list (concat auxdir1 elt)
-                                   nil nil)))
+         (mapcar (lambda (elt) (list (concat auxdir1 elt) nil nil))

                  common))
     ))
       
                  common))
     ))
       


@@ -552,14 +629,14 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
 
 
 ;; Prepare meta-buffer in accordance with the argument-function and
 
 
 ;; Prepare meta-buffer in accordance with the argument-function and

-;; redraw-function. Must return the created  meta-buffer.
+;; redraw-function.  Must return the created  meta-buffer.

 (defun ediff-prepare-meta-buffer (action-func meta-list
                                  meta-buffer-name redraw-function
                                  jobname &optional startup-hooks)
   (let* ((meta-buffer-name 
          (ediff-unique-buffer-name meta-buffer-name "*"))
         (meta-buffer (get-buffer-create meta-buffer-name)))
 (defun ediff-prepare-meta-buffer (action-func meta-list
                                  meta-buffer-name redraw-function
                                  jobname &optional startup-hooks)
   (let* ((meta-buffer-name 
          (ediff-unique-buffer-name meta-buffer-name "*"))
         (meta-buffer (get-buffer-create meta-buffer-name)))

-    (ediff-eval-in-buffer meta-buffer
+    (ediff-with-current-buffer meta-buffer

 
       ;; comes first
       (ediff-meta-mode)
 
       ;; comes first
       (ediff-meta-mode)


@@ -583,28 +660,26 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
        ;; Initialize the meta list -- don't do this for registry.
        ;;
        ;; We prepend '(nil nil) to all elts of meta-list, except the first.
        ;; Initialize the meta list -- don't do this for registry.
        ;;
        ;; We prepend '(nil nil) to all elts of meta-list, except the first.

-       ;; The first nil will later be replaced by the session buffer. The
+       ;; The first nil will later be replaced by the session buffer.  The

        ;; second is reserved for session status.
        ;;
        ;; (car ediff-meta-list) gets cons'ed with the session group buffer.
        ;; Also, session objects A/B/C are turned into lists of the form
        ;; second is reserved for session status.
        ;;
        ;; (car ediff-meta-list) gets cons'ed with the session group buffer.
        ;; Also, session objects A/B/C are turned into lists of the form

-       ;; (obj eq-indicator). Eq-indicator is either nil or =. Initialized to
-       ;; nil. If later it is discovered that this file is = to some other
+       ;; (obj eq-indicator).  Eq-indicator is either nil or =. Initialized to
+       ;; nil.  If later it is discovered that this file is = to some other

        ;; file in the same session, eq-indicator is changed to `='.
        ;; For now, the eq-indicator is used only for 2 and 3-file jobs.
        (setq ediff-meta-list
              (cons (cons meta-buffer (car meta-list))
                    (mapcar
        ;; file in the same session, eq-indicator is changed to `='.
        ;; For now, the eq-indicator is used only for 2 and 3-file jobs.
        (setq ediff-meta-list
              (cons (cons meta-buffer (car meta-list))
                    (mapcar

-                    (function
-                     (lambda (elt)
-                       (cons nil
-                             (cons nil
-                                   ;; convert each obj to (obj nil),
-                                   ;; where nil is the initial value
-                                   ;; for eq-indicator -- see above
-                                   (mapcar
-                                    (function (lambda (obj) (list obj nil)))
-                                    elt)))))
+                    (lambda (elt)
+                      (cons nil
+                            (cons nil
+                                  ;; convert each obj to (obj nil),
+                                  ;; where nil is the initial value
+                                  ;; for eq-indicator -- see above
+                                  (mapcar (lambda (obj) (list obj nil))
+                                          elt))))

                     (cdr meta-list)))))
        
       (or (eq meta-buffer ediff-registry-buffer)
                     (cdr meta-list)))))
        
       (or (eq meta-buffer ediff-registry-buffer)


@@ -632,25 +707,99 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
 
            (or (ediff-one-filegroup-metajob jobname)
                (ediff-draw-dir-diffs ediff-dir-difference-list))
 
            (or (ediff-one-filegroup-metajob jobname)
                (ediff-draw-dir-diffs ediff-dir-difference-list))

-           (define-key ediff-meta-buffer-map "h" 'ediff-mark-for-hiding)
+           (define-key 
+             ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos)
+           (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
+           (define-key 
+             ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos)
+           (define-key ediff-meta-buffer-map "u" nil)

            (define-key
            (define-key

-             ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
-           (define-key ediff-meta-buffer-map "m" 'ediff-mark-for-operation)
+             ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
+           (define-key 
+             ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)

            (cond ((ediff-collect-diffs-metajob jobname)
                   (define-key
                     ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
                  ((ediff-patch-metajob jobname)
                   (define-key
                     ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
            (cond ((ediff-collect-diffs-metajob jobname)
                   (define-key
                     ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
                  ((ediff-patch-metajob jobname)
                   (define-key
                     ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))

-           (define-key ediff-meta-buffer-map "u" 'ediff-up-meta-hierarchy)
+           (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)

            (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
 
       (if (eq ediff-metajob-name 'ediff-registry)
          (run-hooks 'ediff-registry-setup-hook)
            (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
 
       (if (eq ediff-metajob-name 'ediff-registry)
          (run-hooks 'ediff-registry-setup-hook)

-       (run-hooks 'ediff-session-group-setup-hook))
+       (run-hooks 'ediff-after-session-group-setup-hook))

       ) ; eval in meta-buffer
     meta-buffer))
 
       ) ; eval in meta-buffer
     meta-buffer))
 

+;; Insert the activity marker for session SESSION in the meta buffer at point
+;; The activity marker is either SPC (untouched session), or + (active session,
+;; i.e., ediff is currently run in it), or - (finished session, i.e., we've ran
+;; ediff in it and then exited)
+(defun ediff-insert-session-activity-marker-in-meta-buffer (session)
+  (insert
+   (cond ((ediff-get-session-activity-marker session))
+        ;; virgin session
+        (t " "))))
+
+;; Insert session status at point.  Status is either ?H (marked for hiding), or
+;; ?I (hidden or invalid), or ?* (meaning marked for an operation; currently,
+;; such op can only be checking for equality)), or SPC (meaning neither marked
+;; nor invalid) 
+(defun ediff-insert-session-status-in-meta-buffer (session)
+  (insert
+   (cond ((ediff-get-session-status session)) ; session has status: ?H, ?I, ?*
+        ;; normal session, no marks or hidings
+        (t " "))))
+
+;; If NEW-MARKER is non-nil, use it to substitute the current activity marker
+;; in the meta buffer.  If nil, use SPC
+(defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker)
+  (let* ((overl (ediff-get-meta-overlay-at-pos point))
+        (session-info (ediff-overlay-get overl 'ediff-meta-info))
+        (activity-marker (ediff-get-session-activity-marker session-info))
+        buffer-read-only)
+    (or new-marker activity-marker (setq new-marker ?\ ))
+    (goto-char (ediff-overlay-start overl))
+    (if (eq (char-after (point)) new-marker)
+       () ; if marker shown in buffer is the same as new-marker, do nothing
+      (insert new-marker)
+      (delete-char 1)
+      (set-buffer-modified-p nil))))
+
+;; If NEW-STATUS is non-nil, use it to substitute the current status marker in
+;; the meta buffer.  If nil, use SPC
+(defun ediff-replace-session-status-in-meta-buffer (point new-status)
+  (let* ((overl (ediff-get-meta-overlay-at-pos point))
+        (session-info (ediff-overlay-get overl 'ediff-meta-info))
+        (status (ediff-get-session-status session-info))
+        buffer-read-only)
+    (setq new-status (or new-status status ?\ ))
+    (goto-char (ediff-overlay-start overl))
+    (forward-char 1) ; status is the second char in session record
+    (if (eq (char-after (point)) new-status)
+       () ; if marker shown in buffer is the same as new-marker, do nothing
+      (insert new-status)
+      (delete-char 1)
+      (set-buffer-modified-p nil))))
+
+;; insert all file info in meta buffer for a given session
+(defun ediff-insert-session-info-in-meta-buffer (session-info sessionNum)
+  (let ((f1 (ediff-get-session-objA session-info))
+       (f2 (ediff-get-session-objB session-info))
+       (f3 (ediff-get-session-objC session-info))
+       (pt (point))
+       (hidden (eq (ediff-get-session-status session-info) ?I)))
+    ;; insert activity marker, i.e., SPC, - or +
+    (ediff-insert-session-activity-marker-in-meta-buffer session-info)
+    ;; insert session status, i.e., *, H
+    (ediff-insert-session-status-in-meta-buffer session-info)
+    (insert "  Session " (int-to-string sessionNum) ":\n")
+    (ediff-meta-insert-file-info1 f1)
+    (ediff-meta-insert-file-info1 f2)
+    (ediff-meta-insert-file-info1 f3)
+    (ediff-set-meta-overlay pt (point) session-info sessionNum hidden)))
+

 
 ;; this is a setup function for ediff-directories
 ;; must return meta-buffer
 
 ;; this is a setup function for ediff-directories
 ;; must return meta-buffer


@@ -659,42 +808,53 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
   (let ((meta-buf (ediff-get-group-buffer meta-list))
        (empty t)
        (sessionNum 0)
   (let ((meta-buf (ediff-get-group-buffer meta-list))
        (empty t)
        (sessionNum 0)

-       regexp elt session-buf f1 f2 f3 pt 
-       merge-autostore-dir
+       regexp elt merge-autostore-dir

        point tmp-list buffer-read-only)
        point tmp-list buffer-read-only)

-    (ediff-eval-in-buffer meta-buf
+    (ediff-with-current-buffer meta-buf

       (setq point (point))
       (erase-buffer)
       (setq point (point))
       (erase-buffer)

+      ;; delete phony overlays that used to represent sessions before the buff
+      ;; was redrawn
+      (ediff-cond-compile-for-xemacs-or-emacs
+       (map-extents 'delete-extent)   ; xemacs
+       (mapcar 'delete-overlay (overlays-in 1 1))  ; emacs
+       )
+      

       (insert (format ediff-meta-buffer-message
                      (ediff-abbrev-jobname ediff-metajob-name)))
 
       (setq regexp (ediff-get-group-regexp meta-list)
       (insert (format ediff-meta-buffer-message
                      (ediff-abbrev-jobname ediff-metajob-name)))
 
       (setq regexp (ediff-get-group-regexp meta-list)

-           merge-autostore-dir (ediff-get-group-merge-autostore-dir meta-list))
+           merge-autostore-dir
+           (ediff-get-group-merge-autostore-dir meta-list))

       
       (cond ((ediff-collect-diffs-metajob)
             (insert
       
       (cond ((ediff-collect-diffs-metajob)
             (insert

-             "     `P':\tcollect custom diffs of all marked sessions\n"))
+             "     P:\tcollect custom diffs of all marked sessions\n"))

            ((ediff-patch-metajob)
             (insert
            ((ediff-patch-metajob)
             (insert

-             "     `P':\tshow patch appropriately for the context (session or group)\n")))
+             "     P:\tshow patch appropriately for the context (session or group)\n")))

       (insert
       (insert

-       "     `u':\tshow parent session group\n")
+       "     ^:\tshow parent session group\n")

       (or (ediff-one-filegroup-metajob)
          (insert
       (or (ediff-one-filegroup-metajob)
          (insert

-          "     `D':\tshow differences among directories\n"
-          "     `=':\tmark identical files in each session\n\n"))
+          "     D:\tshow differences among directories\n"
+          "    ==:\tfor each session, show which files are identical\n"
+          "    =h:\tlike ==, but also marks those sessions for hiding\n"
+          "    =m:\tlike ==, but also marks those sessions for operation\n\n"))

 
 

+      (insert "\n")

       (if (and (stringp regexp) (> (length regexp) 0))
          (insert
       (if (and (stringp regexp) (> (length regexp) 0))
          (insert

-          (format "\n*** Filter-through regular expression: %s\n" regexp)))
+          (format "*** Filter-through regular expression: %s\n" regexp)))
+      (ediff-insert-dirs-in-meta-buffer meta-list)

       (if (and ediff-autostore-merges (ediff-merge-metajob)
       (if (and ediff-autostore-merges (ediff-merge-metajob)

-              (stringp merge-autostore-dir))
+              (ediff-nonempty-string-p merge-autostore-dir))

          (insert (format
          (insert (format

-                  "\nMerges are automatically stored in directory: %s\n"
+                  "\nMerge results are automatically stored in:\n\t%s\n"

                   merge-autostore-dir)))
       (insert "\n
         Size   Last modified           Name
                   merge-autostore-dir)))
       (insert "\n
         Size   Last modified           Name

-    -----------------------------------------------------------------------
+    ----------------------------------------------

 
 ")
       
 
 ")
       


@@ -720,29 +880,89 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
              sessionNum (1+ sessionNum))
        (if (eq (ediff-get-session-status elt) ?I)
            ()
              sessionNum (1+ sessionNum))
        (if (eq (ediff-get-session-status elt) ?I)
            ()

-         (setq session-buf (ediff-get-session-buffer elt)
-               f1 (ediff-get-session-objA elt)
-               f2 (ediff-get-session-objB elt)
-               f3 (ediff-get-session-objC elt))
-         (setq pt (point))
-         ;; insert markers
-         (insert (cond ((null session-buf) " ") ; virgin session
-                       ((ediff-buffer-live-p session-buf) "+") ;active session
-                       (t "-"))) ; finished session
-         (insert (cond ((ediff-get-session-status elt)) ; session has status,
-                                                      ;;; e.g., ?H, ?I
-                       (t " "))) ; normal session
-         (insert "  Session " (int-to-string sessionNum) ":\n")
-         (ediff-meta-insert-file-info f1)
-         (ediff-meta-insert-file-info f2)
-         (ediff-meta-insert-file-info f3)
-         (ediff-set-meta-overlay pt (point) elt)))
+         (ediff-insert-session-info-in-meta-buffer elt sessionNum)))

       (set-buffer-modified-p nil)
       (goto-char point)
       meta-buf)))
 
       (set-buffer-modified-p nil)
       (goto-char point)
       meta-buf)))
 

+(defun ediff-update-markers-in-dir-meta-buffer (meta-list)
+  (let ((meta-buf (ediff-get-group-buffer meta-list))
+       session-info point overl buffer-read-only)
+    (ediff-with-current-buffer meta-buf
+      (setq point (point))
+      (goto-char (point-min))
+      (ediff-next-meta-item1)
+      (while (not (bobp))
+       (setq session-info (ediff-get-meta-info meta-buf (point) 'no-error)
+             overl (ediff-get-meta-overlay-at-pos (point)))
+       (if session-info
+           (progn
+             (cond ((eq (ediff-get-session-status session-info) ?I)
+                    ;; Do hiding
+                    (if overl (ediff-overlay-put overl 'invisible t)))
+                   ((and (eq (ediff-get-session-status session-info) ?H)
+                         overl (ediff-overlay-get overl 'invisible))
+                    ;; Do unhiding
+                    (ediff-overlay-put overl 'invisible nil))
+                   (t (ediff-replace-session-activity-marker-in-meta-buffer
+                       (point)
+                       (ediff-get-session-activity-marker session-info))
+                      (ediff-replace-session-status-in-meta-buffer
+                       (point)
+                       (ediff-get-session-status session-info))))))
+       (ediff-next-meta-item1) ; advance to the next item
+       ) ; end while
+      (set-buffer-modified-p nil)
+      (goto-char point))
+    meta-buf))
+
+(defun ediff-update-session-marker-in-dir-meta-buffer (session-num)
+  (let (buffer-meta-overlays session-info overl buffer-read-only)
+    (setq overl
+         (ediff-cond-compile-for-xemacs-or-emacs
+          (map-extents ; xemacs
+           (lambda (ext maparg)
+             (if (and
+                  (ediff-overlay-get ext 'ediff-meta-info)
+                  (eq (ediff-overlay-get ext 'ediff-meta-session-number)
+                      session-num))
+                 ext)))
+           ;; Emacs doesn't have map-extents, so try harder
+           ;; Splice overlay lists to get all buffer overlays
+          (progn
+            (setq buffer-meta-overlays (overlay-lists)
+                  buffer-meta-overlays (append (car buffer-meta-overlays)
+                                               (cdr buffer-meta-overlays)))
+            (car
+             (delq nil
+                   (mapcar
+                    (lambda (overl)
+                      (if (and
+                           (ediff-overlay-get overl 'ediff-meta-info)
+                           (eq (ediff-overlay-get
+                                overl 'ediff-meta-session-number)
+                               session-num))
+                          overl))
+                    buffer-meta-overlays))))
+          ))
+    (or overl
+       (error
+        "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S"
+        session-num))
+    (setq session-info (ediff-overlay-get overl 'ediff-meta-info))
+    (goto-char (ediff-overlay-start overl))
+    (ediff-replace-session-activity-marker-in-meta-buffer
+     (point)
+     (ediff-get-session-activity-marker session-info))
+    (ediff-replace-session-status-in-meta-buffer
+     (point)
+     (ediff-get-session-status session-info)))
+  (ediff-next-meta-item1))
+
+
+

 ;; Check if this is a problematic session.
 ;; Check if this is a problematic session.

-;; Return nil if not. Otherwise, return symbol representing the problem
+;; Return nil if not.  Otherwise, return symbol representing the problem

 ;; At present, problematic sessions occur only in -with-ancestor comparisons
 ;; when the ancestor is a directory rather than a file, or when there is no
 ;; suitable ancestor file in the ancestor directory
 ;; At present, problematic sessions occur only in -with-ancestor comparisons
 ;; when the ancestor is a directory rather than a file, or when there is no
 ;; suitable ancestor file in the ancestor directory


@@ -759,13 +979,15 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
           'ancestor-is-dir)
          (t nil))))
 
           'ancestor-is-dir)
          (t nil))))
 

-(defun ediff-meta-insert-file-info (fileinfo)
+(defun ediff-meta-insert-file-info1 (fileinfo)

   (let ((fname (car fileinfo))
        (feq (ediff-get-file-eqstatus fileinfo))
   (let ((fname (car fileinfo))
        (feq (ediff-get-file-eqstatus fileinfo))

+       (max-filename-width (if ediff-meta-truncate-filenames
+                               (- (window-width) 41)
+                             500))

        file-modtime file-size)
        file-modtime file-size)

-

     (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits
     (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits

-         ((not (ediff-file-remote-p fname))
+         ((ediff-listable-file fname)

           (if (file-exists-p fname)
               ;; set real size and modtime
               (setq file-size (ediff-file-size fname)
           (if (file-exists-p fname)
               ;; set real size and modtime
               (setq file-size (ediff-file-size fname)


@@ -788,7 +1010,9 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
          ;; abbreviate the file name, if file exists
          (if (and (not (stringp fname)) (< file-size -1))
              "-------"         ; file doesn't exist
          ;; abbreviate the file name, if file exists
          (if (and (not (stringp fname)) (< file-size -1))
              "-------"         ; file doesn't exist

-           (ediff-abbreviate-file-name fname)))))))
+           (ediff-truncate-string-left
+            (ediff-abbreviate-file-name fname)
+            max-filename-width)))))))

 
 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
                        (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")
 
 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
                        (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")


@@ -812,6 +1036,18 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
          (ediff-fill-leading-zero (nth 0 time)) ; sec
          ))
 
          (ediff-fill-leading-zero (nth 0 time)) ; sec
          ))
 

+;; Draw the directories
+(defun ediff-insert-dirs-in-meta-buffer (meta-list)
+  (let* ((dir1 (ediff-abbreviate-file-name (ediff-get-group-objA meta-list)))
+        (dir2 (ediff-get-group-objB meta-list))
+        (dir2 (if (stringp dir2) (ediff-abbreviate-file-name dir2)))
+        (dir3 (ediff-get-group-objC meta-list))
+        (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3))))
+    (insert "*** Directory A: " dir1 "\n")
+    (if dir2 (insert "*** Directory B: " dir2 "\n"))
+    (if dir3 (insert "*** Directory C: " dir3 "\n"))
+    (insert "\n")))
+

 (defun ediff-draw-dir-diffs (diff-list)
   (if (null diff-list) (error "Lost difference info on these directories"))
   (let* ((buf-name (ediff-unique-buffer-name
 (defun ediff-draw-dir-diffs (diff-list)
   (if (null diff-list) (error "Lost difference info on these directories"))
   (let* ((buf-name (ediff-unique-buffer-name


@@ -828,7 +1064,7 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
     ;; skip the directory part
     (setq diff-list (cdr diff-list))
     (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))
     ;; skip the directory part
     (setq diff-list (cdr diff-list))
     (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))

-    (ediff-eval-in-buffer ediff-dir-diffs-buffer
+    (ediff-with-current-buffer ediff-dir-diffs-buffer

       (use-local-map ediff-dir-diffs-buffer-map)
       (erase-buffer)
       (setq ediff-meta-buffer meta-buf)
       (use-local-map ediff-dir-diffs-buffer-map)
       (erase-buffer)
       (setq ediff-meta-buffer meta-buf)


@@ -836,8 +1072,8 @@ Moves in circular fashion. With numeric prefix arg, skip this many items."
       (insert "
 Useful commands:
      `q': hide this buffer
       (insert "
 Useful commands:
      `q': hide this buffer

-     SPC: next line
-     DEL: previous line\n\n")
+   n,SPC: next line
+   p,DEL: previous line\n\n")

 
       (if (and (stringp regexp) (> (length regexp) 0))
          (insert
 
       (if (and (stringp regexp) (> (length regexp) 0))
          (insert


@@ -905,7 +1141,7 @@ Useful commands:
   ))
 
 (defun ediff-bury-dir-diffs-buffer ()
   ))
 
 (defun ediff-bury-dir-diffs-buffer ()

-  "Bury the directory difference buffer. Display the meta buffer instead."
+  "Bury the directory difference buffer.  Display the meta buffer instead."

   (interactive)
   (let ((buf ediff-meta-buffer)
        wind)
   (interactive)
   (let ((buf ediff-meta-buffer)
        wind)


@@ -932,27 +1168,35 @@ Useful commands:
   "Go to the parent session group buffer."
   (interactive)
   (if (ediff-buffer-live-p ediff-parent-meta-buffer)
   "Go to the parent session group buffer."
   (interactive)
   (if (ediff-buffer-live-p ediff-parent-meta-buffer)

-      (ediff-show-meta-buffer ediff-parent-meta-buffer)
+      (ediff-show-meta-buffer
+       ediff-parent-meta-buffer ediff-meta-session-number)

     (error "This session group has no parent")))
   
 
 ;; argument is ignored
 (defun ediff-redraw-registry-buffer (&optional ignore)
     (error "This session group has no parent")))
   
 
 ;; argument is ignored
 (defun ediff-redraw-registry-buffer (&optional ignore)

-  (ediff-eval-in-buffer ediff-registry-buffer
+  (ediff-with-current-buffer ediff-registry-buffer

     (let ((point (point))
          elt bufAname bufBname bufCname cur-diff total-diffs pt
          job-name meta-list registry-list buffer-read-only)
       (erase-buffer)
     (let ((point (point))
          elt bufAname bufBname bufCname cur-diff total-diffs pt
          job-name meta-list registry-list buffer-read-only)
       (erase-buffer)

+      ;; delete phony overlays that used to represent sessions before the buff
+      ;; was redrawn
+      (ediff-cond-compile-for-xemacs-or-emacs
+       (map-extents 'delete-extent) ; xemacs
+       (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
+       )
+

       (insert "This is a registry of all active Ediff sessions.
 
 Useful commands:
      button2, `v', RET over a session record:  switch to that session
       (insert "This is a registry of all active Ediff sessions.
 
 Useful commands:
      button2, `v', RET over a session record:  switch to that session

-     `M' over a session record:  display the associated session group
-     `R' in any Ediff session:   display session registry
-     SPC:\tnext session
-     DEL:\tprevious session
-     `E':\tbrowse Ediff on-line manual
-     `q':\tbury registry
+     M over a session record:  display the associated session group
+     R in any Ediff session:   display session registry
+     n,SPC: next session
+     p,DEL: previous session
+         E: browse Ediff on-line manual
+         q: bury registry

 
 
 \t\tActive Ediff Sessions:
 
 
 \t\tActive Ediff Sessions:


@@ -960,10 +1204,10 @@ Useful commands:
 
 ")
       ;; purge registry list from dead buffers
 
 ")
       ;; purge registry list from dead buffers

-      (mapcar (function (lambda (elt)
-                         (if (not (ediff-buffer-live-p elt))
-                             (setq ediff-session-registry
-                                   (delq elt ediff-session-registry)))))
+      (mapcar (lambda (elt)
+               (if (not (ediff-buffer-live-p elt))
+                   (setq ediff-session-registry
+                         (delq elt ediff-session-registry))))

              ediff-session-registry)
 
       (if (null ediff-session-registry)
              ediff-session-registry)
 
       (if (null ediff-session-registry)


@@ -975,7 +1219,7 @@ Useful commands:
              registry-list (cdr registry-list))
        
        (if (ediff-buffer-live-p elt)
              registry-list (cdr registry-list))
        
        (if (ediff-buffer-live-p elt)

-           (if (ediff-eval-in-buffer elt
+           (if (ediff-with-current-buffer elt

                  (setq job-name ediff-metajob-name
                        meta-list ediff-meta-list)
                  (and ediff-metajob-name
                  (setq job-name ediff-metajob-name
                        meta-list ediff-meta-list)
                  (and ediff-metajob-name


@@ -1000,7 +1244,7 @@ Useful commands:
                                       ""))))
                  (ediff-set-meta-overlay pt (point) elt))
              (progn
                                       ""))))
                  (ediff-set-meta-overlay pt (point) elt))
              (progn

-               (ediff-eval-in-buffer elt
+               (ediff-with-current-buffer elt

                  (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
                                     (buffer-name ediff-buffer-A)
                                   "!!!killed buffer!!!")
                  (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
                                     (buffer-name ediff-buffer-A)
                                   "!!!killed buffer!!!")


@@ -1034,56 +1278,84 @@ Useful commands:
       (goto-char point)
       )))
 
       (goto-char point)
       )))
 

-;; sets overlay around a meta record with 'ediff-meta-info property PROP
-(defun ediff-set-meta-overlay (b e prop)
+;; Sets overlay around a meta record with 'ediff-meta-info property PROP
+;; If optional SESSION-NUMBER, make it a property of the overlay,
+;; ediff-meta-session-number
+;; PROP is either the ctl or meta buffer (used when we work with the registry)
+;; or a session meta descriptor of the form
+;;                 (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
+(defun ediff-set-meta-overlay (b e prop &optional session-number hidden)

   (let (overl)
     (setq overl (ediff-make-overlay b e))
     (if ediff-emacs-p
        (ediff-overlay-put overl 'mouse-face 'highlight)
       (ediff-overlay-put overl 'highlight t))
   (let (overl)
     (setq overl (ediff-make-overlay b e))
     (if ediff-emacs-p
        (ediff-overlay-put overl 'mouse-face 'highlight)
       (ediff-overlay-put overl 'highlight t))

-    (ediff-overlay-put overl 'ediff-meta-info prop)))
+    (ediff-overlay-put overl 'ediff-meta-info prop)
+    (ediff-overlay-put overl 'invisible hidden)
+    (if (numberp session-number)
+       (ediff-overlay-put overl 'ediff-meta-session-number session-number))))

 
 

-(defun ediff-mark-for-hiding (unmark)
-  "Mark session for hiding. With prefix arg, unmark."
+(defun ediff-mark-for-hiding-at-pos (unmark)
+  "Mark session for hiding.  With prefix arg, unmark."

   (interactive "P")
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
         (info (ediff-get-meta-info meta-buf pos))
   (interactive "P")
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
         (info (ediff-get-meta-info meta-buf pos))

-        (session-buf (ediff-get-session-buffer info)))
-
-    (if (eq (ediff-get-session-status info) ?H)
-       (setq unmark t))
-    (if unmark
-       (ediff-set-session-status info nil)
-      (if (ediff-buffer-live-p session-buf)
-         (error "Can't hide active session, %s" (buffer-name session-buf)))
-      (ediff-set-session-status info ?H))
-    (or unmark
-       (ediff-next-meta-item 1))
-    (ediff-update-meta-buffer meta-buf)
+        (session-number (ediff-get-session-number-at-pos pos)))
+    (ediff-mark-session-for-hiding info unmark)
+    (ediff-next-meta-item 1)
+    (save-excursion
+      (ediff-update-meta-buffer meta-buf nil session-number))

     ))
 
     ))
 

-(defun ediff-mark-for-operation (unmark)
-  "Mark session for a group operation. With prefix arg, unmark."
+;; Returns whether session was marked or unmarked
+(defun ediff-mark-session-for-hiding (info unmark)
+  (let ((session-buf (ediff-get-session-buffer info))
+       ignore)
+    (cond ((eq unmark 'mark) (setq unmark nil))
+         ((eq (ediff-get-session-status info) ?H) (setq unmark t))
+         (unmark  ; says unmark, but the marker is different from H
+          (setq ignore t)))
+    (cond (ignore)
+         (unmark (ediff-set-session-status info nil))
+;;;   (if (ediff-buffer-live-p session-buf)
+;;;      (error "Can't hide active session, %s" (buffer-name session-buf)))
+         (t (ediff-set-session-status info ?H))))
+  unmark)
+  
+
+(defun ediff-mark-for-operation-at-pos (unmark)
+  "Mark session for a group operation.  With prefix arg, unmark."

   (interactive "P")
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
   (interactive "P")
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid

-        (info (ediff-get-meta-info meta-buf pos)))
-
-    (if (eq (ediff-get-session-status info) ?*)
-       (setq unmark t))
-    (if unmark
-       (ediff-set-session-status info nil)
-      (ediff-set-session-status info ?*))
-    (or unmark
-       (ediff-next-meta-item 1))
-    (ediff-update-meta-buffer meta-buf)
+        (info (ediff-get-meta-info meta-buf pos))
+        (session-number (ediff-get-session-number-at-pos pos)))
+    (ediff-mark-session-for-operation info unmark)
+    (ediff-next-meta-item 1)
+    (save-excursion
+      (ediff-update-meta-buffer meta-buf nil session-number))

     ))
 
     ))
 

+
+;; returns whether session was unmarked.
+;; remember: this is a toggle op
+(defun ediff-mark-session-for-operation (info unmark)
+  (let (ignore)
+    (cond ((eq unmark 'mark) (setq unmark nil))
+         ((eq (ediff-get-session-status info) ?*) (setq unmark t))
+         (unmark  ; says unmark, but the marker is different from *
+          (setq ignore t)))
+    (cond (ignore)
+         (unmark (ediff-set-session-status info nil))
+         (t (ediff-set-session-status info ?*))))
+  unmark)
+
+

 (defun ediff-hide-marked-sessions (unhide)
 (defun ediff-hide-marked-sessions (unhide)

-  "Hide marked sessions. With prefix arg, unhide."
+  "Hide marked sessions.  With prefix arg, unhide."

   (interactive "P")
   (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
        (meta-list (cdr ediff-meta-list))
   (interactive "P")
   (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
        (meta-list (cdr ediff-meta-list))


@@ -1104,16 +1376,16 @@ Useful commands:
                (setq active-sessions-exist t)
              (ediff-set-session-status elt to)))))
     (if (> numMarked 0)
                (setq active-sessions-exist t)
              (ediff-set-session-status elt to)))))
     (if (> numMarked 0)

-       (ediff-update-meta-buffer grp-buf)
+       (ediff-update-meta-buffer grp-buf 'must-redraw)

       (beep)
       (if unhide
          (message "Nothing to reveal...")
        (message "Nothing to hide...")))
     (if active-sessions-exist
       (beep)
       (if unhide
          (message "Nothing to reveal...")
        (message "Nothing to hide...")))
     (if active-sessions-exist

-       (message "Note: didn't hide active sessions!"))
+       (message "Note: Ediff didn't hide active sessions!"))

     ))
 
     ))
 

-;; Apply OPERATION to marked sessions. Operation expects one argument of type
+;; Apply OPERATION to marked sessions.  Operation expects one argument of type

 ;; meta-list member (not the first one), i.e., a regular session description.
 ;; Returns number of marked sessions on which operation was performed
 (defun ediff-operate-on-marked-sessions (operation)
 ;; meta-list member (not the first one), i.e., a regular session description.
 ;; Returns number of marked sessions on which operation was performed
 (defun ediff-operate-on-marked-sessions (operation)


@@ -1122,28 +1394,39 @@ Useful commands:
        (marksym ?*)
        (numMarked 0)
        (sessionNum 0)
        (marksym ?*)
        (numMarked 0)
        (sessionNum 0)

-       elt)
+       (diff-buffer ediff-meta-diff-buffer)
+       session-buf elt)

     (while meta-list
       (setq elt (car meta-list)
            meta-list (cdr meta-list)
            sessionNum (1+ sessionNum))
     (while meta-list
       (setq elt (car meta-list)
            meta-list (cdr meta-list)
            sessionNum (1+ sessionNum))

-      (if (eq (ediff-get-session-status elt) marksym)
-         (save-excursion
-           (setq numMarked (1+ numMarked))
-           (funcall operation elt sessionNum))))
-    (ediff-update-meta-buffer grp-buf) ; just in case
+      (cond ((eq (ediff-get-session-status elt) marksym)
+            (save-excursion
+              (setq numMarked (1+ numMarked))
+              (funcall operation elt sessionNum)))
+           ((and  (ediff-meta-session-p elt) 
+                  (ediff-buffer-live-p 
+                   (setq session-buf (ediff-get-session-buffer elt))))
+            (setq numMarked
+                  (+ numMarked 
+                     (ediff-with-current-buffer session-buf
+                       ;; pass meta-diff along
+                       (setq ediff-meta-diff-buffer diff-buffer)
+                       ;; collect diffs in child group
+                       (ediff-operate-on-marked-sessions operation)))))))
+    (ediff-update-meta-buffer grp-buf 'must-redraw) ; just in case

     numMarked
     ))
 
 (defun ediff-append-custom-diff (session sessionNum)
   (or (ediff-collect-diffs-metajob)
     numMarked
     ))
 
 (defun ediff-append-custom-diff (session sessionNum)
   (or (ediff-collect-diffs-metajob)

-      (error "Sorry, I don't do this for everyone..."))
+      (error "Hmm, I'd hate to do it to you ..."))

   (let ((session-buf (ediff-get-session-buffer session))
        (meta-diff-buff ediff-meta-diff-buffer)
        (metajob ediff-metajob-name)
        tmp-buf custom-diff-buf)
     (if (ediff-buffer-live-p session-buf)
   (let ((session-buf (ediff-get-session-buffer session))
        (meta-diff-buff ediff-meta-diff-buffer)
        (metajob ediff-metajob-name)
        tmp-buf custom-diff-buf)
     (if (ediff-buffer-live-p session-buf)

-       (ediff-eval-in-buffer session-buf
+       (ediff-with-current-buffer session-buf

          (if (eq ediff-control-buffer session-buf) ; individual session
              (progn
                (ediff-compute-custom-diffs-maybe)
          (if (eq ediff-control-buffer session-buf) ; individual session
              (progn
                (ediff-compute-custom-diffs-maybe)


@@ -1184,18 +1467,22 @@ Useful commands:
   "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
 This operation is defined only for `ediff-directories' and
 `ediff-directory-revisions', since its intent is to produce
   "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
 This operation is defined only for `ediff-directories' and
 `ediff-directory-revisions', since its intent is to produce

-multifile patches. For `ediff-directory-revisions', we insist that
+multifile patches.  For `ediff-directory-revisions', we insist that

 all marked sessions must be active."
   (interactive)
   (or (ediff-buffer-live-p ediff-meta-diff-buffer)
       (setq ediff-meta-diff-buffer
            (get-buffer-create
             (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
 all marked sessions must be active."
   (interactive)
   (or (ediff-buffer-live-p ediff-meta-diff-buffer)
       (setq ediff-meta-diff-buffer
            (get-buffer-create
             (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))

-  (ediff-eval-in-buffer ediff-meta-diff-buffer
+  (ediff-with-current-buffer ediff-meta-diff-buffer

     (erase-buffer))
   (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
       ;; did something
     (erase-buffer))
   (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
       ;; did something

-      (display-buffer ediff-meta-diff-buffer 'not-this-window)
+      (progn
+       (display-buffer ediff-meta-diff-buffer 'not-this-window)
+       (ediff-with-current-buffer ediff-meta-diff-buffer
+         (set-buffer-modified-p nil)
+         (setq buffer-read-only t)))

     (beep)
     (message "No marked sessions found")))
 
     (beep)
     (message "No marked sessions found")))
 


@@ -1207,7 +1494,7 @@ all marked sessions must be active."
         (info (ediff-get-meta-info meta-buf pos 'noerror))
         (patchbuffer ediff-meta-patchbufer))
     (if (ediff-buffer-live-p patchbuffer)
         (info (ediff-get-meta-info meta-buf pos 'noerror))
         (patchbuffer ediff-meta-patchbufer))
     (if (ediff-buffer-live-p patchbuffer)

-       (ediff-eval-in-buffer patchbuffer
+       (ediff-with-current-buffer patchbuffer

          (save-restriction
            (if (not info)
                (widen)
          (save-restriction
            (if (not info)
                (widen)


@@ -1222,19 +1509,19 @@ all marked sessions must be active."
       (error "The patch buffer wasn't found"))))
 
              
       (error "The patch buffer wasn't found"))))
 
              

-;; This function executes in meta buffer. It knows where event happened.
+;; This function executes in meta buffer.  It knows where event happened.

 (defun ediff-filegroup-action ()
 (defun ediff-filegroup-action ()

-  "Execute appropriate action for the selected session."
+  "Execute appropriate action for a selected session."

   (interactive)
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
         (info (ediff-get-meta-info meta-buf pos))
   (interactive)
   (let* ((pos (ediff-event-point last-command-event))
         (meta-buf (ediff-event-buffer last-command-event))
         ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
         (info (ediff-get-meta-info meta-buf pos))

-        merge-autostore-dir
-        session-buf file1 file2 file3 regexp)
+        (session-buf (ediff-get-session-buffer info))
+        (session-number (ediff-get-session-number-at-pos pos meta-buf))
+        merge-autostore-dir file1 file2 file3 regexp)

 
 

-    (setq session-buf (ediff-get-session-buffer info)
-         file1 (ediff-get-session-objA-name info)
+    (setq file1 (ediff-get-session-objA-name info)

          file2 (ediff-get-session-objB-name info)
          file3 (ediff-get-session-objC-name info))
 
          file2 (ediff-get-session-objB-name info)
          file3 (ediff-get-session-objC-name info))
 


@@ -1246,19 +1533,17 @@ all marked sessions must be active."
          (if (y-or-n-p "This session is marked as hidden, unmark? ")
              (progn
                (ediff-set-session-status info nil)
          (if (y-or-n-p "This session is marked as hidden, unmark? ")
              (progn
                (ediff-set-session-status info nil)

-               (ediff-update-meta-buffer meta-buf))
+               (ediff-update-meta-buffer meta-buf nil session-number))

            (error "Aborted"))))
 
            (error "Aborted"))))
 

-    (ediff-eval-in-buffer meta-buf
+    (ediff-with-current-buffer meta-buf

       (setq merge-autostore-dir
            (ediff-get-group-merge-autostore-dir ediff-meta-list))
       (goto-char pos) ; if the user clicked on session--move point there
       ;; First handle sessions involving directories (which are themselves
       ;; session groups)
       ;; After that handle individual sessions
       (setq merge-autostore-dir
            (ediff-get-group-merge-autostore-dir ediff-meta-list))
       (goto-char pos) ; if the user clicked on session--move point there
       ;; First handle sessions involving directories (which are themselves
       ;; session groups)
       ;; After that handle individual sessions

-      (cond ((and (file-directory-p file1) 
-                 (stringp file2) (file-directory-p file2)
-                 (if (stringp file3) (file-directory-p file1) t))
+      (cond ((ediff-meta-session-p info)

             ;; do ediff/ediff-merge on subdirectories
             (if (ediff-buffer-live-p session-buf)
                 (ediff-show-meta-buffer session-buf)
             ;; do ediff/ediff-merge on subdirectories
             (if (ediff-buffer-live-p session-buf)
                 (ediff-show-meta-buffer session-buf)


@@ -1268,13 +1553,15 @@ all marked sessions must be active."
                file1 file2 file3 regexp
                ediff-session-action-function
                ediff-metajob-name 
                file1 file2 file3 regexp
                ediff-session-action-function
                ediff-metajob-name 

-               ;; make it update car info after startup
-               (` (list (lambda () 
-                          ;; child session group should know its parent
-                          (setq ediff-parent-meta-buffer
-                                (quote (, ediff-meta-buffer)))
-                          ;; and parent will know its child
-                          (setcar (quote (, info)) ediff-meta-buffer)))))))
+               ;; make it update (car info) after startup
+               `(list (lambda () 
+                        ;; child session group should know its parent
+                        (setq ediff-parent-meta-buffer
+                              (quote ,ediff-meta-buffer)
+                              ediff-meta-session-number
+                              ,session-number)
+                        ;; and parent will know its child
+                        (setcar (quote ,info) ediff-meta-buffer))))))

 
            ;; Do ediff-revision on a subdirectory
            ((and (ediff-one-filegroup-metajob)
 
            ;; Do ediff-revision on a subdirectory
            ((and (ediff-one-filegroup-metajob)


@@ -1287,93 +1574,147 @@ all marked sessions must be active."
               (ediff-directory-revisions-internal
                file1 regexp
                ediff-session-action-function ediff-metajob-name
               (ediff-directory-revisions-internal
                file1 regexp
                ediff-session-action-function ediff-metajob-name

-               ;; make it update car info after startup
-               (` (list (lambda () 
-                          ;; child session group should know its parent
-                          (setq ediff-parent-meta-buffer
-                                (quote (, ediff-meta-buffer)))
-                          ;; and parent will know its child
-                          (setcar (quote (, info)) ediff-meta-buffer)))))))
+               ;; make it update (car info) after startup
+               `(list (lambda () 
+                        ;; child session group should know its parent and
+                        ;; its number
+                        (setq ediff-parent-meta-buffer
+                              (quote ,ediff-meta-buffer)
+                              ediff-meta-session-number
+                              ,session-number)
+                        ;; and parent will know its child
+                        (setcar (quote ,info) ediff-meta-buffer))))))

 
            ;; From here on---only individual session handlers
 
            ;; handle an individual session with a live control buffer
            ((ediff-buffer-live-p session-buf)
 
            ;; From here on---only individual session handlers
 
            ;; handle an individual session with a live control buffer
            ((ediff-buffer-live-p session-buf)

-            (ediff-eval-in-buffer session-buf
+            (ediff-with-current-buffer session-buf

               (setq ediff-mouse-pixel-position (mouse-pixel-position))
               (ediff-recenter 'no-rehighlight)))
 
            ((ediff-problematic-session-p info)
             (beep)
             (if (y-or-n-p
               (setq ediff-mouse-pixel-position (mouse-pixel-position))
               (ediff-recenter 'no-rehighlight)))
 
            ((ediff-problematic-session-p info)
             (beep)
             (if (y-or-n-p

-                 "This session has no ancestor. Merge without the ancestor? ")
+                 "This session has no ancestor.  Merge without the ancestor? ")

                 (ediff-merge-files
                  file1 file2
                  ;; provide startup hooks 
                 (ediff-merge-files
                  file1 file2
                  ;; provide startup hooks 

-                 (` (list (lambda () 
-                            (setq ediff-meta-buffer (, (current-buffer)))
+                 `(list (lambda () 
+                            (add-hook
+                             'ediff-after-quit-hook-internal
+                             (lambda ()
+                               (if (ediff-buffer-live-p ,(current-buffer))
+                                   (ediff-show-meta-buffer
+                                    ,(current-buffer) ,session-number)))
+                             nil 'local)
+                            (setq ediff-meta-buffer ,(current-buffer)
+                                  ediff-meta-session-number
+                                  ,session-number)

                             (setq ediff-merge-store-file
                             (setq ediff-merge-store-file

-                                  (, (concat
-                                      merge-autostore-dir
-                                      "mrg_"
-                                      (file-name-nondirectory file1))))
+                                  ,(if (ediff-nonempty-string-p
+                                        merge-autostore-dir)
+                                       (concat
+                                        merge-autostore-dir
+                                        ediff-merge-filename-prefix
+                                        (file-name-nondirectory file1))
+                                     ))

                             ;; make ediff-startup pass
                             ;; ediff-control-buffer back to the meta
                             ;; level; see below
                             (setcar
                             ;; make ediff-startup pass
                             ;; ediff-control-buffer back to the meta
                             ;; level; see below
                             (setcar

-                             (quote (, info)) ediff-control-buffer)))))
+                             (quote ,info) ediff-control-buffer))))

               (error "Aborted")))
            ((ediff-one-filegroup-metajob)      ; needs 1 file arg
             (funcall ediff-session-action-function
                      file1
                      ;; provide startup hooks 
               (error "Aborted")))
            ((ediff-one-filegroup-metajob)      ; needs 1 file arg
             (funcall ediff-session-action-function
                      file1
                      ;; provide startup hooks 

-                     (` (list (lambda () 
-                                (setq ediff-meta-buffer (, (current-buffer)))
-                                (setq ediff-merge-store-file
-                                      (, (concat
+                     `(list (lambda () 
+                              (add-hook
+                               'ediff-after-quit-hook-internal
+                               (lambda ()
+                                 (if (ediff-buffer-live-p
+                                      ,(current-buffer))
+                                     (ediff-show-meta-buffer
+                                      ,(current-buffer)
+                                      ,session-number)))
+                               nil 'local)
+                              (setq ediff-meta-buffer ,(current-buffer)
+                                    ediff-meta-session-number
+                                    ,session-number)
+                              (setq ediff-merge-store-file
+                                    ,(if (ediff-nonempty-string-p
+                                          merge-autostore-dir)
+                                         (concat

                                           merge-autostore-dir
                                           merge-autostore-dir

-                                          "mrg_"
-                                          (file-name-nondirectory file1))))
-                                ;; make ediff-startup pass
-                                ;; ediff-control-buffer back to the meta
-                                ;; level; see below
-                                (setcar
-                                 (quote (, info)) ediff-control-buffer))))))
+                                          ediff-merge-filename-prefix
+                                          (file-name-nondirectory file1))) )
+                              ;; make ediff-startup pass
+                              ;; ediff-control-buffer back to the meta
+                              ;; level; see below
+                              (setcar
+                               (quote ,info) ediff-control-buffer)))))

            ((not (ediff-metajob3))      ; need 2 file args
             (funcall ediff-session-action-function
                      file1 file2
                      ;; provide startup hooks 
            ((not (ediff-metajob3))      ; need 2 file args
             (funcall ediff-session-action-function
                      file1 file2
                      ;; provide startup hooks 

-                     (` (list (lambda () 
-                                (setq ediff-meta-buffer (, (current-buffer)))
-                                (setq ediff-merge-store-file
-                                      (, (concat
+                     `(list (lambda () 
+                              (add-hook
+                               'ediff-after-quit-hook-internal
+                               (lambda ()
+                                 (if (ediff-buffer-live-p
+                                      ,(current-buffer))
+                                     (ediff-show-meta-buffer
+                                      ,(current-buffer)
+                                      ,session-number)))
+                               nil 'local)
+                              (setq ediff-meta-buffer ,(current-buffer)
+                                    ediff-meta-session-number
+                                    ,session-number)
+                              (setq ediff-merge-store-file
+                                    ,(if (ediff-nonempty-string-p
+                                          merge-autostore-dir)
+                                         (concat

                                           merge-autostore-dir
                                           merge-autostore-dir

-                                          "mrg_"
-                                          (file-name-nondirectory file1))))
-                                ;; make ediff-startup pass
-                                ;; ediff-control-buffer back to the meta
-                                ;; level; see below
-                                (setcar
-                                 (quote (, info)) ediff-control-buffer))))))
+                                          ediff-merge-filename-prefix
+                                          (file-name-nondirectory file1))) )
+                              ;; make ediff-startup pass
+                              ;; ediff-control-buffer back to the meta
+                              ;; level; see below
+                              (setcar
+                               (quote ,info) ediff-control-buffer)))))

            ((ediff-metajob3)      ; need 3 file args
             (funcall ediff-session-action-function
                      file1 file2 file3
                      ;; arrange startup hooks 
            ((ediff-metajob3)      ; need 3 file args
             (funcall ediff-session-action-function
                      file1 file2 file3
                      ;; arrange startup hooks 

-                     (` (list (lambda () 
-                                (setq ediff-merge-store-file
-                                      (, (concat
+                     `(list (lambda () 
+                              (add-hook
+                               'ediff-after-quit-hook-internal
+                               (lambda ()
+                                 (if (ediff-buffer-live-p
+                                      ,(current-buffer))
+                                     (ediff-show-meta-buffer
+                                      ,(current-buffer)
+                                      ,session-number)))
+                               nil 'local)
+                              (setq ediff-merge-store-file
+                                    ,(if (ediff-nonempty-string-p
+                                          merge-autostore-dir)
+                                         (concat

                                           merge-autostore-dir
                                           merge-autostore-dir

-                                          "mrg_"
-                                          (file-name-nondirectory file1))))
-                                (setq ediff-meta-buffer (, (current-buffer)))
-                                ;; this arranges that ediff-startup will pass
-                                ;; the value of ediff-control-buffer back to
-                                ;; the meta level, to the record in the meta
-                                ;; list containing the information about the
-                                ;; session associated with that
-                                ;; ediff-control-buffer
-                                (setcar
-                                 (quote (, info)) ediff-control-buffer))))))
+                                          ediff-merge-filename-prefix
+                                          (file-name-nondirectory file1))) )
+                              (setq ediff-meta-buffer , (current-buffer)
+                                    ediff-meta-session-number
+                                    ,session-number)
+                              ;; this arranges that ediff-startup will pass
+                              ;; the value of ediff-control-buffer back to
+                              ;; the meta level, to the record in the meta
+                              ;; list containing the information about the
+                              ;; session associated with that
+                              ;; ediff-control-buffer
+                              (setcar
+                               (quote ,info) ediff-control-buffer)))))

            ) ; cond
       ) ; eval in meta-buf
     ))
            ) ; cond
       ) ; eval in meta-buf
     ))


@@ -1387,25 +1728,27 @@ all marked sessions must be active."
 
     (if (ediff-buffer-live-p ctl-buf)
        ;; check if this is ediff-control-buffer or ediff-meta-buffer
 
     (if (ediff-buffer-live-p ctl-buf)
        ;; check if this is ediff-control-buffer or ediff-meta-buffer

-       (if (ediff-eval-in-buffer ctl-buf
+       (if (ediff-with-current-buffer ctl-buf

              (eq (key-binding "q") 'ediff-quit-meta-buffer))
            ;; it's a meta-buffer -- last action should just display it
              (eq (key-binding "q") 'ediff-quit-meta-buffer))
            ;; it's a meta-buffer -- last action should just display it

-           (ediff-show-meta-buffer ctl-buf)
+           (ediff-show-meta-buffer ctl-buf t)

          ;; it's a session buffer -- invoke go back to session
          ;; it's a session buffer -- invoke go back to session

-         (ediff-eval-in-buffer ctl-buf
+         (ediff-with-current-buffer ctl-buf

            (setq ediff-mouse-pixel-position (mouse-pixel-position))
            (ediff-recenter 'no-rehighlight)))
       (beep)
       (message "You've selected a stale session --- try again")
       (ediff-update-registry))
            (setq ediff-mouse-pixel-position (mouse-pixel-position))
            (ediff-recenter 'no-rehighlight)))
       (beep)
       (message "You've selected a stale session --- try again")
       (ediff-update-registry))

-    (ediff-eval-in-buffer buf
+    (ediff-with-current-buffer buf

       (goto-char pos))
     ))
 
 
       (goto-char pos))
     ))
 
 

-(defun ediff-show-meta-buffer (&optional meta-buf)
+;; If session number is t, means don't update meta buffer
+(defun ediff-show-meta-buffer (&optional meta-buf session-number)

   "Show the session group buffer."
   (interactive)
   "Show the session group buffer."
   (interactive)

+  (run-hooks 'ediff-before-directory-setup-hooks)

   (let (wind frame silent)
     (if meta-buf (setq silent t))
 
   (let (wind frame silent)
     (if meta-buf (setq silent t))
 


@@ -1416,8 +1759,13 @@ all marked sessions must be active."
           (error
            "Can't find this session's group panel -- session itself is ok")))
 
           (error
            "Can't find this session's group panel -- session itself is ok")))
 

-    (ediff-cleanup-meta-buffer meta-buf)
-    (ediff-eval-in-buffer meta-buf
+    (cond ((numberp session-number)
+          (ediff-update-meta-buffer meta-buf nil session-number))
+         ;; if session-number is t, don't update
+         (session-number)
+         (t (ediff-cleanup-meta-buffer meta-buf)))
+
+    (ediff-with-current-buffer meta-buf

       (save-excursion
        (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
               (or silent
       (save-excursion
        (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
               (or silent


@@ -1451,9 +1799,15 @@ all marked sessions must be active."
          (setq frame (window-frame wind))
          (raise-frame frame)
          (ediff-reset-mouse frame)))
          (setq frame (window-frame wind))
          (raise-frame frame)
          (ediff-reset-mouse frame)))

+    (sit-for 0) ; sometimes needed to synch the display and ensure that the
+               ; point ends up after the just completed session

     (run-hooks 'ediff-show-session-group-hook)
     ))
 
     (run-hooks 'ediff-show-session-group-hook)
     ))
 

+(defun ediff-show-current-session-meta-buffer ()
+  (interactive)
+  (ediff-show-meta-buffer nil ediff-meta-session-number))
+

 (defun ediff-show-meta-buff-from-registry ()
   "Display the session group buffer for a selected session group."
   (interactive)
 (defun ediff-show-meta-buff-from-registry ()
   "Display the session group buffer for a selected session group."
   (interactive)


@@ -1461,8 +1815,8 @@ all marked sessions must be active."
         (meta-buf (ediff-event-buffer last-command-event))
         (info (ediff-get-meta-info meta-buf pos))
         (meta-or-session-buf info))
         (meta-buf (ediff-event-buffer last-command-event))
         (info (ediff-get-meta-info meta-buf pos))
         (meta-or-session-buf info))

-    (ediff-eval-in-buffer meta-or-session-buf
-      (ediff-show-meta-buffer))))
+    (ediff-with-current-buffer meta-or-session-buf
+      (ediff-show-meta-buffer nil t))))

 
 ;;;###autoload
 (defun ediff-show-registry ()
 
 ;;;###autoload
 (defun ediff-show-registry ()


@@ -1474,7 +1828,7 @@ all marked sessions must be active."
   (let (wind frame)
     ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
     ;; explicitly
   (let (wind frame)
     ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
     ;; explicitly

-    (ediff-eval-in-buffer ediff-registry-buffer
+    (ediff-with-current-buffer ediff-registry-buffer

       (save-excursion
        (cond  ((setq wind
                      (ediff-get-visible-buffer-window ediff-registry-buffer))
       (save-excursion
        (cond  ((setq wind
                      (ediff-get-visible-buffer-window ediff-registry-buffer))


@@ -1512,18 +1866,33 @@ all marked sessions must be active."
 ;;;###autoload
 (defalias 'eregistry 'ediff-show-registry)
 
 ;;;###autoload
 (defalias 'eregistry 'ediff-show-registry)
 

-;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
+;; 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
 ;; parent meta-buf
 ;; Check if META-BUF exists before calling this function

-(defun ediff-update-meta-buffer (meta-buf)
-  (ediff-eval-in-buffer (current-buffer)
-    (if (ediff-buffer-live-p meta-buf)
-       (ediff-eval-in-buffer meta-buf
-         (funcall ediff-meta-redraw-function ediff-meta-list))
-      )))
+;; Optional MUST-REDRAW, if non-nil, would force redrawal 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.
+(defun ediff-update-meta-buffer (meta-buf &optional must-redraw session-number)
+  (if (ediff-buffer-live-p meta-buf)
+      (ediff-with-current-buffer meta-buf
+       (let (overl)
+         (cond (must-redraw ; completely redraw the meta buffer
+                (funcall ediff-meta-redraw-function ediff-meta-list))
+               ((numberp session-number) ; redraw only for the given session
+                (ediff-update-session-marker-in-dir-meta-buffer
+                 session-number))
+               (t ; update what changed only, but scan the entire meta buffer
+                (ediff-update-markers-in-dir-meta-buffer ediff-meta-list)))
+         (setq overl (ediff-get-meta-overlay-at-pos (point)))
+         ;; skip the invisible sessions
+         (while (and overl (ediff-overlay-get overl 'invisible))
+           (ediff-next-meta-item1)
+           (setq overl (ediff-get-meta-overlay-at-pos (point))))
+         ))))

 
 (defun ediff-update-registry ()
 
 (defun ediff-update-registry ()

-  (ediff-eval-in-buffer (current-buffer)
+  (ediff-with-current-buffer (current-buffer)

     (if (ediff-buffer-live-p ediff-registry-buffer)
        (ediff-redraw-registry-buffer)
       (ediff-prepare-meta-buffer 
     (if (ediff-buffer-live-p ediff-registry-buffer)
        (ediff-redraw-registry-buffer)
       (ediff-prepare-meta-buffer 


@@ -1538,19 +1907,20 @@ all marked sessions must be active."
 ;; Otherwise, nothing happens.
 (defun ediff-cleanup-meta-buffer (meta-buffer)
   (if (ediff-buffer-live-p meta-buffer)
 ;; Otherwise, nothing happens.
 (defun ediff-cleanup-meta-buffer (meta-buffer)
   (if (ediff-buffer-live-p meta-buffer)

-      (ediff-eval-in-buffer meta-buffer
+      (ediff-with-current-buffer meta-buffer

        (ediff-update-meta-buffer meta-buffer)
        (if (ediff-buffer-live-p ediff-parent-meta-buffer)
        (ediff-update-meta-buffer meta-buffer)
        (if (ediff-buffer-live-p ediff-parent-meta-buffer)

-           (ediff-update-meta-buffer ediff-parent-meta-buffer)))))
+           (ediff-update-meta-buffer
+            ediff-parent-meta-buffer nil ediff-meta-session-number)))))

 
 

-;; t if no session in progress
+;; t if no session is in progress

 (defun ediff-safe-to-quit (meta-buffer)
   (if (ediff-buffer-live-p meta-buffer)
       (let ((lis ediff-meta-list)
            (cont t)
            buffer-read-only)
 (defun ediff-safe-to-quit (meta-buffer)
   (if (ediff-buffer-live-p meta-buffer)
       (let ((lis ediff-meta-list)
            (cont t)
            buffer-read-only)

-       (ediff-update-meta-buffer meta-buffer)
-       (ediff-eval-in-buffer meta-buffer
+       ;;(ediff-update-meta-buffer meta-buffer)
+       (ediff-with-current-buffer meta-buffer

          (setq lis (cdr lis)) ; discard the description part of meta-list
          (while (and cont lis)
            (if (ediff-buffer-live-p
          (setq lis (cdr lis)) ; discard the description part of meta-list
          (while (and cont lis)
            (if (ediff-buffer-live-p


@@ -1568,11 +1938,12 @@ If this is a session registry buffer then just bury it."
   (let* ((buf (current-buffer))
         (dir-diffs-buffer ediff-dir-diffs-buffer)
         (meta-diff-buffer ediff-meta-diff-buffer)
   (let* ((buf (current-buffer))
         (dir-diffs-buffer ediff-dir-diffs-buffer)
         (meta-diff-buffer ediff-meta-diff-buffer)

+        (session-number ediff-meta-session-number)

         (parent-buf ediff-parent-meta-buffer)
         (dont-show-registry (eq buf ediff-registry-buffer)))
     (if dont-show-registry
        (bury-buffer)
         (parent-buf ediff-parent-meta-buffer)
         (dont-show-registry (eq buf ediff-registry-buffer)))
     (if dont-show-registry
        (bury-buffer)

-      (ediff-cleanup-meta-buffer buf)
+      ;;(ediff-cleanup-meta-buffer buf)

       (cond ((and (ediff-safe-to-quit buf)
                  (y-or-n-p "Quit this session group? "))
             (run-hooks 'ediff-quit-session-group-hook)
       (cond ((and (ediff-safe-to-quit buf)
                  (y-or-n-p "Quit this session group? "))
             (run-hooks 'ediff-quit-session-group-hook)


@@ -1583,20 +1954,20 @@ If this is a session registry buffer then just bury it."
            (t
             (error
              "This session group has active sessions---cannot exit")))
            (t
             (error
              "This session group has active sessions---cannot exit")))

-      (ediff-cleanup-meta-buffer parent-buf)
+      (ediff-update-meta-buffer parent-buf nil session-number)

       (ediff-kill-buffer-carefully dir-diffs-buffer)
       (ediff-kill-buffer-carefully meta-diff-buffer)
       (if (ediff-buffer-live-p parent-buf)
          (progn
            (setq dont-show-registry t)
       (ediff-kill-buffer-carefully dir-diffs-buffer)
       (ediff-kill-buffer-carefully meta-diff-buffer)
       (if (ediff-buffer-live-p parent-buf)
          (progn
            (setq dont-show-registry t)

-           (ediff-show-meta-buffer parent-buf)))
+           (ediff-show-meta-buffer parent-buf session-number)))

       )
     (or dont-show-registry
        (ediff-show-registry))))
 
 (defun ediff-dispose-of-meta-buffer (buf)
   (setq ediff-session-registry (delq buf ediff-session-registry))
       )
     (or dont-show-registry
        (ediff-show-registry))))
 
 (defun ediff-dispose-of-meta-buffer (buf)
   (setq ediff-session-registry (delq buf ediff-session-registry))

-  (ediff-eval-in-buffer buf
+  (ediff-with-current-buffer buf

     (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
        (kill-buffer ediff-dir-diffs-buffer)))
   (kill-buffer buf))
     (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
        (kill-buffer ediff-dir-diffs-buffer)))
   (kill-buffer buf))


@@ -1609,20 +1980,23 @@ If this is a session registry buffer then just bury it."
 (defun ediff-get-meta-info (buf point &optional noerror)
   (let (result olist tmp)
     (if (and point (ediff-buffer-live-p buf))
 (defun ediff-get-meta-info (buf point &optional noerror)
   (let (result olist tmp)
     (if (and point (ediff-buffer-live-p buf))

-       (ediff-eval-in-buffer buf
-         (if ediff-xemacs-p
-             (setq result
-                   (if (setq tmp (extent-at point buf 'ediff-meta-info))
-                       (ediff-overlay-get tmp 'ediff-meta-info)))
-           (setq olist (overlays-at point))
-           (setq olist
-                 (mapcar (function (lambda (elt)
-                                     (overlay-get elt 'ediff-meta-info)))
-                         olist))
-           (while (and olist (null (car olist))
-                       (overlay-get (car olist) 'invisible))
-             (setq olist (cdr olist)))
-           (setq result (car olist)))))
+       (ediff-with-current-buffer buf
+         (ediff-cond-compile-for-xemacs-or-emacs
+          (setq result  ; xemacs
+                (if (setq tmp (extent-at point buf 'ediff-meta-info))
+                    (ediff-overlay-get tmp 'ediff-meta-info)))
+          (progn ; emacs
+            (setq olist (overlays-at point))
+            (setq olist
+                  (mapcar (lambda (elt)
+                            (unless (overlay-get elt 'invisible)
+                              (overlay-get elt 'ediff-meta-info)))
+                          olist))
+            (while (and olist (null (car olist)))
+              (setq olist (cdr olist)))
+            (setq result (car olist)))
+          )
+         ))

     (if result
        result
       (if noerror
     (if result
        result
       (if noerror


@@ -1630,56 +2004,80 @@ If this is a session registry buffer then just bury it."
        (ediff-update-registry)
        (error "No session info in this line")))))
 
        (ediff-update-registry)
        (error "No session info in this line")))))
 

-;; return location of the next meta overlay after point
+
+(defun ediff-get-meta-overlay-at-pos (point)
+  (ediff-cond-compile-for-xemacs-or-emacs
+   (extent-at point (current-buffer) 'ediff-meta-info) ; xemacs
+   ;; emacs
+   (let* ((overl-list (overlays-at point))
+         (overl (car overl-list)))
+     (while (and overl (null (overlay-get overl 'ediff-meta-info)))
+       (setq overl-list (cdr overl-list)
+            overl (car overl-list)))
+     overl)
+   )
+  )
+
+(defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
+  (setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
+                       meta-buffer
+                     (current-buffer)))
+  (ediff-with-current-buffer meta-buffer
+    (ediff-overlay-get
+     (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number)))
+
+
+;; Return location of the next meta overlay after point

 (defun ediff-next-meta-overlay-start (point)
   (if (eobp)
       (goto-char (point-min))
 (defun ediff-next-meta-overlay-start (point)
   (if (eobp)
       (goto-char (point-min))

-    (let (overl)
-      (if ediff-xemacs-p
-         (progn
-           (setq overl (extent-at point (current-buffer) 'ediff-meta-info))
-           (if overl
-               (setq overl (next-extent overl))
-             (setq overl (next-extent (current-buffer))))
-           (if overl
-               (extent-start-position overl)
-             (point-max)))
-       (setq overl (car (overlays-at point)))
-       (if (and overl (overlay-get overl 'ediff-meta-info))
-           ;; note: end of current overlay is the beginning of the next one
-           (overlay-end overl)
-         (next-overlay-change point))))
+    (let ((overl (ediff-get-meta-overlay-at-pos point)))
+      (ediff-cond-compile-for-xemacs-or-emacs
+       (progn ; xemacs
+        (if overl
+            (setq overl (next-extent overl))
+          (setq overl (next-extent (current-buffer))))
+        (if overl
+            (extent-start-position overl)
+          (point-max)))
+       ;; emacs
+       (if overl
+          ;; note: end of current overlay is the beginning of the next one
+          (overlay-end overl)
+        (next-overlay-change point))
+       )
+      )

     ))
 
     ))
 

+

 (defun ediff-previous-meta-overlay-start (point)
   (if (bobp)
       (goto-char (point-max))
 (defun ediff-previous-meta-overlay-start (point)
   (if (bobp)
       (goto-char (point-max))

-    (let (overl)
-      (if ediff-xemacs-p
-         (progn
-           (setq overl (extent-at point (current-buffer) 'ediff-meta-info))
-           (if overl
-               (setq overl (previous-extent overl))
-             (setq overl (previous-extent (current-buffer))))
-           (if overl
-               (extent-start-position overl)
-             (point-min)))
-       (setq overl (car (overlays-at point)))
-       (if (and overl (overlay-get overl 'ediff-meta-info))
-           (setq point (overlay-start overl)))
-       ;; to get to the beginning of prev overlay
-       (if (not (bobp))
-           ;; trickery to overcome an emacs bug--doesn't always find previous
-           ;; overlay change correctly
-           (setq point (1- point)))
-       (setq point (previous-overlay-change point))
-       ;; If we are not over an overlay after subtracting 1, it means we are
-       ;; in the description area preceding session records. In this case,
-       ;; goto the top of the registry buffer.
-       (or (car (overlays-at point))
-           (setq point (point-min)))
-       point
-       ))))
+    (let ((overl (ediff-get-meta-overlay-at-pos point)))
+      (ediff-cond-compile-for-xemacs-or-emacs
+       (progn
+        (if overl
+            (setq overl (previous-extent overl))
+          (setq overl (previous-extent (current-buffer))))
+        (if overl
+            (extent-start-position overl)
+          (point-min)))
+       (progn
+        (if overl (setq point (overlay-start overl)))
+        ;; to get to the beginning of prev overlay
+        (if (not (bobp))
+            ;; trick to overcome an emacs bug--doesn't always find previous
+            ;; overlay change correctly
+            (setq point (1- point)))
+        (setq point (previous-overlay-change point))
+        ;; If we are not over an overlay after subtracting 1, it means we are
+        ;; in the description area preceding session records.  In this case,
+        ;; goto the top of the registry buffer.
+        (or (car (overlays-at point))
+            (setq point (point-min)))
+        point)
+       )
+      )))

 
 ;; this is the action invoked when the user selects a patch from the meta
 ;; buffer.
 
 ;; this is the action invoked when the user selects a patch from the meta
 ;; buffer.


@@ -1702,19 +2100,49 @@ If this is a session registry buffer then just bury it."
        (error
         "Patch has been already applied to this file--cannot be repeated!"))
 
        (error
         "Patch has been already applied to this file--cannot be repeated!"))
 

-    (ediff-eval-in-buffer meta-patchbuf
+    (ediff-with-current-buffer meta-patchbuf

       (save-restriction
        (widen)
        (narrow-to-region beg-marker end-marker)
        (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
 
 
       (save-restriction
        (widen)
        (narrow-to-region beg-marker end-marker)
        (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
 
 

-(defun ediff-meta-mark-equal-files ()
-  "Run though the session list and mark identical files.
-This is used only for sessions that involve 2 or 3 files at the same time."
+(defun ediff-unmark-all-for-operation ()
+  "Unmark all sessions marked for operation."

   (interactive)
   (let ((list (cdr ediff-meta-list))
   (interactive)
   (let ((list (cdr ediff-meta-list))

+       elt)
+    (while (setq elt (car list))
+      (ediff-mark-session-for-operation elt 'unmark)
+      (setq list (cdr list))))
+  (ediff-update-meta-buffer (current-buffer) 'must-redraw))
+
+(defun ediff-unmark-all-for-hiding ()
+  "Unmark all sessions marked for hiding."
+  (interactive)
+  (let ((list (cdr ediff-meta-list))
+       elt)
+    (while (setq elt (car list))
+      (ediff-mark-session-for-hiding elt 'unmark)
+      (setq list (cdr list))))
+  (ediff-update-meta-buffer (current-buffer) 'must-redraw))
+
+
+;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply
+;; indicate which are equal files
+(defun ediff-meta-mark-equal-files (&optional action)
+  "Run through the session list and mark identical files.
+This is used only for sessions that involve 2 or 3 files at the same time.
+ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
+for operation, or simply indicate which are equal files. If it is nil, then
+last-command-char is used to decide which action to take."
+  (interactive)
+  (if (null action)
+      (setq action last-command-char))
+  (let ((list (cdr ediff-meta-list))
+       marked1 marked2 marked3

        fileinfo1 fileinfo2 fileinfo3 elt)
        fileinfo1 fileinfo2 fileinfo3 elt)

+    (message "Comparing files ...")

     (while (setq elt (car list))
       (setq fileinfo1 (ediff-get-session-objA elt)
            fileinfo2 (ediff-get-session-objB elt)
     (while (setq elt (car list))
       (setq fileinfo1 (ediff-get-session-objA elt)
            fileinfo2 (ediff-get-session-objB elt)


@@ -1723,32 +2151,46 @@ This is used only for sessions that involve 2 or 3 files at the same time."
       (ediff-set-file-eqstatus fileinfo2 nil)
       (ediff-set-file-eqstatus fileinfo3 nil)
 
       (ediff-set-file-eqstatus fileinfo2 nil)
       (ediff-set-file-eqstatus fileinfo3 nil)
 

-      (ediff-mark-if-equal fileinfo1 fileinfo2)
+      (setq marked1 t
+           marked2 t
+           marked3 t)
+      (or (ediff-mark-if-equal fileinfo1 fileinfo2)
+         (setq marked1 nil))

       (if (ediff-metajob3)
          (progn
       (if (ediff-metajob3)
          (progn

-           (ediff-mark-if-equal fileinfo1 fileinfo3)
-           (ediff-mark-if-equal fileinfo2 fileinfo3)))
-      (setq list (cdr list))))
-  (ediff-update-meta-buffer (current-buffer)))
+           (or (ediff-mark-if-equal fileinfo1 fileinfo3)
+               (setq marked2 nil))
+           (or (ediff-mark-if-equal fileinfo2 fileinfo3)
+               (setq marked3 nil))))
+      (if (and marked1 marked2 marked3)
+         (cond ((eq action ?h)
+                (ediff-mark-session-for-hiding elt 'mark))
+               ((eq action ?m)
+                (ediff-mark-session-for-operation elt 'mark))
+               ))
+      (setq list (cdr list)))
+    (message "Comparing files ... Done"))
+  (ediff-update-meta-buffer (current-buffer) 'must-redraw))

 
 ;; mark files 1 and 2 as equal, if they are.
 
 ;; mark files 1 and 2 as equal, if they are.

+;; returns t, if something was marked

 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)

-  (get-buffer-create ediff-tmp-buffer)
-  (or (file-directory-p (car fileinfo1))
-      (file-directory-p (car fileinfo2))
-      (if (= (ediff-make-diff2-buffer
-             ediff-tmp-buffer (car fileinfo1) (car fileinfo2))
-            0)
-         (progn
-           (ediff-set-file-eqstatus fileinfo1 t)
-           (ediff-set-file-eqstatus fileinfo2 t)))))
+  (let ((f1 (car fileinfo1))
+       (f2 (car fileinfo2)))
+    (cond ((file-directory-p f1) nil)
+         ((file-directory-p f2) nil)
+         ((ediff-same-file-contents f1 f2)
+          (ediff-set-file-eqstatus fileinfo1 t)
+          (ediff-set-file-eqstatus fileinfo2 t)
+          t))
+    ))

 
 
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 
 
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)

-;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
+;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))

 ;;; End:
 
 ;;; ediff-mult.el ends here
 ;;; End:
 
 ;;; ediff-mult.el ends here