(define-obsolete-function-alias): New macro.

[bpt/emacs.git] / lisp / ediff-util.el
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el

index 64d19c5..79f85cc 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1,6 +1,6 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc.
  
  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
  
  
  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
  
@@ -24,7 +24,7 @@
  ;;; Commentary:
  
  ;;; Code:
  ;;; Commentary:
  
  ;;; Code:
-        
+
  (provide 'ediff-util)
  
  ;; Compiler pacifier
  (provide 'ediff-util)
  
  ;; Compiler pacifier
@@ -118,7 +118,7 @@ Commands:
    (setq mode-name "Ediff")
    (run-hooks 'ediff-mode-hook))
  
    (setq mode-name "Ediff")
    (run-hooks 'ediff-mode-hook))
  
-    
+
  \f
  ;;; Build keymaps
  
  \f
  ;;; Build keymaps
  
@@ -133,19 +133,19 @@ to invocation.")
    (if (null ediff-mode-map)
        (ediff-setup-keymap))
    (use-local-map ediff-mode-map))
    (if (null ediff-mode-map)
        (ediff-setup-keymap))
    (use-local-map ediff-mode-map))
-  
+
  ;; Reload Ediff keymap.  For debugging only.
  (defun ediff-reload-keymap ()
    (interactive)
    (setq ediff-mode-map nil)
    (ediff-set-keys))
  ;; Reload Ediff keymap.  For debugging only.
  (defun ediff-reload-keymap ()
    (interactive)
    (setq ediff-mode-map nil)
    (ediff-set-keys))
-  
+
  
  (defun ediff-setup-keymap ()
    "Set up the keymap used in the control buffer of Ediff."
    (setq ediff-mode-map (make-sparse-keymap))
    (suppress-keymap ediff-mode-map)
  
  (defun ediff-setup-keymap ()
    "Set up the keymap used in the control buffer of Ediff."
    (setq ediff-mode-map (make-sparse-keymap))
    (suppress-keymap ediff-mode-map)
-  
+
    (define-key ediff-mode-map
      (if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
    (define-key ediff-mode-map "\C-m"  'ediff-help-for-quick-help)
    (define-key ediff-mode-map
      (if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
    (define-key ediff-mode-map "\C-m"  'ediff-help-for-quick-help)
@@ -246,7 +246,7 @@ to invocation.")
         ))
  
    (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
         ))
  
    (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
-       
+
    ;; Allow ediff-mode-map to be referenced indirectly
    (fset 'ediff-mode-map ediff-mode-map)
    (run-hooks 'ediff-keymap-setup-hook))
    ;; Allow ediff-mode-map to be referenced indirectly
    (fset 'ediff-mode-map ediff-mode-map)
    (run-hooks 'ediff-keymap-setup-hook))
@@ -272,26 +272,26 @@ to invocation.")
             (ediff-convert-standard-filename (expand-file-name file-C))))
    (if (stringp merge-buffer-file)
        (progn
             (ediff-convert-standard-filename (expand-file-name file-C))))
    (if (stringp merge-buffer-file)
        (progn
-       (setq merge-buffer-file 
+       (setq merge-buffer-file
               (ediff-convert-standard-filename
                (expand-file-name merge-buffer-file)))
         ;; check the directory exists
         (or (file-exists-p (file-name-directory merge-buffer-file))
             (error "Directory %s given as place to save the merge doesn't exist"
               (ediff-convert-standard-filename
                (expand-file-name merge-buffer-file)))
         ;; check the directory exists
         (or (file-exists-p (file-name-directory merge-buffer-file))
             (error "Directory %s given as place to save the merge doesn't exist"
-                  (abbreviate-file-name 
+                  (abbreviate-file-name
                     (file-name-directory merge-buffer-file))))
         (if (and (file-exists-p merge-buffer-file)
                  (file-directory-p merge-buffer-file))
             (error "The merge buffer file %s must not be a directory"
                    (abbreviate-file-name merge-buffer-file)))
         ))
                     (file-name-directory merge-buffer-file))))
         (if (and (file-exists-p merge-buffer-file)
                  (file-directory-p merge-buffer-file))
             (error "The merge buffer file %s must not be a directory"
                    (abbreviate-file-name merge-buffer-file)))
         ))
-  (let* ((control-buffer-name 
+  (let* ((control-buffer-name
           (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
          (control-buffer (ediff-with-current-buffer buffer-A
                            (get-buffer-create control-buffer-name))))
      (ediff-with-current-buffer control-buffer
           (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
          (control-buffer (ediff-with-current-buffer buffer-A
                            (get-buffer-create control-buffer-name))))
      (ediff-with-current-buffer control-buffer
-      (ediff-mode)                 
-       
+      (ediff-mode)
+
        (make-local-variable 'ediff-use-long-help-message)
        (make-local-variable 'ediff-prefer-iconified-control-frame)
        (make-local-variable 'ediff-split-window-function)
        (make-local-variable 'ediff-use-long-help-message)
        (make-local-variable 'ediff-prefer-iconified-control-frame)
        (make-local-variable 'ediff-split-window-function)
@@ -309,7 +309,7 @@ to invocation.")
        (while setup-parameters
         (set (car (car setup-parameters)) (cdr (car setup-parameters)))
         (setq setup-parameters (cdr setup-parameters)))
        (while setup-parameters
         (set (car (car setup-parameters)) (cdr (car setup-parameters)))
         (setq setup-parameters (cdr setup-parameters)))
-       
+
        ;; set variables classifying the current ediff job
        ;; must come AFTER setup-parameters
        (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
        ;; set variables classifying the current ediff job
        ;; must come AFTER setup-parameters
        (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
@@ -334,7 +334,7 @@ to invocation.")
        (if (ediff-window-display-p)
           (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
        (setq ediff-mouse-pixel-position (mouse-pixel-position))
        (if (ediff-window-display-p)
           (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
        (setq ediff-mouse-pixel-position (mouse-pixel-position))
-      
+
        ;; adjust for merge jobs
        (if ediff-merge-job
           (let ((buf
        ;; adjust for merge jobs
        (if ediff-merge-job
           (let ((buf
@@ -348,13 +348,13 @@ to invocation.")
                  (cond ((eq ediff-default-variant 'default-B)
                         buffer-B)
                        (t buffer-A))))
                  (cond ((eq ediff-default-variant 'default-B)
                         buffer-B)
                        (t buffer-A))))
-                
+
             (setq ediff-split-window-function
             (setq ediff-split-window-function
-                 ediff-merge-split-window-function) 
-           
+                 ediff-merge-split-window-function)
+
             ;; remember the ancestor buffer, if any
             (setq ediff-ancestor-buffer buffer-C)
             ;; remember the ancestor buffer, if any
             (setq ediff-ancestor-buffer buffer-C)
-           
+
             (setq buffer-C
                   (get-buffer-create
                    (ediff-unique-buffer-name "*ediff-merge" "*")))
             (setq buffer-C
                   (get-buffer-create
                    (ediff-unique-buffer-name "*ediff-merge" "*")))
@@ -365,14 +365,14 @@ to invocation.")
               (widen) ; merge buffer is always widened
               (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
               )))
               (widen) ; merge buffer is always widened
               (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
               )))
-      (setq buffer-read-only nil    
+      (setq buffer-read-only nil
             ediff-buffer-A buffer-A
             ediff-buffer-B buffer-B
             ediff-buffer-C buffer-C
             ediff-control-buffer control-buffer)
  
        (ediff-choose-syntax-table)
             ediff-buffer-A buffer-A
             ediff-buffer-B buffer-B
             ediff-buffer-C buffer-C
             ediff-control-buffer control-buffer)
  
        (ediff-choose-syntax-table)
-          
+
        (setq ediff-control-buffer-suffix
             (if (string-match "<[0-9]*>" control-buffer-name)
                 (substring control-buffer-name
        (setq ediff-control-buffer-suffix
             (if (string-match "<[0-9]*>" control-buffer-name)
                 (substring control-buffer-name
@@ -388,10 +388,10 @@ to invocation.")
                 (or
                  (string-match "[0-9]+" ediff-control-buffer-suffix)
                  0))))))
                 (or
                  (string-match "[0-9]+" ediff-control-buffer-suffix)
                  0))))))
-          
+
        (setq ediff-error-buffer
             (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
        (setq ediff-error-buffer
             (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
-      
+
        (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
        (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
        (if ediff-3way-job
        (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
        (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
        (if ediff-3way-job
@@ -399,16 +399,16 @@ to invocation.")
        (if (ediff-buffer-live-p ediff-ancestor-buffer)
           (ediff-with-current-buffer ediff-ancestor-buffer
             (ediff-strip-mode-line-format)))
        (if (ediff-buffer-live-p ediff-ancestor-buffer)
           (ediff-with-current-buffer ediff-ancestor-buffer
             (ediff-strip-mode-line-format)))
-      
+
        (ediff-save-protected-variables) ; save variables to be restored on exit
        (ediff-save-protected-variables) ; save variables to be restored on exit
-      
+
        ;; ediff-setup-diff-regions-function must be set after setup
        ;; parameters are processed.
        (setq ediff-setup-diff-regions-function
             (if ediff-diff3-job
                 'ediff-setup-diff-regions3
               'ediff-setup-diff-regions))
        ;; ediff-setup-diff-regions-function must be set after setup
        ;; parameters are processed.
        (setq ediff-setup-diff-regions-function
             (if ediff-diff3-job
                 'ediff-setup-diff-regions3
               'ediff-setup-diff-regions))
-       
+
        (setq ediff-wide-bounds
             (list (ediff-make-bullet-proof-overlay
                    '(point-min) '(point-max) ediff-buffer-A)
        (setq ediff-wide-bounds
             (list (ediff-make-bullet-proof-overlay
                    '(point-min) '(point-max) ediff-buffer-A)
@@ -416,20 +416,20 @@ to invocation.")
                    '(point-min) '(point-max) ediff-buffer-B)
                   (ediff-make-bullet-proof-overlay
                    '(point-min) '(point-max) ediff-buffer-C)))
                    '(point-min) '(point-max) ediff-buffer-B)
                   (ediff-make-bullet-proof-overlay
                    '(point-min) '(point-max) ediff-buffer-C)))
-      
+
        ;; This has effect only on ediff-windows/regions
        ;; In all other cases, ediff-visible-region sets visibility bounds to
        ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
        (if ediff-start-narrowed
           (setq ediff-visible-bounds ediff-narrow-bounds)
         (setq ediff-visible-bounds ediff-wide-bounds))
        ;; This has effect only on ediff-windows/regions
        ;; In all other cases, ediff-visible-region sets visibility bounds to
        ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
        (if ediff-start-narrowed
           (setq ediff-visible-bounds ediff-narrow-bounds)
         (setq ediff-visible-bounds ediff-wide-bounds))
-      
+
        (ediff-set-keys) ; comes after parameter setup
        (ediff-set-keys) ; comes after parameter setup
-      
+
        ;; set up ediff-narrow-bounds, if not set
        (or ediff-narrow-bounds
           (setq ediff-narrow-bounds ediff-wide-bounds))
        ;; set up ediff-narrow-bounds, if not set
        (or ediff-narrow-bounds
           (setq ediff-narrow-bounds ediff-wide-bounds))
-      
+
        ;; All these must be inside ediff-with-current-buffer control-buffer,
        ;; since these vars are local to control-buffer
        ;; These won't run if there are errors in diff
        ;; All these must be inside ediff-with-current-buffer control-buffer,
        ;; since these vars are local to control-buffer
        ;; These won't run if there are errors in diff
@@ -472,7 +472,7 @@ to invocation.")
             (or (memq control-buffer ediff-this-buffer-ediff-sessions)
                 (setq ediff-this-buffer-ediff-sessions
                       (cons control-buffer
             (or (memq control-buffer ediff-this-buffer-ediff-sessions)
                 (setq ediff-this-buffer-ediff-sessions
                       (cons control-buffer
-                           ediff-this-buffer-ediff-sessions))) 
+                           ediff-this-buffer-ediff-sessions)))
             (if ediff-make-buffers-readonly-at-startup
                 (setq buffer-read-only t)
               (setq buffer-read-only nil))
             (if ediff-make-buffers-readonly-at-startup
                 (setq buffer-read-only t)
               (setq buffer-read-only nil))
@@ -488,22 +488,22 @@ to invocation.")
                       (cons control-buffer
                             ediff-this-buffer-ediff-sessions)))
             ))
                       (cons control-buffer
                             ediff-this-buffer-ediff-sessions)))
             ))
-      
+
        ;; the following must be after setting up  ediff-narrow-bounds AND after
        ;; nuking selective display
        (funcall ediff-setup-diff-regions-function file-A file-B file-C)
        (setq ediff-number-of-differences (length ediff-difference-vector-A))
        (setq ediff-current-difference -1)
        ;; the following must be after setting up  ediff-narrow-bounds AND after
        ;; nuking selective display
        (funcall ediff-setup-diff-regions-function file-A file-B file-C)
        (setq ediff-number-of-differences (length ediff-difference-vector-A))
        (setq ediff-current-difference -1)
-      
+
        (ediff-make-current-diff-overlay 'A)
        (ediff-make-current-diff-overlay 'B)
        (if ediff-3way-job
           (ediff-make-current-diff-overlay 'C))
        (if ediff-merge-with-ancestor-job
           (ediff-make-current-diff-overlay 'Ancestor))
        (ediff-make-current-diff-overlay 'A)
        (ediff-make-current-diff-overlay 'B)
        (if ediff-3way-job
           (ediff-make-current-diff-overlay 'C))
        (if ediff-merge-with-ancestor-job
           (ediff-make-current-diff-overlay 'Ancestor))
-         
+
        (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
        (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
-      
+
        (let ((shift-A (ediff-overlay-start
                       (ediff-get-value-according-to-buffer-type
                        'A ediff-narrow-bounds)))
        (let ((shift-A (ediff-overlay-start
                       (ediff-get-value-according-to-buffer-type
                        'A ediff-narrow-bounds)))
@@ -526,10 +526,10 @@ to invocation.")
               (select-window ediff-window-C)
               (goto-char shift-C)))
         )
               (select-window ediff-window-C)
               (goto-char shift-C)))
         )
-      
+
        (select-window ediff-control-window)
        (ediff-visible-region)
        (select-window ediff-control-window)
        (ediff-visible-region)
-      
+
        (run-hooks 'startup-hooks)
        (ediff-arrange-autosave-in-merge-jobs merge-buffer-file)
  
        (run-hooks 'startup-hooks)
        (ediff-arrange-autosave-in-merge-jobs merge-buffer-file)
  
@@ -544,10 +544,10 @@ to invocation.")
        (run-hooks 'ediff-startup-hook)
        ) ; eval in control-buffer
      control-buffer))
        (run-hooks 'ediff-startup-hook)
        ) ; eval in control-buffer
      control-buffer))
-      
-      
+
+
  ;; This function assumes that we are in the window where control buffer is
  ;; This function assumes that we are in the window where control buffer is
-;; to reside. 
+;; to reside.
  (defun ediff-setup-control-buffer (ctl-buf)
    "Set up window for control buffer."
    (if (window-dedicated-p (selected-window))
  (defun ediff-setup-control-buffer (ctl-buf)
    "Set up window for control buffer."
    (if (window-dedicated-p (selected-window))
@@ -580,7 +580,7 @@ to invocation.")
         (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
      (goto-char (point-min))
      (skip-chars-forward ediff-whitespace)))
         (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
      (goto-char (point-min))
      (skip-chars-forward ediff-whitespace)))
-    
+
  ;; This executes in control buffer and sets auto-save, visited file name, etc,
  ;; in the merge buffer
  (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
  ;; This executes in control buffer and sets auto-save, visited file name, etc,
  ;; in the merge buffer
  (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
@@ -593,7 +593,7 @@ to invocation.")
         (progn
           ;; save before leaving ctl buffer
           (ediff-verify-file-merge-buffer ediff-merge-store-file)
         (progn
           ;; save before leaving ctl buffer
           (ediff-verify-file-merge-buffer ediff-merge-store-file)
-         (setq merge-buffer-file ediff-merge-store-file) 
+         (setq merge-buffer-file ediff-merge-store-file)
           (ediff-with-current-buffer ediff-buffer-C
             (set-visited-file-name merge-buffer-file))))
      (ediff-with-current-buffer ediff-buffer-C
           (ediff-with-current-buffer ediff-buffer-C
             (set-visited-file-name merge-buffer-file))))
      (ediff-with-current-buffer ediff-buffer-C
@@ -604,7 +604,7 @@ to invocation.")
  
  \f
  ;;; Commands for working with Ediff
  
  \f
  ;;; Commands for working with Ediff
-     
+
  (defun ediff-update-diffs ()
    "Recompute difference regions in buffers A, B, and C.
  Buffers are not synchronized with their respective files, so changes done
  (defun ediff-update-diffs ()
    "Recompute difference regions in buffers A, B, and C.
  Buffers are not synchronized with their respective files, so changes done
@@ -617,7 +617,7 @@ if necessary."
             (y-or-n-p
              "Ancestor buffer will not be used.  Recompute diffs anyway? ")))
        (error "Recomputation of differences canceled"))
             (y-or-n-p
              "Ancestor buffer will not be used.  Recompute diffs anyway? ")))
        (error "Recomputation of differences canceled"))
-      
+
    (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
         ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
         (tmp-buffer (get-buffer-create ediff-tmp-buffer))
    (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
         ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
         (tmp-buffer (get-buffer-create ediff-tmp-buffer))
@@ -643,14 +643,14 @@ if necessary."
         (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
  
      (ediff-unselect-and-select-difference -1)
         (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
  
      (ediff-unselect-and-select-difference -1)
-    
+
      (setq beg-A (ediff-overlay-start overl-A)
           beg-B (ediff-overlay-start overl-B)
           beg-C (ediff-overlay-start overl-C)
           end-A (ediff-overlay-end overl-A)
           end-B (ediff-overlay-end overl-B)
           end-C (ediff-overlay-end overl-C))
      (setq beg-A (ediff-overlay-start overl-A)
           beg-B (ediff-overlay-start overl-B)
           beg-C (ediff-overlay-start overl-C)
           end-A (ediff-overlay-end overl-A)
           end-B (ediff-overlay-end overl-B)
           end-C (ediff-overlay-end overl-C))
-         
+
      (if ediff-word-mode
         (progn
           (ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
      (if ediff-word-mode
         (progn
           (ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
@@ -668,7 +668,7 @@ if necessary."
        (if ediff-3way-job
           (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name)))
        )
        (if ediff-3way-job
           (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name)))
        )
-       
+
      (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
      (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
      (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
      (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
      (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
      (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
@@ -681,7 +681,7 @@ if necessary."
           ediff-state-of-merge nil)
  
      (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
           ediff-state-of-merge nil)
  
      (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
-    
+
      ;; In case of merge job, fool it into thinking that it is just doing
      ;; comparison
      (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
      ;; In case of merge job, fool it into thinking that it is just doing
      ;; comparison
      (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
@@ -696,20 +696,20 @@ if necessary."
                 ediff-merge-with-ancestor-job nil
                 ediff-job-name 'ediff-files3))
        (funcall ediff-setup-diff-regions-function file-A file-B file-C))
                 ediff-merge-with-ancestor-job nil
                 ediff-job-name 'ediff-files3))
        (funcall ediff-setup-diff-regions-function file-A file-B file-C))
-           
+
      (setq ediff-number-of-differences (length ediff-difference-vector-A))
      (delete-file file-A)
      (delete-file file-B)
      (if file-C
         (delete-file file-C))
      (setq ediff-number-of-differences (length ediff-difference-vector-A))
      (delete-file file-A)
      (delete-file file-B)
      (if file-C
         (delete-file file-C))
-       
+
      (if ediff-3way-job
         (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
      (if ediff-3way-job
         (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
-       
+
      (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
      (message "")
      ))
      (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
      (message "")
      ))
-    
+
  ;; Not bound to any key---to dangerous.  A user can do it if necessary.
  (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
    "Revert buffers A, B and C.  Then rerun Ediff on file A and file B."
  ;; Not bound to any key---to dangerous.  A user can do it if necessary.
  (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
    "Revert buffers A, B and C.  Then rerun Ediff on file A and file B."
@@ -746,7 +746,7 @@ if necessary."
        (ediff-update-diffs))))
  
  
        (ediff-update-diffs))))
  
  
-;; optional NO-REHIGHLIGHT says to not rehighlight buffers 
+;; optional NO-REHIGHLIGHT says to not rehighlight buffers
  (defun ediff-recenter (&optional no-rehighlight)
    "Bring the highlighted region of all buffers being compared into view.
  Reestablish the default three-window display."
  (defun ediff-recenter (&optional no-rehighlight)
    "Bring the highlighted region of all buffers being compared into view.
  Reestablish the default three-window display."
@@ -763,7 +763,7 @@ Reestablish the default three-window display."
           (message ediff-KILLED-VITAL-BUFFER
                    (beep 1)))
        ))
           (message ediff-KILLED-VITAL-BUFFER
                    (beep 1)))
        ))
-  
+
    ;; set visibility range appropriate to this invocation of Ediff.
    (ediff-visible-region)
    ;; raise
    ;; set visibility range appropriate to this invocation of Ediff.
    (ediff-visible-region)
    ;; raise
@@ -797,7 +797,7 @@ Reestablish the default three-window display."
            (not ediff-use-long-help-message)
            (not (ediff-frame-iconified-p ediff-control-frame)))
        (raise-frame ediff-control-frame))
            (not ediff-use-long-help-message)
            (not (ediff-frame-iconified-p ediff-control-frame)))
        (raise-frame ediff-control-frame))
-  
+
    ;; Redisplay whatever buffers are showing, if there is a selected difference
    (let ((control-frame ediff-control-frame)
         (control-buf ediff-control-buffer))
    ;; Redisplay whatever buffers are showing, if there is a selected difference
    (let ((control-frame ediff-control-frame)
         (control-buf ediff-control-buffer))
@@ -808,15 +808,15 @@ Reestablish the default three-window display."
         (progn
           (or no-rehighlight
               (ediff-select-difference ediff-current-difference))
         (progn
           (or no-rehighlight
               (ediff-select-difference ediff-current-difference))
-         
+
           (ediff-recenter-one-window 'A)
           (ediff-recenter-one-window 'B)
           (if ediff-3way-job
               (ediff-recenter-one-window 'C))
           (ediff-recenter-one-window 'A)
           (ediff-recenter-one-window 'B)
           (if ediff-3way-job
               (ediff-recenter-one-window 'C))
-         
+
           (ediff-with-current-buffer control-buf
             (ediff-recenter-ancestor) ; check if ancestor is alive
           (ediff-with-current-buffer control-buf
             (ediff-recenter-ancestor) ; check if ancestor is alive
-           
+
             (if (and (ediff-multiframe-setup-p)
                      (not ediff-use-long-help-message)
                      (not (ediff-frame-iconified-p ediff-control-frame)))
             (if (and (ediff-multiframe-setup-p)
                      (not ediff-use-long-help-message)
                      (not (ediff-frame-iconified-p ediff-control-frame)))
@@ -826,10 +826,11 @@ Reestablish the default three-window display."
                  (eq this-command 'ediff-quit))))
           ))
  
                  (eq this-command 'ediff-quit))))
           ))
  
-    (ediff-restore-highlighting)
+    (or no-rehighlight
+       (ediff-restore-highlighting))
      (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
      ))
      (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
      ))
-  
+
  ;; this function returns to the window it was called from
  ;; (which was the control window)
  (defun ediff-recenter-one-window (buf-type)
  ;; this function returns to the window it was called from
  ;; (which was the control window)
  (defun ediff-recenter-one-window (buf-type)
@@ -837,7 +838,7 @@ Reestablish the default three-window display."
        ;; context must be saved before switching to windows A/B/C
        (let* ((ctl-wind (selected-window))
              (shift (ediff-overlay-start
        ;; context must be saved before switching to windows A/B/C
        (let* ((ctl-wind (selected-window))
              (shift (ediff-overlay-start
-                    (ediff-get-value-according-to-buffer-type 
+                    (ediff-get-value-according-to-buffer-type
                       buf-type ediff-narrow-bounds)))
              (job-name ediff-job-name)
              (control-buf ediff-control-buffer)
                       buf-type ediff-narrow-bounds)))
              (job-name ediff-job-name)
              (control-buf ediff-control-buffer)
@@ -845,7 +846,7 @@ Reestablish the default three-window display."
                            buf-type ediff-window-alist))
              (window (if (window-live-p (symbol-value window-name))
                          (symbol-value window-name))))
                            buf-type ediff-window-alist))
              (window (if (window-live-p (symbol-value window-name))
                          (symbol-value window-name))))
-       
+
         (if (and window ediff-windows-job)
             (set-window-start window shift))
         (if window
         (if (and window ediff-windows-job)
             (set-window-start window shift))
         (if window
@@ -883,10 +884,10 @@ Reestablish the default three-window display."
         (select-window ctl-wind)
         )))
  
         (select-window ctl-wind)
         )))
  
-       
+
  ;; This will have to be refined for 3way jobs
  (defun ediff-toggle-split ()
  ;; This will have to be refined for 3way jobs
  (defun ediff-toggle-split ()
-  "Toggle vertical/horizontal window split. 
+  "Toggle vertical/horizontal window split.
  Does nothing if file-A and file-B are in different frames."
    (interactive)
    (ediff-barf-if-not-control-buffer)
  Does nothing if file-A and file-B are in different frames."
    (interactive)
    (ediff-barf-if-not-control-buffer)
@@ -908,10 +909,10 @@ Does nothing if file-A and file-B are in different frames."
                 'split-window-vertically))
        (message "Buffers being compared are in different frames"))
      (ediff-recenter 'no-rehighlight)))
                 'split-window-vertically))
        (message "Buffers being compared are in different frames"))
      (ediff-recenter 'no-rehighlight)))
-  
+
  (defun ediff-toggle-hilit ()
    "Switch between highlighting using ASCII flags and highlighting using faces.
  (defun ediff-toggle-hilit ()
    "Switch between highlighting using ASCII flags and highlighting using faces.
-On a dumb terminal, switches between ASCII highlighting and no highlighting." 
+On a dumb terminal, switches between ASCII highlighting and no highlighting."
    (interactive)
    (ediff-barf-if-not-control-buffer)
  
    (interactive)
    (ediff-barf-if-not-control-buffer)
  
@@ -941,15 +942,15 @@ On a dumb terminal, switches between ASCII highlighting and no highlighting."
          (setq ediff-use-faces            t
                ediff-highlighting-style  'face
                ediff-highlight-all-diffs  t)))
          (setq ediff-use-faces            t
                ediff-highlighting-style  'face
                ediff-highlight-all-diffs  t)))
-  
+
    (if (and ediff-use-faces ediff-highlight-all-diffs)
        (ediff-paint-background-regions)
      (ediff-paint-background-regions 'unhighlight))
    (if (and ediff-use-faces ediff-highlight-all-diffs)
        (ediff-paint-background-regions)
      (ediff-paint-background-regions 'unhighlight))
-  
+
    (ediff-unselect-and-select-difference
     ediff-current-difference 'select-only))
  
    (ediff-unselect-and-select-difference
     ediff-current-difference 'select-only))
  
-  
+
  (defun ediff-toggle-autorefine ()
    "Toggle auto-refine mode."
    (interactive)
  (defun ediff-toggle-autorefine ()
    "Toggle auto-refine mode."
    (interactive)
@@ -981,10 +982,10 @@ On a dumb terminal, switches between ASCII highlighting and no highlighting."
      (cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer))
            (raise-frame (window-frame wind)))
           (t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
      (cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer))
            (raise-frame (window-frame wind)))
           (t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
-       
+
  (defun ediff-make-or-kill-fine-diffs (arg)
    "Compute fine diffs.  With negative prefix arg, kill fine diffs.
  (defun ediff-make-or-kill-fine-diffs (arg)
    "Compute fine diffs.  With negative prefix arg, kill fine diffs.
-In both cases, operates on the current difference region." 
+In both cases, operates on the current difference region."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
    (cond ((eq arg '-)
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
    (cond ((eq arg '-)
@@ -992,8 +993,8 @@ In both cases, operates on the current difference region."
         ((and (numberp arg) (< arg 0))
          (ediff-clear-fine-differences ediff-current-difference))
         (t (ediff-make-fine-diffs))))
         ((and (numberp arg) (< arg 0))
          (ediff-clear-fine-differences ediff-current-difference))
         (t (ediff-make-fine-diffs))))
-        
-  
+
+
  (defun ediff-toggle-help ()
    "Toggle short/long help message."
    (interactive)
  (defun ediff-toggle-help ()
    "Toggle short/long help message."
    (interactive)
@@ -1007,11 +1008,11 @@ In both cases, operates on the current difference region."
    (if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
        (setq ediff-prefer-iconified-control-frame
             (ediff-frame-iconified-p ediff-control-frame)))
    (if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
        (setq ediff-prefer-iconified-control-frame
             (ediff-frame-iconified-p ediff-control-frame)))
-           
+
    (setq ediff-window-config-saved "") ; force redisplay
    (ediff-recenter 'no-rehighlight))
    (setq ediff-window-config-saved "") ; force redisplay
    (ediff-recenter 'no-rehighlight))
-  
-  
+
+
  ;; If BUF, this is the buffer to toggle, not current buffer.
  (defun ediff-toggle-read-only (&optional buf)
    "Toggle read-only in current buffer.
  ;; If BUF, this is the buffer to toggle, not current buffer.
  (defun ediff-toggle-read-only (&optional buf)
    "Toggle read-only in current buffer.
@@ -1025,7 +1026,7 @@ of the current buffer."
      (or buf (ediff-recenter))
      (or buf
         (setq buf (ediff-get-buffer buf-type)))
      (or buf (ediff-recenter))
      (or buf
         (setq buf (ediff-get-buffer buf-type)))
-             
+
      (ediff-with-current-buffer buf     ; eval in buf A/B/C
        (let* ((file (buffer-file-name buf))
              (file-writable (and file
      (ediff-with-current-buffer buf     ; eval in buf A/B/C
        (let* ((file (buffer-file-name buf))
              (file-writable (and file
@@ -1065,22 +1066,24 @@ of the current buffer."
                    (message
                     "Boy, this is risky! Don't modify this file...")
                    (sit-for 3)))) ; let the user see the warning
                    (message
                     "Boy, this is risky! Don't modify this file...")
                    (sit-for 3)))) ; let the user see the warning
-       (if (and toggle-ro-cmd 
+       (if (and toggle-ro-cmd
                  (string-match "toggle-read-only" (symbol-name toggle-ro-cmd)))
             (save-excursion
               (save-window-excursion
                 (select-window (ediff-get-visible-buffer-window buf))
                 (command-execute toggle-ro-cmd)))
           (error "Don't know how to toggle read-only in buffer %S" buf))
                  (string-match "toggle-read-only" (symbol-name toggle-ro-cmd)))
             (save-excursion
               (save-window-excursion
                 (select-window (ediff-get-visible-buffer-window buf))
                 (command-execute toggle-ro-cmd)))
           (error "Don't know how to toggle read-only in buffer %S" buf))
-       
+
         ;; Check if we made the current buffer updatable, but its file is RO.
         ;; Signal a warning in this case.
         (if (and file (not buffer-read-only)
                  (eq this-command 'ediff-toggle-read-only)
                  (file-exists-p file)
                  (not (file-writable-p file)))
         ;; Check if we made the current buffer updatable, but its file is RO.
         ;; Signal a warning in this case.
         (if (and file (not buffer-read-only)
                  (eq this-command 'ediff-toggle-read-only)
                  (file-exists-p file)
                  (not (file-writable-p file)))
-           (message "Warning: file %s is read-only"
-                    (ediff-abbreviate-file-name file) (beep 1)))
+           (progn
+             (beep 1)
+             (message "Warning: file %s is read-only"
+                      (ediff-abbreviate-file-name file))))
         ))))
  
  ;; checkout if visited file is checked in
         ))))
  
  ;; checkout if visited file is checked in
@@ -1095,7 +1098,7 @@ of the current buffer."
                (ediff-abbreviate-file-name file))))
         (ediff-with-current-buffer buf
           (command-execute checkout-function)))))
                (ediff-abbreviate-file-name file))))
         (ediff-with-current-buffer buf
           (command-execute checkout-function)))))
-          
+
  
  ;; This is a simple-minded check for whether a file is under version control.
  ;; If file,v exists but file doesn't, this file is considered to be not checked
  
  ;; This is a simple-minded check for whether a file is under version control.
  ;; If file,v exists but file doesn't, this file is considered to be not checked
@@ -1131,15 +1134,15 @@ of the current buffer."
              ;; XEmacs has no vc-state
              (vc-locking-user file))
            )))
              ;; XEmacs has no vc-state
              (vc-locking-user file))
            )))
-  
+
  (defsubst ediff-file-checked-in-p (file)
    (and (featurep 'vc-hooks)
         ;; CVS files are considered not checked in
         (not (memq (vc-backend file) '(nil CVS)))
         (if (fboundp 'vc-state)
  (defsubst ediff-file-checked-in-p (file)
    (and (featurep 'vc-hooks)
         ;; CVS files are considered not checked in
         (not (memq (vc-backend file) '(nil CVS)))
         (if (fboundp 'vc-state)
-          (progn
-            (not (memq (vc-state file) '(edited needs-merge)))
-            (not (stringp (vc-state file))))
+          (and
+           (not (memq (vc-state file) '(edited needs-merge)))
+           (not (stringp (vc-state file))))
          ;; XEmacs has no vc-state
          (not (vc-locking-user file)))
         ))
          ;; XEmacs has no vc-state
          (not (vc-locking-user file)))
         ))
@@ -1151,7 +1154,7 @@ of the current buffer."
    (if (featurep 'jka-compr)
        (string-match (jka-compr-build-file-regexp) file)))
  
    (if (featurep 'jka-compr)
        (string-match (jka-compr-build-file-regexp) file)))
  
-      
+
  (defun ediff-swap-buffers ()
    "Rotate the display of buffers A, B, and C."
    (interactive)
  (defun ediff-swap-buffers ()
    "Rotate the display of buffers A, B, and C."
    (interactive)
@@ -1180,7 +1183,7 @@ of the current buffer."
                   ediff-buffer-B buf)
           (setq ediff-buffer-A ediff-buffer-B
                 ediff-buffer-B buf))
                   ediff-buffer-B buf)
           (setq ediff-buffer-A ediff-buffer-B
                 ediff-buffer-B buf))
-               
+
         ;; swap saved buffer characteristics
         (if ediff-3way-comparison-job
             (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C
         ;; swap saved buffer characteristics
         (if ediff-3way-comparison-job
             (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C
@@ -1188,7 +1191,7 @@ of the current buffer."
                   ediff-buffer-values-orig-B values)
           (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B
                 ediff-buffer-values-orig-B values))
                   ediff-buffer-values-orig-B values)
           (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B
                 ediff-buffer-values-orig-B values))
-       
+
         ;; swap diff vectors
         (if ediff-3way-comparison-job
             (setq ediff-difference-vector-A ediff-difference-vector-C
         ;; swap diff vectors
         (if ediff-3way-comparison-job
             (setq ediff-difference-vector-A ediff-difference-vector-C
@@ -1196,7 +1199,7 @@ of the current buffer."
                   ediff-difference-vector-B diff-vec)
           (setq ediff-difference-vector-A ediff-difference-vector-B
                 ediff-difference-vector-B diff-vec))
                   ediff-difference-vector-B diff-vec)
           (setq ediff-difference-vector-A ediff-difference-vector-B
                 ediff-difference-vector-B diff-vec))
-               
+
         ;; swap hide/focus regexp
         (if ediff-3way-comparison-job
             (setq ediff-regexp-hide-A ediff-regexp-hide-C
         ;; swap hide/focus regexp
         (if ediff-3way-comparison-job
             (setq ediff-regexp-hide-A ediff-regexp-hide-C
@@ -1209,7 +1212,7 @@ of the current buffer."
                 ediff-regexp-hide-B hide-regexp
                 ediff-regexp-focus-A ediff-regexp-focus-B
                 ediff-regexp-focus-B focus-regexp))
                 ediff-regexp-hide-B hide-regexp
                 ediff-regexp-focus-A ediff-regexp-focus-B
                 ediff-regexp-focus-B focus-regexp))
-       
+
         ;; The following is needed for XEmacs, since there one can't move
         ;; overlay to another buffer.  In Emacs, this swap is redundant.
         (if (ediff-has-face-support-p)
         ;; The following is needed for XEmacs, since there one can't move
         ;; overlay to another buffer.  In Emacs, this swap is redundant.
         (if (ediff-has-face-support-p)
@@ -1219,7 +1222,7 @@ of the current buffer."
                       ediff-current-diff-overlay-B overlay)
               (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
                     ediff-current-diff-overlay-B overlay)))
                       ediff-current-diff-overlay-B overlay)
               (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
                     ediff-current-diff-overlay-B overlay)))
-                   
+
         ;; swap wide bounds
         (setq ediff-wide-bounds
               (cond (ediff-3way-comparison-job
         ;; swap wide bounds
         (setq ediff-wide-bounds
               (cond (ediff-3way-comparison-job
@@ -1230,7 +1233,7 @@ of the current buffer."
                      (list (nth 1 ediff-wide-bounds)
                            (nth 0 ediff-wide-bounds)
                            (nth 2 ediff-wide-bounds)))
                      (list (nth 1 ediff-wide-bounds)
                            (nth 0 ediff-wide-bounds)
                            (nth 2 ediff-wide-bounds)))
-                   (t 
+                   (t
                      (list (nth 1 ediff-wide-bounds)
                            (nth 0 ediff-wide-bounds)))))
         ;; swap narrow bounds
                      (list (nth 1 ediff-wide-bounds)
                            (nth 0 ediff-wide-bounds)))))
         ;; swap narrow bounds
@@ -1243,7 +1246,7 @@ of the current buffer."
                      (list (nth 1 ediff-narrow-bounds)
                            (nth 0 ediff-narrow-bounds)
                            (nth 2 ediff-narrow-bounds)))
                      (list (nth 1 ediff-narrow-bounds)
                            (nth 0 ediff-narrow-bounds)
                            (nth 2 ediff-narrow-bounds)))
-                   (t 
+                   (t
                      (list (nth 1 ediff-narrow-bounds)
                            (nth 0 ediff-narrow-bounds)))))
         (if wide-visibility-p
                      (list (nth 1 ediff-narrow-bounds)
                            (nth 0 ediff-narrow-bounds)))))
         (if wide-visibility-p
@@ -1254,7 +1257,7 @@ of the current buffer."
        (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
    (ediff-recenter 'no-rehighlight)
    )
        (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
    (ediff-recenter 'no-rehighlight)
    )
-  
+
  
  (defun ediff-toggle-wide-display ()
    "Toggle wide/regular display.
  
  (defun ediff-toggle-wide-display ()
    "Toggle wide/regular display.
@@ -1283,7 +1286,7 @@ This is especially useful when comparing buffers side-by-side."
        (ediff-with-current-buffer ctl-buf
         (setq ediff-window-B nil) ; force update of window config
         (ediff-recenter 'no-rehighlight)))))
        (ediff-with-current-buffer ctl-buf
         (setq ediff-window-B nil) ; force update of window config
         (ediff-recenter 'no-rehighlight)))))
-       
+
  ;;;###autoload
  (defun ediff-toggle-multiframe ()
    "Switch from multiframe display to single-frame display and back.
  ;;;###autoload
  (defun ediff-toggle-multiframe ()
    "Switch from multiframe display to single-frame display and back.
@@ -1328,7 +1331,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see."
             (ediff-kill-bottom-toolbar))
         ;; do this only after killing the toolbar
         (setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
             (ediff-kill-bottom-toolbar))
         ;; do this only after killing the toolbar
         (setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
-       
+
         (mapcar (lambda(buf)
                   (ediff-with-current-buffer buf
                     ;; force redisplay
         (mapcar (lambda(buf)
                   (ediff-with-current-buffer buf
                     ;; force redisplay
@@ -1346,7 +1349,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see."
    ;;(selected-frame).
    ;; The problem with this is that any previous bottom-toolbar
    ;; will not re-appear after our cleanup here.  Is there a way
    ;;(selected-frame).
    ;; The problem with this is that any previous bottom-toolbar
    ;; will not re-appear after our cleanup here.  Is there a way
-  ;; to do "push" and "pop" toolbars ?  --marcpa  
+  ;; to do "push" and "pop" toolbars ?  --marcpa
    (if (ediff-use-toolbar-p)
        (ediff-cond-compile-for-xemacs-or-emacs
         (progn ; xemacs
    (if (ediff-use-toolbar-p)
        (ediff-cond-compile-for-xemacs-or-emacs
         (progn ; xemacs
@@ -1370,7 +1373,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see."
                    bottom-toolbar
                    (list frame (if (ediff-3way-comparison-job)
                                    ediff-toolbar-3way ediff-toolbar)))
                    bottom-toolbar
                    (list frame (if (ediff-3way-comparison-job)
                                    ediff-toolbar-3way ediff-toolbar)))
-                 (set-specifier bottom-toolbar-visible-p (list frame t)) 
+                 (set-specifier bottom-toolbar-visible-p (list frame t))
                   (set-specifier bottom-toolbar-height
                                  (list frame ediff-toolbar-height)))
                 nil ; emacs
                   (set-specifier bottom-toolbar-height
                                  (list frame ediff-toolbar-height)))
                 nil ; emacs
@@ -1384,7 +1387,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see."
                )
               ))
      ))
                )
               ))
      ))
-              
+
  ;; Merging
  
  (defun ediff-toggle-show-clashes-only ()
  ;; Merging
  
  (defun ediff-toggle-show-clashes-only ()
@@ -1409,7 +1412,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see."
      (message "Showing regions that differ from default setting")))
  
  
      (message "Showing regions that differ from default setting")))
  
  
-              
+
  ;; Widening/narrowing
  
  (defun ediff-toggle-narrow-region ()
  ;; Widening/narrowing
  
  (defun ediff-toggle-narrow-region ()
@@ -1422,11 +1425,11 @@ Used in ediff-windows/regions only."
        (setq ediff-visible-bounds ediff-narrow-bounds)
      (setq ediff-visible-bounds ediff-wide-bounds))
    (ediff-recenter 'no-rehighlight))
        (setq ediff-visible-bounds ediff-narrow-bounds)
      (setq ediff-visible-bounds ediff-wide-bounds))
    (ediff-recenter 'no-rehighlight))
-  
+
  ;; Narrow bufs A/B/C to ediff-visible-bounds.  If this is currently set to
  ;; ediff-wide-bounds, then this actually widens.
  ;; This function does nothing if job-name is not
  ;; Narrow bufs A/B/C to ediff-visible-bounds.  If this is currently set to
  ;; ediff-wide-bounds, then this actually widens.
  ;; This function does nothing if job-name is not
-;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise. 
+;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
  ;; Does nothing if buffer-A  = buffer-B since we can't narrow
  ;; to two different regions in one buffer.
  (defun ediff-visible-region ()
  ;; Does nothing if buffer-A  = buffer-B since we can't narrow
  ;; to two different regions in one buffer.
  (defun ediff-visible-region ()
@@ -1453,13 +1456,13 @@ Used in ediff-windows/regions only."
         (if (ediff-overlay-buffer overl-B)
             (narrow-to-region
              (ediff-overlay-start overl-B) (ediff-overlay-end overl-B))))
         (if (ediff-overlay-buffer overl-B)
             (narrow-to-region
              (ediff-overlay-start overl-B) (ediff-overlay-end overl-B))))
-      
+
        (if (and ediff-3way-job (ediff-overlay-buffer overl-C))
           (ediff-with-current-buffer ediff-buffer-C
             (narrow-to-region
              (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
        )))
        (if (and ediff-3way-job (ediff-overlay-buffer overl-C))
           (ediff-with-current-buffer ediff-buffer-C
             (narrow-to-region
              (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
        )))
-  
+
  
  ;; Window scrolling operations
  
  
  ;; Window scrolling operations
  
@@ -1468,7 +1471,7 @@ Used in ediff-windows/regions only."
  ;; Usually, errors come from scrolling off the
  ;; beginning or end of the buffer, and this gives error messages.
  (defun ediff-operate-on-windows (operation arg)
  ;; Usually, errors come from scrolling off the
  ;; beginning or end of the buffer, and this gives error messages.
  (defun ediff-operate-on-windows (operation arg)
-        
+
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
@@ -1477,7 +1480,7 @@ Used in ediff-windows/regions only."
                 (or (not ediff-3way-job) ediff-buffer-C)
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
                 (or (not ediff-3way-job) ediff-buffer-C)
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
-       
+
    (let* ((wind (selected-window))
          (wind-A ediff-window-A)
          (wind-B ediff-window-B)
    (let* ((wind (selected-window))
          (wind-A ediff-window-A)
          (wind-B ediff-window-B)
@@ -1487,7 +1490,7 @@ Used in ediff-windows/regions only."
          (three-way ediff-3way-job)
          (coefC (if three-way
                     (ediff-get-region-size-coefficient 'C operation))))
          (three-way ediff-3way-job)
          (coefC (if three-way
                     (ediff-get-region-size-coefficient 'C operation))))
-            
+
      (select-window wind-A)
      (condition-case nil
         (funcall operation (round (* coefA arg)))
      (select-window wind-A)
      (condition-case nil
         (funcall operation (round (* coefA arg)))
@@ -1510,7 +1513,7 @@ With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
  the one half of the height of window-A."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
  the one half of the height of window-A."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
-  
+
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
@@ -1520,10 +1523,10 @@ the one half of the height of window-A."
                     (ediff-buffer-live-p ediff-buffer-C))
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
                     (ediff-buffer-live-p ediff-buffer-C))
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
-      
+
    (ediff-operate-on-windows
     (if (memq last-command-char '(?v ?\C-v))
    (ediff-operate-on-windows
     (if (memq last-command-char '(?v ?\C-v))
-       'scroll-up 
+       'scroll-up
       'scroll-down)
     ;; calculate argument to scroll-up/down
     ;; if there is an explicit argument
       'scroll-down)
     ;; calculate argument to scroll-up/down
     ;; if there is an explicit argument
@@ -1532,7 +1535,7 @@ the one half of the height of window-A."
         (prefix-numeric-value arg)
       ;; if not, see if we can determine a default amount (the window height)
       (let (default-amount)
         (prefix-numeric-value arg)
       ;; if not, see if we can determine a default amount (the window height)
       (let (default-amount)
-       (setq default-amount 
+       (setq default-amount
              (- (/ (min (window-height ediff-window-A)
                         (window-height ediff-window-B)
                         (if ediff-3way-job
              (- (/ (min (window-height ediff-window-A)
                         (window-height ediff-window-B)
                         (if ediff-3way-job
@@ -1554,7 +1557,7 @@ If an argument is given, that is how many columns are scrolled, else nearly
  the width of the A/B/C windows."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
  the width of the A/B/C windows."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
-  
+
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
    ;; make sure windows aren't dead
    (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
        (ediff-recenter 'no-rehighlight))
@@ -1564,14 +1567,14 @@ the width of the A/B/C windows."
                     (ediff-buffer-live-p ediff-buffer-C))
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
                     (ediff-buffer-live-p ediff-buffer-C))
                 ))
        (error ediff-KILLED-VITAL-BUFFER))
-    
+
    (ediff-operate-on-windows
     ;; Arrange for scroll-left and scroll-right being called
     ;; interactively so that they set the window's min_hscroll.
     ;; Otherwise, automatic hscrolling will undo the effect of
     ;; hscrolling.
     (if (= last-command-char ?<)
    (ediff-operate-on-windows
     ;; Arrange for scroll-left and scroll-right being called
     ;; interactively so that they set the window's min_hscroll.
     ;; Otherwise, automatic hscrolling will undo the effect of
     ;; hscrolling.
     (if (= last-command-char ?<)
-       (lambda (arg) 
+       (lambda (arg)
          (let ((prefix-arg arg))
            (call-interactively 'scroll-left)))
       (lambda (arg)
          (let ((prefix-arg arg))
            (call-interactively 'scroll-left)))
       (lambda (arg)
@@ -1606,7 +1609,7 @@ the width of the A/B/C windows."
  
  ;;BEG, END show the region to be positioned.
  ;;JOB-NAME holds ediff-job-name.  The ediff-windows job positions regions
  
  ;;BEG, END show the region to be positioned.
  ;;JOB-NAME holds ediff-job-name.  The ediff-windows job positions regions
-;;differently. 
+;;differently.
  (defun ediff-position-region (beg end pos job-name)
    (if (> end (point-max))
        (setq end (point-max)))
  (defun ediff-position-region (beg end pos job-name)
    (if (> end (point-max))
        (setq end (point-max)))
@@ -1706,7 +1709,7 @@ the width of the A/B/C windows."
  
  
  (defun ediff-next-difference (&optional arg)
  
  
  (defun ediff-next-difference (&optional arg)
-  "Advance to the next difference. 
+  "Advance to the next difference.
  With a prefix argument, go forward that many differences."
    (interactive "p")
    (ediff-barf-if-not-control-buffer)
  With a prefix argument, go forward that many differences."
    (interactive "p")
    (ediff-barf-if-not-control-buffer)
@@ -1714,13 +1717,13 @@ With a prefix argument, go forward that many differences."
        (let ((n (min ediff-number-of-differences
                     (+ ediff-current-difference (or arg 1))))
             non-clash-skip skip-changed regexp-skip)
        (let ((n (min ediff-number-of-differences
                     (+ ediff-current-difference (or arg 1))))
             non-clash-skip skip-changed regexp-skip)
-           
+
         (ediff-visible-region)
         (or (>= n ediff-number-of-differences)
             (setq regexp-skip (funcall ediff-skip-diff-region-function n))
             ;; this won't exec if regexp-skip is t
             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
         (ediff-visible-region)
         (or (>= n ediff-number-of-differences)
             (setq regexp-skip (funcall ediff-skip-diff-region-function n))
             ;; this won't exec if regexp-skip is t
             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
-                 skip-changed 
+                 skip-changed
                   (ediff-skip-merge-region-if-changed-from-default-p n))
             (ediff-install-fine-diff-if-necessary n))
         ;; Skip loop
                   (ediff-skip-merge-region-if-changed-from-default-p n))
             (ediff-install-fine-diff-if-necessary n))
         ;; Skip loop
@@ -1756,20 +1759,20 @@ With a prefix argument, go forward that many differences."
      (error "At end of the difference list")))
  
  (defun ediff-previous-difference (&optional arg)
      (error "At end of the difference list")))
  
  (defun ediff-previous-difference (&optional arg)
-  "Go to the previous difference. 
+  "Go to the previous difference.
  With a prefix argument, go back that many differences."
    (interactive "p")
    (ediff-barf-if-not-control-buffer)
    (if (> ediff-current-difference -1)
        (let ((n (max -1 (- ediff-current-difference (or arg 1))))
             non-clash-skip skip-changed regexp-skip)
  With a prefix argument, go back that many differences."
    (interactive "p")
    (ediff-barf-if-not-control-buffer)
    (if (> ediff-current-difference -1)
        (let ((n (max -1 (- ediff-current-difference (or arg 1))))
             non-clash-skip skip-changed regexp-skip)
-           
+
         (ediff-visible-region)
         (or (< n 0)
             (setq regexp-skip (funcall ediff-skip-diff-region-function n))
             ;; this won't exec if regexp-skip is t
             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
         (ediff-visible-region)
         (or (< n 0)
             (setq regexp-skip (funcall ediff-skip-diff-region-function n))
             ;; this won't exec if regexp-skip is t
             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
-                 skip-changed 
+                 skip-changed
                   (ediff-skip-merge-region-if-changed-from-default-p n))
             (ediff-install-fine-diff-if-necessary n))
         (while (and (> n -1)
                   (ediff-skip-merge-region-if-changed-from-default-p n))
             (ediff-install-fine-diff-if-necessary n))
         (while (and (> n -1)
@@ -1822,7 +1825,7 @@ If the prefix is negative, count differences from the end."
        (ediff-unselect-and-select-difference difference-number)
      (error ediff-BAD-DIFF-NUMBER
            this-command (1+ difference-number) ediff-number-of-differences)))
        (ediff-unselect-and-select-difference difference-number)
      (error ediff-BAD-DIFF-NUMBER
            this-command (1+ difference-number) ediff-number-of-differences)))
-      
+
  (defun ediff-jump-to-difference-at-point (arg)
    "Go to difference closest to the point in buffer A, B, or C.
  The buffer depends on last command character \(a, b, or c\) that invoked this
  (defun ediff-jump-to-difference-at-point (arg)
    "Go to difference closest to the point in buffer A, B, or C.
  The buffer depends on last command character \(a, b, or c\) that invoked this
@@ -1877,11 +1880,11 @@ in the specified buffer."
           (select-window ctl-wind)
           ))
      ))
           (select-window ctl-wind)
           ))
      ))
-       
-      
+
+
  ;; find region most related to the current point position (or POS, if given)
  ;; returns diff number as seen by the user (i.e., 1+ the internal
  ;; find region most related to the current point position (or POS, if given)
  ;; returns diff number as seen by the user (i.e., 1+ the internal
-;; representation) 
+;; representation)
  ;; The optional argument WHICH-DIFF can be `after' or `before'.  If `after',
  ;; find the diff after the point.  If `before', find the diff before the
  ;; point.  If the point is inside a diff, return that diff.
  ;; The optional argument WHICH-DIFF can be `after' or `before'.  If `after',
  ;; find the diff after the point.  If `before', find the diff before the
  ;; point.  If the point is inside a diff, return that diff.
@@ -1894,7 +1897,7 @@ in the specified buffer."
         (prev-end 0)
         (beg 0)
         (end 0))
         (prev-end 0)
         (beg 0)
         (end 0))
-       
+
      (ediff-with-current-buffer buffer
        (setq pos (or pos (point)))
        (while (and (or (< pos prev-beg) (> pos beg))
      (ediff-with-current-buffer buffer
        (setq pos (or pos (point)))
        (while (and (or (< pos prev-beg) (> pos beg))
@@ -1905,7 +1908,7 @@ in the specified buffer."
         (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
               end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
         )
         (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
               end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
         )
-      
+
        ;; boost diff-no by 1, if past the last diff region
        (if (and (memq which-diff '(after before))
                (> pos beg) (= diff-no max-dif-num))
        ;; boost diff-no by 1, if past the last diff region
        (if (and (memq which-diff '(after before))
                (> pos beg) (= diff-no max-dif-num))
@@ -2003,20 +2006,20 @@ ARG is a prefix argument.  If nil, copy the current difference region."
          messg
          ediff-verbose-p
          reg-to-delete reg-to-delete-beg reg-to-delete-end)
          messg
          ediff-verbose-p
          reg-to-delete reg-to-delete-beg reg-to-delete-end)
-       
+
      (setq reg-to-delete-beg
           (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
      (setq reg-to-delete-end
           (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
      (setq reg-to-delete-beg
           (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
      (setq reg-to-delete-end
           (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
-         
+
      (if reg-to-copy
         (setq from-buf-type nil)
        (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
      (if reg-to-copy
         (setq from-buf-type nil)
        (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
-    
+
      (setq reg-to-delete (ediff-get-region-contents
                          n to-buf-type ctrl-buf
                          reg-to-delete-beg reg-to-delete-end))
      (setq reg-to-delete (ediff-get-region-contents
                          n to-buf-type ctrl-buf
                          reg-to-delete-beg reg-to-delete-end))
-    
+
      (if (string= reg-to-delete reg-to-copy)
         (setq saved-p nil) ; don't copy identical buffers
        ;; seems ok to copy
      (if (string= reg-to-delete reg-to-copy)
         (setq saved-p nil) ; don't copy identical buffers
        ;; seems ok to copy
@@ -2026,15 +2029,15 @@ ARG is a prefix argument.  If nil, copy the current difference region."
                 (ediff-with-current-buffer to-buf
                   ;; to prevent flags from interfering if buffer is writable
                   (let ((inhibit-read-only (null buffer-read-only)))
                 (ediff-with-current-buffer to-buf
                   ;; to prevent flags from interfering if buffer is writable
                   (let ((inhibit-read-only (null buffer-read-only)))
-                   
+
                     (goto-char reg-to-delete-end)
                     (insert reg-to-copy)
                     (goto-char reg-to-delete-end)
                     (insert reg-to-copy)
-                   
+
                     (if (> reg-to-delete-end reg-to-delete-beg)
                         (kill-region reg-to-delete-beg reg-to-delete-end))
                     ))
                 (or batch-invocation
                     (if (> reg-to-delete-end reg-to-delete-beg)
                         (kill-region reg-to-delete-beg reg-to-delete-end))
                     ))
                 (or batch-invocation
-                   (setq 
+                   (setq
                      messg
                      (ediff-save-diff-region n to-buf-type reg-to-delete))))
             (error (message "ediff-copy-diff: %s %s"
                      messg
                      (ediff-save-diff-region n to-buf-type reg-to-delete))))
             (error (message "ediff-copy-diff: %s %s"
@@ -2045,7 +2048,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
                    (setq saved-p nil)
                    )))
        )
                    (setq saved-p nil)
                    )))
        )
-    
+
      ;; adjust state of difference in case 3-way and diff was copied ok
      (if (and saved-p three-way)
         (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
      ;; adjust state of difference in case 3-way and diff was copied ok
      (if (and saved-p three-way)
         (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
@@ -2056,9 +2059,9 @@ ARG is a prefix argument.  If nil, copy the current difference region."
        ;; before reinserting flags (and thus before ediff-recenter).
        (if (and saved-p three-way)
           (ediff-clear-fine-differences n))
        ;; before reinserting flags (and thus before ediff-recenter).
        (if (and saved-p three-way)
           (ediff-clear-fine-differences n))
-      
+
        (ediff-refresh-mode-lines)
        (ediff-refresh-mode-lines)
-      
+
        ;; For diff2 jobs, don't recompute fine diffs, since we know there
        ;; aren't any.  So we clear diffs after ediff-recenter.
        (if (and saved-p (not three-way))
        ;; For diff2 jobs, don't recompute fine diffs, since we know there
        ;; aren't any.  So we clear diffs after ediff-recenter.
        (if (and saved-p (not three-way))
@@ -2067,7 +2070,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
        ;; by the user
        (message messg))
      ))
        ;; by the user
        (message messg))
      ))
-     
+
  ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
  ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'.  REG
  ;; is the region to save.  It is redundant here, but is passed anyway, for
  ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
  ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'.  REG
  ;; is the region to save.  It is redundant here, but is passed anyway, for
@@ -2076,7 +2079,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
    (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
          (buf (ediff-get-buffer buf-type))
          (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
    (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
          (buf (ediff-get-buffer buf-type))
          (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
-        
+
      (if this-buf-n-th-diff-saved
         ;; either nothing saved for n-th diff and buffer or we OK'ed
         ;; overriding
      (if this-buf-n-th-diff-saved
         ;; either nothing saved for n-th diff and buffer or we OK'ed
         ;; overriding
@@ -2091,22 +2094,22 @@ ARG is a prefix argument.  If nil, copy the current difference region."
              (if ediff-merge-job
                  "" (downcase (symbol-name buf-type))))
      ))
              (if ediff-merge-job
                  "" (downcase (symbol-name buf-type))))
      ))
-    
+
  ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
  (defun ediff-test-save-region (n buf-type)
    (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
          (buf (ediff-get-buffer buf-type))
          (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
  ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
  (defun ediff-test-save-region (n buf-type)
    (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
          (buf (ediff-get-buffer buf-type))
          (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
-        
+
      (if this-buf-n-th-diff-saved
         (if (yes-or-no-p
      (if this-buf-n-th-diff-saved
         (if (yes-or-no-p
-            (format 
+            (format
               "You've previously copied diff region %d to buffer %S.  Confirm "
               (1+ n) buf-type))
             t
           (error "Quit"))
        t)))
               "You've previously copied diff region %d to buffer %S.  Confirm "
               (1+ n) buf-type))
             t
           (error "Quit"))
        t)))
-         
+
  (defun ediff-pop-diff (n buf-type)
    "Pop last killed Nth diff region from buffer BUF-TYPE."
    (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
  (defun ediff-pop-diff (n buf-type)
    "Pop last killed Nth diff region from buffer BUF-TYPE."
    (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
@@ -2116,33 +2119,33 @@ ARG is a prefix argument.  If nil, copy the current difference region."
          (ctl-buf ediff-control-buffer)
          ediff-verbose-p
          saved-diff reg-beg reg-end recovered)
          (ctl-buf ediff-control-buffer)
          ediff-verbose-p
          saved-diff reg-beg reg-end recovered)
-       
+
      (if (cdr saved-rec)
         (setq saved-diff (cdr saved-rec))
        (if (> ediff-number-of-differences 0)
           (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
         (error ediff-NO-DIFFERENCES)))
      (if (cdr saved-rec)
         (setq saved-diff (cdr saved-rec))
        (if (> ediff-number-of-differences 0)
           (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
         (error ediff-NO-DIFFERENCES)))
-    
+
      (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer))
      (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
      (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer))
      (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
-    
+
      (condition-case conds
         (ediff-with-current-buffer buf
           (let ((inhibit-read-only (null buffer-read-only)))
      (condition-case conds
         (ediff-with-current-buffer buf
           (let ((inhibit-read-only (null buffer-read-only)))
-           
+
             (goto-char reg-end)
             (insert saved-diff)
             (goto-char reg-end)
             (insert saved-diff)
-           
+
             (if (> reg-end reg-beg)
                 (kill-region reg-beg reg-end))
             (if (> reg-end reg-beg)
                 (kill-region reg-beg reg-end))
-           
+
             (setq recovered t)
             ))
        (error (message "ediff-pop-diff: %s %s"
                       (car conds)
                       (mapconcat 'prin1-to-string (cdr conds) " "))
              (beep 1)))
             (setq recovered t)
             ))
        (error (message "ediff-pop-diff: %s %s"
                       (car conds)
                       (mapconcat 'prin1-to-string (cdr conds) " "))
              (beep 1)))
-    
+
      ;; Clearing fine diffs is necessary for
      ;; ediff-unselect-and-select-difference to properly recompute them.  We
      ;; can't rely on ediff-copy-diff to clear this vector, as the user might
      ;; Clearing fine diffs is necessary for
      ;; ediff-unselect-and-select-difference to properly recompute them.  We
      ;; can't rely on ediff-copy-diff to clear this vector, as the user might
@@ -2150,20 +2153,20 @@ ARG is a prefix argument.  If nil, copy the current difference region."
      ;; fine diffs.
      (if recovered
         (ediff-clear-fine-differences n))
      ;; fine diffs.
      (if recovered
         (ediff-clear-fine-differences n))
-         
+
      ;; adjust state of difference
      (if (and three-way recovered)
         (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
      ;; adjust state of difference
      (if (and three-way recovered)
         (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
-       
+
      (ediff-refresh-mode-lines)
      (ediff-refresh-mode-lines)
-    
+
      (if recovered
         (progn
           (setq n-th-record (delq saved-rec n-th-record))
           (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
           ))
      ))
      (if recovered
         (progn
           (setq n-th-record (delq saved-rec n-th-record))
           (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
           ))
      ))
-      
+
  (defun ediff-restore-diff  (arg &optional key)
    "Restore ARGth diff from `ediff-killed-diffs-alist'.
  ARG is a prefix argument.  If ARG is nil, restore the current-difference.
  (defun ediff-restore-diff  (arg &optional key)
    "Restore ARGth diff from `ediff-killed-diffs-alist'.
  ARG is a prefix argument.  If ARG is nil, restore the current-difference.
@@ -2173,7 +2176,7 @@ determine the target buffer instead of last-command-char"
    (ediff-barf-if-not-control-buffer)
    (if (numberp arg)
        (ediff-jump-to-difference arg))
    (ediff-barf-if-not-control-buffer)
    (if (numberp arg)
        (ediff-jump-to-difference arg))
-  (ediff-pop-diff ediff-current-difference 
+  (ediff-pop-diff ediff-current-difference
                   (ediff-char-to-buftype (or key last-command-char)))
    ;; recenter with rehighlighting, but no messages
    (let (ediff-verbose-p)
                   (ediff-char-to-buftype (or key last-command-char)))
    ;; recenter with rehighlighting, but no messages
    (let (ediff-verbose-p)
@@ -2184,8 +2187,8 @@ determine the target buffer instead of last-command-char"
  ARG is a prefix argument.  If nil, restore the current diff."
    (interactive "P")
    (ediff-restore-diff arg ?c))
  ARG is a prefix argument.  If nil, restore the current diff."
    (interactive "P")
    (ediff-restore-diff arg ?c))
-  
-  
+
+
  (defun ediff-toggle-regexp-match ()
    "Toggle between focusing and hiding of difference regions that match
  a regular expression typed in by the user."
  (defun ediff-toggle-regexp-match ()
    "Toggle between focusing and hiding of difference regions that match
  a regular expression typed in by the user."
@@ -2206,20 +2209,20 @@ a regular expression typed in by the user."
        (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
       ((eq last-command-char ?h)
        (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
        (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
       ((eq last-command-char ?h)
        (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
-           regexp-A 
+           regexp-A
             (read-string
             (read-string
-            (format 
+            (format
               "Ignore A-regions matching this regexp (default \"%s\"): "
               ediff-regexp-hide-A))
             regexp-B
             (read-string
               "Ignore A-regions matching this regexp (default \"%s\"): "
               ediff-regexp-hide-A))
             regexp-B
             (read-string
-            (format 
+            (format
               "Ignore B-regions matching this regexp (default \"%s\"): "
               ediff-regexp-hide-B)))
        (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
               "Ignore B-regions matching this regexp (default \"%s\"): "
               ediff-regexp-hide-B)))
        (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
-                (format 
+                (format
                   "Ignore C-regions matching this regexp (default \"%s\"): "
                   ediff-regexp-hide-C))))
        (if (eq ediff-hide-regexp-connective 'and)
                   "Ignore C-regions matching this regexp (default \"%s\"): "
                   ediff-regexp-hide-C))))
        (if (eq ediff-hide-regexp-connective 'and)
@@ -2232,11 +2235,11 @@ a regular expression typed in by the user."
        (if (y-or-n-p
            (format
             "Ignore regions that match %s regexps, OK? "
        (if (y-or-n-p
            (format
             "Ignore regions that match %s regexps, OK? "
-           msg-connective alt-msg-connective))
+           msg-connective))
           (message "Will ignore regions that match %s regexps" msg-connective)
         (setq ediff-hide-regexp-connective alt-connective)
         (message "Will ignore regions that match %s regexps"
           (message "Will ignore regions that match %s regexps" msg-connective)
         (setq ediff-hide-regexp-connective alt-connective)
         (message "Will ignore regions that match %s regexps"
-                alt-msg-connective)) 
+                alt-msg-connective))
  
        (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
        (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
  
        (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
        (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
@@ -2245,20 +2248,20 @@ a regular expression typed in by the user."
       ((eq last-command-char ?f)
        (setq ediff-skip-diff-region-function
             ediff-focus-on-regexp-matches-function
       ((eq last-command-char ?f)
        (setq ediff-skip-diff-region-function
             ediff-focus-on-regexp-matches-function
-           regexp-A 
+           regexp-A
             (read-string
             (read-string
-            (format 
+            (format
               "Focus on A-regions matching this regexp (default \"%s\"): "
               ediff-regexp-focus-A))
             regexp-B
             (read-string
               "Focus on A-regions matching this regexp (default \"%s\"): "
               ediff-regexp-focus-A))
             regexp-B
             (read-string
-            (format 
+            (format
               "Focus on B-regions matching this regexp (default \"%s\"): "
               ediff-regexp-focus-B)))
        (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
               "Focus on B-regions matching this regexp (default \"%s\"): "
               ediff-regexp-focus-B)))
        (if ediff-3way-comparison-job
           (setq regexp-C
                 (read-string
-                (format 
+                (format
                   "Focus on C-regions matching this regexp (default \"%s\"): "
                   ediff-regexp-focus-C))))
        (if (eq ediff-focus-regexp-connective 'and)
                   "Focus on C-regions matching this regexp (default \"%s\"): "
                   ediff-regexp-focus-C))))
        (if (eq ediff-focus-regexp-connective 'and)
@@ -2271,17 +2274,17 @@ a regular expression typed in by the user."
        (if (y-or-n-p
            (format
             "Focus on regions that match %s regexps, OK? "
        (if (y-or-n-p
            (format
             "Focus on regions that match %s regexps, OK? "
-           msg-connective alt-msg-connective))
+           msg-connective))
           (message "Will focus on regions that match %s regexps"
                    msg-connective)
         (setq ediff-focus-regexp-connective alt-connective)
           (message "Will focus on regions that match %s regexps"
                    msg-connective)
         (setq ediff-focus-regexp-connective alt-connective)
-       (message "Will focus on regions that match %s regexps" 
+       (message "Will focus on regions that match %s regexps"
                  alt-msg-connective))
  
        (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
        (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
        (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
                  alt-msg-connective))
  
        (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
        (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
        (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
-      
+
  (defun ediff-toggle-skip-similar ()
    (interactive)
    (ediff-barf-if-not-control-buffer)
  (defun ediff-toggle-skip-similar ()
    (interactive)
    (ediff-barf-if-not-control-buffer)
@@ -2293,10 +2296,10 @@ a regular expression typed in by the user."
        (message
         "Skipping regions that differ only in white space & line breaks")
      (message "Skipping over white-space differences turned off")))
        (message
         "Skipping regions that differ only in white space & line breaks")
      (message "Skipping over white-space differences turned off")))
-  
+
  (defun ediff-focus-on-regexp-matches (n)
    "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
  (defun ediff-focus-on-regexp-matches (n)
    "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
-Regions to be ignored according to this function are those where   
+Regions to be ignored according to this function are those where
  buf A region doesn't match `ediff-regexp-focus-A' and buf B region
  doesn't match `ediff-regexp-focus-B'.
  This function returns nil if the region number N (specified as
  buf A region doesn't match `ediff-regexp-focus-A' and buf B region
  doesn't match `ediff-regexp-focus-B'.
  This function returns nil if the region number N (specified as
@@ -2335,8 +2338,8 @@ the number seen by the user."
                      (list ediff-focus-regexp-connective
                            reg-A-match reg-B-match))))
         )))
                      (list ediff-focus-regexp-connective
                            reg-A-match reg-B-match))))
         )))
-  
-(defun ediff-hide-regexp-matches (n)  
+
+(defun ediff-hide-regexp-matches (n)
    "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
  Regions to be ignored are those where buf A region matches
  `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
    "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
  Regions to be ignored are those where buf A region matches
  `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
@@ -2377,7 +2380,7 @@ the number seen by the user."
                         reg-A-match reg-B-match reg-C-match)
                 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
         )))
                         reg-A-match reg-B-match reg-C-match)
                 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
         )))
-    
+
  
  \f
  ;;; Quitting, suspending, etc.
  
  \f
  ;;; Quitting, suspending, etc.
@@ -2389,8 +2392,8 @@ flags of the compared file buffers, kills Ediff buffers for this session
  \(but not buffers A, B, C\).
  
  If `ediff-keep-variants' is nil, the user will be asked whether the buffers
  \(but not buffers A, B, C\).
  
  If `ediff-keep-variants' is nil, the user will be asked whether the buffers
-containing the variants should be removed \(if they haven't been modified\). 
-If it is t, they will be preserved unconditionally.  A prefix argument, 
+containing the variants should be removed \(if they haven't been modified\).
+If it is t, they will be preserved unconditionally.  A prefix argument,
  temporarily reverses the meaning of this variable."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
  temporarily reverses the meaning of this variable."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
@@ -2414,7 +2417,7 @@ temporarily reverses the meaning of this variable."
    (ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also)
  
    (ediff-delete-temp-files)
    (ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also)
  
    (ediff-delete-temp-files)
-                                 
+
    ;; Restore the visibility range.  This affects only ediff-*-regions/windows.
    ;; Since for other job names ediff-visible-region sets
    ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
    ;; Restore the visibility range.  This affects only ediff-*-regions/windows.
    ;; Since for other job names ediff-visible-region sets
    ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
@@ -2422,7 +2425,7 @@ temporarily reverses the meaning of this variable."
    (if ediff-quit-widened
        (setq ediff-visible-bounds ediff-wide-bounds)
      (setq ediff-visible-bounds ediff-narrow-bounds))
    (if ediff-quit-widened
        (setq ediff-visible-bounds ediff-wide-bounds)
      (setq ediff-visible-bounds ediff-narrow-bounds))
-  
+
    ;; Apply selective display to narrow or widen
    (ediff-visible-region)
    (mapcar (lambda (overl)
    ;; Apply selective display to narrow or widen
    (ediff-visible-region)
    (mapcar (lambda (overl)
@@ -2441,32 +2444,32 @@ temporarily reverses the meaning of this variable."
         (session-number ediff-meta-session-number)
         ;; suitable working frame
         (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
         (session-number ediff-meta-session-number)
         ;; suitable working frame
         (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
-                       (cond ((window-live-p ediff-window-A) 
+                       (cond ((window-live-p ediff-window-A)
                                (window-frame ediff-window-A))
                                (window-frame ediff-window-A))
-                             ((window-live-p ediff-window-B) 
+                             ((window-live-p ediff-window-B)
                                (window-frame ediff-window-B))
                               (t (next-frame))))))
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-A
                                (window-frame ediff-window-B))
                               (t (next-frame))))))
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-A
-         (setq ediff-this-buffer-ediff-sessions 
+         (setq ediff-this-buffer-ediff-sessions
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
           )
        (error))
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
           )
        (error))
-      
+
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-B
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-B
-         (setq ediff-this-buffer-ediff-sessions 
+         (setq ediff-this-buffer-ediff-sessions
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
           )
        (error))
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
           )
        (error))
-    
+
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-C
      (condition-case nil
         (ediff-with-current-buffer ediff-buffer-C
-         (setq ediff-this-buffer-ediff-sessions 
+         (setq ediff-this-buffer-ediff-sessions
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
@@ -2475,7 +2478,7 @@ temporarily reverses the meaning of this variable."
  
      (condition-case nil
         (ediff-with-current-buffer ediff-ancestor-buffer
  
      (condition-case nil
         (ediff-with-current-buffer ediff-ancestor-buffer
-         (setq ediff-this-buffer-ediff-sessions 
+         (setq ediff-this-buffer-ediff-sessions
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
                 (delq control-buffer ediff-this-buffer-ediff-sessions))
           (kill-local-variable 'mode-line-buffer-identification)
           (kill-local-variable 'mode-line-format)
@@ -2540,8 +2543,8 @@ temporarily reverses the meaning of this variable."
      (if (string-match "Minibuf" buf-name)
         nil
        frame)))
      (if (string-match "Minibuf" buf-name)
         nil
        frame)))
-  
-  
+
+
  (defun ediff-delete-temp-files ()
    (if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A))
        (delete-file ediff-temp-file-A))
  (defun ediff-delete-temp-files ()
    (if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A))
        (delete-file ediff-temp-file-A))
@@ -2549,7 +2552,7 @@ temporarily reverses the meaning of this variable."
        (delete-file ediff-temp-file-B))
    (if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C))
        (delete-file ediff-temp-file-C)))
        (delete-file ediff-temp-file-B))
    (if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C))
        (delete-file ediff-temp-file-C)))
-  
+
  
  ;; Kill control buffer, other auxiliary Ediff buffers.
  ;; Leave one of the frames split between buffers A/B/C
  
  ;; Kill control buffer, other auxiliary Ediff buffers.
  ;; Leave one of the frames split between buffers A/B/C
@@ -2561,11 +2564,11 @@ temporarily reverses the meaning of this variable."
          (ctl-wind  (ediff-get-visible-buffer-window ctl-buf))
          (ctl-frame ediff-control-frame)
          (three-way-job ediff-3way-job)
          (ctl-wind  (ediff-get-visible-buffer-window ctl-buf))
          (ctl-frame ediff-control-frame)
          (three-way-job ediff-3way-job)
-        (main-frame (cond ((window-live-p ediff-window-A) 
+        (main-frame (cond ((window-live-p ediff-window-A)
                             (window-frame ediff-window-A))
                             (window-frame ediff-window-A))
-                          ((window-live-p ediff-window-B) 
+                          ((window-live-p ediff-window-B)
                             (window-frame ediff-window-B)))))
                             (window-frame ediff-window-B)))))
-    
+
      (ediff-kill-buffer-carefully ediff-diff-buffer)
      (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
      (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
      (ediff-kill-buffer-carefully ediff-diff-buffer)
      (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
      (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
@@ -2587,10 +2590,10 @@ temporarily reverses the meaning of this variable."
         (ediff-kill-bottom-toolbar))
  
      (ediff-kill-buffer-carefully ctl-buf)
         (ediff-kill-bottom-toolbar))
  
      (ediff-kill-buffer-carefully ctl-buf)
-      
+
      (if (frame-live-p main-frame)
         (select-frame main-frame))
      (if (frame-live-p main-frame)
         (select-frame main-frame))
-    
+
      ;; display only if not visible
      (condition-case nil
         (or (ediff-get-visible-buffer-window buff-B)
      ;; display only if not visible
      (condition-case nil
         (or (ediff-get-visible-buffer-window buff-B)
@@ -2651,7 +2654,7 @@ delete this buffer in another session as well."
         ;; Kill indirect buffer even if it is modified, because the base buffer
         ;; is still there. Note that if the base buffer is dead then so will be
         ;; the indirect buffer
         ;; Kill indirect buffer even if it is modified, because the base buffer
         ;; is still there. Note that if the base buffer is dead then so will be
         ;; the indirect buffer
-       (ediff-with-current-buffer buff 
+       (ediff-with-current-buffer buff
           (set-buffer-modified-p nil))
         (ediff-kill-buffer-carefully buff)
         (ediff-with-current-buffer base
           (set-buffer-modified-p nil))
         (ediff-kill-buffer-carefully buff)
         (ediff-with-current-buffer base
@@ -2690,7 +2693,7 @@ only if this merge job is part of a group, i.e., was invoked from within
               ((eq ediff-autostore-merges t)
                ;; ask for file name
                (setq merge-store-file
               ((eq ediff-autostore-merges t)
                ;; ask for file name
                (setq merge-store-file
-                    (read-file-name "Save the merge buffer in file: "))
+                    (read-file-name "Save the result of the merge in file: "))
                (ediff-write-merge-buffer-and-maybe-kill
                 ediff-buffer-C merge-store-file nil save-and-continue))
               ((and (ediff-buffer-live-p ediff-meta-buffer)
                (ediff-write-merge-buffer-and-maybe-kill
                 ediff-buffer-C merge-store-file nil save-and-continue))
               ((and (ediff-buffer-live-p ediff-meta-buffer)
@@ -2752,11 +2755,11 @@ only if this merge job is part of a group, i.e., was invoked from within
          (buf-diff ediff-diff-buffer)
          (buf-custom-diff ediff-custom-diff-buffer)
          (buf-fine-diff ediff-fine-diff-buffer))
          (buf-diff ediff-diff-buffer)
          (buf-custom-diff ediff-custom-diff-buffer)
          (buf-fine-diff ediff-fine-diff-buffer))
-    
+
      ;; hide the control panel
      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
         (iconify-frame ediff-control-frame)
      ;; hide the control panel
      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
         (iconify-frame ediff-control-frame)
-      (bury-buffer)) 
+      (bury-buffer))
      (if buf-err (bury-buffer buf-err))
      (if buf-diff (bury-buffer buf-diff))
      (if buf-custom-diff (bury-buffer buf-custom-diff))
      (if buf-err (bury-buffer buf-err))
      (if buf-diff (bury-buffer buf-diff))
      (if buf-custom-diff (bury-buffer buf-custom-diff))
@@ -2792,7 +2795,7 @@ only if this merge job is part of a group, i.e., was invoked from within
             (bury-buffer))))
      ))
  
             (bury-buffer))))
      ))
  
-     
+
  (defun ediff-suspend ()
    "Suspend Ediff.
  To resume, switch to the appropriate `Ediff Control Panel'
  (defun ediff-suspend ()
    "Suspend Ediff.
  To resume, switch to the appropriate `Ediff Control Panel'
@@ -2822,20 +2825,20 @@ Hit \\[ediff-recenter] to reset the windows afterward."
        (if buffer-file-name
           (princ
            (format "File A = %S\n" buffer-file-name))
        (if buffer-file-name
           (princ
            (format "File A = %S\n" buffer-file-name))
-       (princ 
+       (princ
          (format "Buffer A = %S\n" (buffer-name)))))
      (ediff-with-current-buffer ediff-buffer-B
        (if buffer-file-name
           (princ
            (format "File B = %S\n" buffer-file-name))
          (format "Buffer A = %S\n" (buffer-name)))))
      (ediff-with-current-buffer ediff-buffer-B
        (if buffer-file-name
           (princ
            (format "File B = %S\n" buffer-file-name))
-       (princ 
+       (princ
          (format "Buffer B = %S\n" (buffer-name)))))
      (if ediff-3way-job
         (ediff-with-current-buffer ediff-buffer-C
           (if buffer-file-name
               (princ
                (format "File C = %S\n" buffer-file-name))
          (format "Buffer B = %S\n" (buffer-name)))))
      (if ediff-3way-job
         (ediff-with-current-buffer ediff-buffer-C
           (if buffer-file-name
               (princ
                (format "File C = %S\n" buffer-file-name))
-           (princ 
+           (princ
              (format "Buffer C = %S\n" (buffer-name))))))
      (princ (format "Customized diff output %s\n"
                    (if (ediff-buffer-live-p ediff-custom-diff-buffer)
              (format "Buffer C = %S\n" (buffer-name))))))
      (princ (format "Customized diff output %s\n"
                    (if (ediff-buffer-live-p ediff-custom-diff-buffer)
@@ -2847,7 +2850,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                        (concat "\tin buffer "
                                (buffer-name ediff-diff-buffer))
                      " is not available")))
                        (concat "\tin buffer "
                                (buffer-name ediff-diff-buffer))
                      " is not available")))
-                             
+
      (let* ((A-line (ediff-with-current-buffer ediff-buffer-A
                      (1+ (count-lines (point-min) (point)))))
            (B-line (ediff-with-current-buffer ediff-buffer-B
      (let* ((A-line (ediff-with-current-buffer ediff-buffer-A
                      (1+ (count-lines (point-min) (point)))))
            (B-line (ediff-with-current-buffer ediff-buffer-B
@@ -2860,7 +2863,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
             (setq C-line (ediff-with-current-buffer ediff-buffer-C
                            (1+ (count-lines (point-min) (point)))))
             (princ (format "Buffer C's point is on line %d\n" C-line)))))
             (setq C-line (ediff-with-current-buffer ediff-buffer-C
                            (1+ (count-lines (point-min) (point)))))
             (princ (format "Buffer C's point is on line %d\n" C-line)))))
-      
+
      (princ (format "\nCurrent difference number = %S\n"
                    (cond ((< ediff-current-difference 0) 'start)
                          ((>= ediff-current-difference
      (princ (format "\nCurrent difference number = %S\n"
                    (cond ((< ediff-current-difference 0) 'start)
                          ((>= ediff-current-difference
@@ -2877,7 +2880,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
      (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
         (princ
          "\nSkipping merge regions that differ from default setting"))
      (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
         (princ
          "\nSkipping merge regions that differ from default setting"))
-    
+
      (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
            (princ "\nSelective browsing by regexp is off\n"))
           ((eq ediff-skip-diff-region-function
      (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
            (princ "\nSelective browsing by regexp is off\n"))
           ((eq ediff-skip-diff-region-function
@@ -2885,7 +2888,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
            (princ
             "\nIgnoring regions that match")
            (princ
            (princ
             "\nIgnoring regions that match")
            (princ
-           (format 
+           (format
              "\n\t regexp `%s' in buffer A  %S\n\t regexp `%s' in buffer B\n"
              ediff-regexp-hide-A ediff-hide-regexp-connective
              ediff-regexp-hide-B)))
              "\n\t regexp `%s' in buffer A  %S\n\t regexp `%s' in buffer B\n"
              ediff-regexp-hide-A ediff-hide-regexp-connective
              ediff-regexp-hide-B)))
@@ -2899,7 +2902,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
              ediff-regexp-focus-A ediff-focus-regexp-connective
              ediff-regexp-focus-B)))
           (t (princ "\nSelective browsing via a user-defined method.\n")))
              ediff-regexp-focus-A ediff-focus-regexp-connective
              ediff-regexp-focus-B)))
           (t (princ "\nSelective browsing via a user-defined method.\n")))
-    
+
      (princ
       (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
              (substitute-command-keys "\\[ediff-submit-report]")))
      (princ
       (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
              (substitute-command-keys "\\[ediff-submit-report]")))
@@ -2908,7 +2911,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
        (ediff-reset-mouse ediff-control-frame))
    (if (window-live-p ediff-control-window)
        (select-window ediff-control-window)))
        (ediff-reset-mouse ediff-control-frame))
    (if (window-live-p ediff-control-window)
        (select-window ediff-control-window)))
-    
+
  
  
  \f
  
  
  \f
@@ -2937,17 +2940,19 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                  (ediff-place-flags-in-buffer
                   'Ancestor ediff-ancestor-buffer
                   ediff-control-buffer n))
                  (ediff-place-flags-in-buffer
                   'Ancestor ediff-ancestor-buffer
                   ediff-control-buffer n))
-            )) 
-                                      
+            ))
+
         (ediff-install-fine-diff-if-necessary n)
         (ediff-install-fine-diff-if-necessary n)
+       ;; set current difference here so the hook will be able to refer to it
+       (setq ediff-current-difference n)
         (run-hooks 'ediff-select-hook))))
         (run-hooks 'ediff-select-hook))))
-       
+
  
  ;; Unselect a difference by removing the ASCII flags in the buffers.
  ;; This may have to be modified for buffer C, when it will be supported.
  (defun ediff-unselect-difference (n)
    (if (ediff-valid-difference-p n)
  
  ;; Unselect a difference by removing the ASCII flags in the buffers.
  ;; This may have to be modified for buffer C, when it will be supported.
  (defun ediff-unselect-difference (n)
    (if (ediff-valid-difference-p n)
-      (progn 
+      (progn
         (cond ((and (ediff-has-face-support-p) ediff-use-faces)
                (ediff-unhighlight-diff))
               ((eq ediff-highlighting-style 'ascii)
         (cond ((and (ediff-has-face-support-p) ediff-use-faces)
                (ediff-unhighlight-diff))
               ((eq ediff-highlighting-style 'ascii)
@@ -2966,11 +2971,11 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                     ediff-ancestor-buffer
                     (ediff-get-diff-overlay n 'Ancestor)))
                ))
                     ediff-ancestor-buffer
                     (ediff-get-diff-overlay n 'Ancestor)))
                ))
-       
+
         ;; unhighlight fine diffs
         (ediff-set-fine-diff-properties ediff-current-difference 'default)
         (run-hooks 'ediff-unselect-hook))))
         ;; unhighlight fine diffs
         (ediff-set-fine-diff-properties ediff-current-difference 'default)
         (run-hooks 'ediff-unselect-hook))))
-  
+
  
  ;; Unselects prev diff and selects a new one, if FLAG has value other than
  ;; 'select-only or 'unselect-only.  If FLAG is 'select-only, the
  
  ;; Unselects prev diff and selects a new one, if FLAG has value other than
  ;; 'select-only or 'unselect-only.  If FLAG is 'select-only, the
@@ -2982,18 +2987,21 @@ Hit \\[ediff-recenter] to reset the windows afterward."
    (let ((ediff-current-difference n))
      (or no-recenter
         (ediff-recenter 'no-rehighlight)))
    (let ((ediff-current-difference n))
      (or no-recenter
         (ediff-recenter 'no-rehighlight)))
-         
+
    (let ((control-buf ediff-control-buffer))
    (let ((control-buf ediff-control-buffer))
-    (unwind-protect    
+    (unwind-protect
         (progn
           (or (eq flag 'select-only)
               (ediff-unselect-difference ediff-current-difference))
         (progn
           (or (eq flag 'select-only)
               (ediff-unselect-difference ediff-current-difference))
-         
+
           (or (eq flag 'unselect-only)
               (ediff-select-difference n))
           (or (eq flag 'unselect-only)
               (ediff-select-difference n))
+         ;; need to set current diff here even though it is also set in
+         ;; ediff-select-difference because ediff-select-difference might not
+         ;; be called if unselect-only is specified
           (setq ediff-current-difference n)
           ) ; end protected section
           (setq ediff-current-difference n)
           ) ; end protected section
-      
+
        (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
      ))
  
        (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
      ))
  
@@ -3133,8 +3141,8 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                  (file-name-nondirectory default-file) f)))
      (if (and no-dirs (file-directory-p f))
         (error "File %s is a directory" f))
                  (file-name-nondirectory default-file) f)))
      (if (and no-dirs (file-directory-p f))
         (error "File %s is a directory" f))
-    f)) 
-  
+    f))
+
  ;; If PREFIX is given, then it is used as a prefix for the temp file
  ;; name.  Otherwise, `ediff' is used.  If FILE is given, use this
  ;; file and don't create a new one.
  ;; If PREFIX is given, then it is used as a prefix for the temp file
  ;; name.  Otherwise, `ediff' is used.  If FILE is given, use this
  ;; file and don't create a new one.
@@ -3151,7 +3159,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
              (not (msdos-long-file-names))
              (> (length p) 2))
         (setq short-p (substring p 0 2)))
              (not (msdos-long-file-names))
              (> (length p) 2))
         (setq short-p (substring p 0 2)))
-    
+
      (setq f (concat ediff-temp-file-prefix p)
           short-f (concat ediff-temp-file-prefix short-p)
           f (cond (given-file)
      (setq f (concat ediff-temp-file-prefix p)
           short-f (concat ediff-temp-file-prefix short-p)
           f (cond (given-file)
@@ -3161,7 +3169,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                    ;; This is needed so that patches produced by ediff will
                    ;; have more meaningful names
                    (ediff-make-empty-tmp-file short-f))
                    ;; This is needed so that patches produced by ediff will
                    ;; have more meaningful names
                    (ediff-make-empty-tmp-file short-f))
-                 (prefix 
+                 (prefix
                    ;; Prefix is most often the same as the file name for the
                    ;; variant.  Here we are trying to use the original file
                    ;; name but in the temp directory.
                    ;; Prefix is most often the same as the file name for the
                    ;; variant.  Here we are trying to use the original file
                    ;; name but in the temp directory.
@@ -3170,14 +3178,14 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                    ;; If don't care about name, add some random stuff
                    ;; to proposed file name.
                    (ediff-make-empty-tmp-file short-f))))
                    ;; If don't care about name, add some random stuff
                    ;; to proposed file name.
                    (ediff-make-empty-tmp-file short-f))))
-    
+
      ;; create the file
      (ediff-with-current-buffer buff
        (write-region (if start start (point-min))
                     (if end end (point-max))
                     f
                     nil          ; don't append---erase
      ;; create the file
      (ediff-with-current-buffer buff
        (write-region (if start start (point-min))
                     (if end end (point-max))
                     f
                     nil          ; don't append---erase
-                   'no-message) 
+                   'no-message)
        (set-file-modes f ediff-temp-file-mode)
        (expand-file-name f))))
  
        (set-file-modes f ediff-temp-file-mode)
        (expand-file-name f))))
  
@@ -3232,7 +3240,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
    (if (verify-visited-file-modtime (current-buffer))
        (if (buffer-modified-p)
           ;; If buffer is not obsolete and is modified, offer to save
    (if (verify-visited-file-modtime (current-buffer))
        (if (buffer-modified-p)
           ;; If buffer is not obsolete and is modified, offer to save
-         (if (yes-or-no-p 
+         (if (yes-or-no-p
                (format "Buffer %s has been modified. Save it in file %s? "
                        (buffer-name)
                        buffer-file-name))
                (format "Buffer %s has been modified. Save it in file %s? "
                        (buffer-name)
                        buffer-file-name))
@@ -3371,7 +3379,7 @@ Without an argument, it saves customized diff argument, if available
        (set-mark reg-end)
        (setq ediff-temp-indirect-buffer t))
      cloned-buff))
        (set-mark reg-end)
        (setq ediff-temp-indirect-buffer t))
      cloned-buff))
-  
+
  
  
  (defun ediff-make-cloned-buffer (buff region-name)
  
  
  (defun ediff-make-cloned-buffer (buff region-name)
@@ -3393,29 +3401,33 @@ Without an argument, it saves customized diff argument, if available
    (let ((buf-A-file-name (buffer-file-name ediff-buffer-A))
         (buf-B-file-name (buffer-file-name ediff-buffer-B))
         file-A file-B)
    (let ((buf-A-file-name (buffer-file-name ediff-buffer-A))
         (buf-B-file-name (buffer-file-name ediff-buffer-B))
         file-A file-B)
-    (if (stringp buf-A-file-name)
-       (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
-    (if (stringp buf-B-file-name)
-       (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
-    (setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)
-         file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
-                        
+    (unless (and buf-A-file-name (file-exists-p buf-A-file-name))
+      (setq file-A
+           (ediff-make-temp-file ediff-buffer-A)))
+    (unless (and buf-B-file-name (file-exists-p buf-B-file-name))
+      (setq file-B
+           (ediff-make-temp-file ediff-buffer-B)))
      (or (ediff-buffer-live-p ediff-custom-diff-buffer)
         (setq ediff-custom-diff-buffer
               (get-buffer-create
                (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
      (ediff-with-current-buffer ediff-custom-diff-buffer
      (or (ediff-buffer-live-p ediff-custom-diff-buffer)
         (setq ediff-custom-diff-buffer
               (get-buffer-create
                (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
      (ediff-with-current-buffer ediff-custom-diff-buffer
-      (setq buffer-read-only nil)
-      (erase-buffer))
+                              (setq buffer-read-only nil)
+                              (erase-buffer))
      (ediff-exec-process
       ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
      (ediff-exec-process
       ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
-     ediff-custom-diff-options file-A file-B)
+     ediff-custom-diff-options
+     ;; repetition of buf-A-file-name is needed so it'll return a file
+     (or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name)
+        file-A)
+     (or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name)
+        file-B))
      ;; put the diff file in diff-mode, if it is available
      (if (fboundp 'diff-mode)
         (with-current-buffer ediff-custom-diff-buffer
           (diff-mode)))
      ;; put the diff file in diff-mode, if it is available
      (if (fboundp 'diff-mode)
         (with-current-buffer ediff-custom-diff-buffer
           (diff-mode)))
-    (delete-file file-A)
-    (delete-file file-B)
+    (and file-A (file-exists-p file-A) (delete-file file-A))
+    (and file-B (file-exists-p file-B) (delete-file file-B))
      ))
  
  (defun ediff-show-diff-output (arg)
      ))
  
  (defun ediff-show-diff-output (arg)
@@ -3498,7 +3510,7 @@ Ediff Control Panel to restore highlighting."
                          nil)
                         ((equal answer ""))
                         (t (beep 1)
                          nil)
                         ((equal answer ""))
                         (t (beep 1)
-                          (message 
+                          (message
                             "Valid values are %s"
                             (mapconcat 'char-to-string possibilities " or "))
                            (sit-for 2)
                             "Valid values are %s"
                             (mapconcat 'char-to-string possibilities " or "))
                            (sit-for 2)
@@ -3517,7 +3529,7 @@ Ediff Control Panel to restore highlighting."
                          nil)
                         ((equal answer ""))
                         (t (beep 1)
                          nil)
                         ((equal answer ""))
                         (t (beep 1)
-                          (message 
+                          (message
                             "Valid values are %s"
                             (mapconcat 'char-to-string possibilities " or "))
                            (sit-for 2)
                             "Valid values are %s"
                             (mapconcat 'char-to-string possibilities " or "))
                            (sit-for 2)
@@ -3577,8 +3589,8 @@ Ediff Control Panel to restore highlighting."
       ;; setup param to pass to ediff-setup
       (list (cons 'ediff-split-window-function ediff-split-window-function)))
      ))
       ;; setup param to pass to ediff-setup
       (list (cons 'ediff-split-window-function ediff-split-window-function)))
      ))
-      
-    
+
+
  
  (defun ediff-remove-flags-from-buffer (buffer overlay)
    (ediff-with-current-buffer buffer
  
  (defun ediff-remove-flags-from-buffer (buffer overlay)
    (ediff-with-current-buffer buffer
@@ -3586,7 +3598,7 @@ Ediff Control Panel to restore highlighting."
        (if ediff-xemacs-p
           (ediff-overlay-put overlay 'begin-glyph nil)
         (ediff-overlay-put overlay 'before-string nil))
        (if ediff-xemacs-p
           (ediff-overlay-put overlay 'begin-glyph nil)
         (ediff-overlay-put overlay 'before-string nil))
-      
+
        (if ediff-xemacs-p
           (ediff-overlay-put overlay 'end-glyph nil)
         (ediff-overlay-put overlay 'after-string nil))
        (if ediff-xemacs-p
           (ediff-overlay-put overlay 'end-glyph nil)
         (ediff-overlay-put overlay 'after-string nil))
@@ -3604,32 +3616,32 @@ Ediff Control Panel to restore highlighting."
                        (ediff-get-diff-overlay diff-no buf-type)))
          (before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer))
          after beg-of-line flag)
                        (ediff-get-diff-overlay diff-no buf-type)))
          (before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer))
          after beg-of-line flag)
-       
+
      ;; insert flag before the difference
      (goto-char before)
      (setq beg-of-line (bolp))
      ;; insert flag before the difference
      (goto-char before)
      (setq beg-of-line (bolp))
-    
+
      (setq flag (ediff-with-current-buffer ctl-buffer
                  (if (eq ediff-highlighting-style 'ascii)
                      (if beg-of-line
                          ediff-before-flag-bol ediff-before-flag-mol))))
      (setq flag (ediff-with-current-buffer ctl-buffer
                  (if (eq ediff-highlighting-style 'ascii)
                      (if beg-of-line
                          ediff-before-flag-bol ediff-before-flag-mol))))
-    
+
      ;; insert the flag itself
      (if ediff-xemacs-p
         (ediff-overlay-put curr-overl 'begin-glyph flag)
        (ediff-overlay-put curr-overl 'before-string flag))
      ;; insert the flag itself
      (if ediff-xemacs-p
         (ediff-overlay-put curr-overl 'begin-glyph flag)
        (ediff-overlay-put curr-overl 'before-string flag))
-    
+
      ;; insert the flag after the difference
      ;; `after' must be set here, after the before-flag was inserted
      (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
      (goto-char after)
      (setq beg-of-line (bolp))
      ;; insert the flag after the difference
      ;; `after' must be set here, after the before-flag was inserted
      (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
      (goto-char after)
      (setq beg-of-line (bolp))
-    
+
      (setq flag (ediff-with-current-buffer ctl-buffer
                  (if (eq ediff-highlighting-style 'ascii)
                      (if beg-of-line
                          ediff-after-flag-eol ediff-after-flag-mol))))
      (setq flag (ediff-with-current-buffer ctl-buffer
                  (if (eq ediff-highlighting-style 'ascii)
                      (if beg-of-line
                          ediff-after-flag-eol ediff-after-flag-mol))))
-    
+
      ;; insert the flag itself
      (if ediff-xemacs-p
         (ediff-overlay-put curr-overl 'end-glyph flag)
      ;; insert the flag itself
      (if ediff-xemacs-p
         (ediff-overlay-put curr-overl 'end-glyph flag)
@@ -3670,12 +3682,12 @@ Ediff Control Panel to restore highlighting."
      (buffer-substring
       (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
       (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
      (buffer-substring
       (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
       (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
-  
+
  ;; Returns positions of difference sectors in the BUF-TYPE buffer.
  ;; Returns positions of difference sectors in the BUF-TYPE buffer.
-;; BUF-TYPE should be a symbol -- `A', `B', or `C'. 
+;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
  ;; POS is either `beg' or `end'--it specifies whether you want the position at
  ;; the beginning of a difference or at the end.
  ;; POS is either `beg' or `end'--it specifies whether you want the position at
  ;; the beginning of a difference or at the end.
-;; 
+;;
  ;; The optional argument N says which difference (default:
  ;; `ediff-current-difference').  N is the internal difference number (1- what
  ;; the user sees).  The optional argument CONTROL-BUF says
  ;; The optional argument N says which difference (default:
  ;; `ediff-current-difference').  N is the internal difference number (1- what
  ;; the user sees).  The optional argument CONTROL-BUF says
@@ -3706,21 +3718,21 @@ Ediff Control Panel to restore highlighting."
  ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
  (defun ediff-restore-highlighting (&optional ctl-buf)
    (ediff-with-current-buffer (or ctl-buf (current-buffer))
  ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
  (defun ediff-restore-highlighting (&optional ctl-buf)
    (ediff-with-current-buffer (or ctl-buf (current-buffer))
-    (if (and (ediff-has-face-support-p) 
+    (if (and (ediff-has-face-support-p)
              ediff-use-faces
              ediff-highlight-all-diffs)
         (ediff-paint-background-regions))
      (ediff-select-difference ediff-current-difference)))
  
  
              ediff-use-faces
              ediff-highlight-all-diffs)
         (ediff-paint-background-regions))
      (ediff-select-difference ediff-current-difference)))
  
  
-    
+
  ;; null out difference overlays so they won't slow down future
  ;; editing operations
  ;; VEC is either a difference vector or a fine-diff vector
  (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
    (if (vectorp (symbol-value vec-var))
        (mapcar (lambda (elt)
  ;; null out difference overlays so they won't slow down future
  ;; editing operations
  ;; VEC is either a difference vector or a fine-diff vector
  (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
    (if (vectorp (symbol-value vec-var))
        (mapcar (lambda (elt)
-               (ediff-delete-overlay 
+               (ediff-delete-overlay
                  (ediff-get-diff-overlay-from-diff-record elt))
                 (if fine-diffs-also
                     (ediff-clear-fine-diff-vector elt))
                  (ediff-get-diff-overlay-from-diff-record elt))
                 (if fine-diffs-also
                     (ediff-clear-fine-diff-vector elt))
@@ -3729,7 +3741,7 @@ Ediff Control Panel to restore highlighting."
    ;; allow them to be garbage collected
    (set vec-var nil))
  
    ;; allow them to be garbage collected
    (set vec-var nil))
  
-       
+
  \f
  ;;; Misc
  
  \f
  ;;; Misc
  
@@ -3749,13 +3761,13 @@ Ediff Control Panel to restore highlighting."
               (setq beg (eval beg)))
           (or (number-or-marker-p end)
               (setq end (eval end)))
               (setq beg (eval beg)))
           (or (number-or-marker-p end)
               (setq end (eval end)))
-         (setq overl 
+         (setq overl
                 (ediff-cond-compile-for-xemacs-or-emacs
                  (make-extent beg end buff)                     ; xemacs
                  ;; advance front and rear of the overlay
                  (make-overlay beg end buff nil 'rear-advance)  ; emacs
                  ))
                 (ediff-cond-compile-for-xemacs-or-emacs
                  (make-extent beg end buff)                     ; xemacs
                  ;; advance front and rear of the overlay
                  (make-overlay beg end buff nil 'rear-advance)  ; emacs
                  ))
-         
+
           ;; never detach
           (ediff-overlay-put
            overl (if ediff-emacs-p 'evaporate 'detachable) nil)
           ;; never detach
           (ediff-overlay-put
            overl (if ediff-emacs-p 'evaporate 'detachable) nil)
@@ -3763,7 +3775,7 @@ Ediff Control Panel to restore highlighting."
           ;; In emacs, it is made open ended at creation time
           (if ediff-xemacs-p
               (progn
           ;; In emacs, it is made open ended at creation time
           (if ediff-xemacs-p
               (progn
-               (ediff-overlay-put overl 'start-open nil) 
+               (ediff-overlay-put overl 'start-open nil)
                 (ediff-overlay-put overl 'end-open nil)))
           (ediff-overlay-put overl 'ediff-diff-num 0)
           overl))))
                 (ediff-overlay-put overl 'end-open nil)))
           (ediff-overlay-put overl 'ediff-diff-num 0)
           overl))))
@@ -3783,13 +3795,13 @@ Ediff Control Panel to restore highlighting."
         (ediff-set-overlay-face (symbol-value overlay) face)
         (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
      ))
         (ediff-set-overlay-face (symbol-value overlay) face)
         (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
      ))
-         
-  
+
+
  ;; Like other-buffer, but prefers visible buffers and ignores temporary or
  ;; other insignificant buffers (those beginning with "^[ *]").
  ;; Gets one arg--buffer name or a list of buffer names (it won't return
  ;; these buffers).
  ;; Like other-buffer, but prefers visible buffers and ignores temporary or
  ;; other insignificant buffers (those beginning with "^[ *]").
  ;; Gets one arg--buffer name or a list of buffer names (it won't return
  ;; these buffers).
-;; EXCL-BUFF-LIST is an exclusion list. 
+;; EXCL-BUFF-LIST is an exclusion list.
  (defun ediff-other-buffer (excl-buff-lst)
    (or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst)))
    (let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list)))
  (defun ediff-other-buffer (excl-buff-lst)
    (or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst)))
    (let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list)))
@@ -3799,8 +3811,8 @@ Ediff Control Panel to restore highlighting."
          (selected-buffers (ediff-get-selected-buffers))
          (prefered-buffer (car all-buffers))
          visible-dired-buffers
          (selected-buffers (ediff-get-selected-buffers))
          (prefered-buffer (car all-buffers))
          visible-dired-buffers
-        (excl-buff-name-list 
-         (mapcar 
+        (excl-buff-name-list
+         (mapcar
            (lambda (b) (cond ((stringp b) b)
                              ((bufferp b) (buffer-name b))))
            excl-buff-lst))
            (lambda (b) (cond ((stringp b) b)
                              ((bufferp b) (buffer-name b))))
            excl-buff-lst))
@@ -3857,10 +3869,10 @@ Ediff Control Panel to restore highlighting."
          (clean-significant-buffers (delq nil significant-buffers))
          less-significant-buffers)
  
          (clean-significant-buffers (delq nil significant-buffers))
          less-significant-buffers)
  
-    (if (and (null clean-significant-buffers) 
+    (if (and (null clean-significant-buffers)
              (> (length visible-dired-buffers) 0))
         (setq clean-significant-buffers visible-dired-buffers))
              (> (length visible-dired-buffers) 0))
         (setq clean-significant-buffers visible-dired-buffers))
-        
+
      (cond (clean-significant-buffers (car clean-significant-buffers))
           ;; try also buffers that are not displayed in windows
           ((setq less-significant-buffers
      (cond (clean-significant-buffers (car clean-significant-buffers))
           ;; try also buffers that are not displayed in windows
           ((setq less-significant-buffers
@@ -3884,7 +3896,7 @@ Ediff Control Panel to restore highlighting."
            (car less-significant-buffers))
           (t "*scratch*"))
      ))
            (car less-significant-buffers))
           (t "*scratch*"))
      ))
-      
+
  
  ;; If current buffer is a Buffer-menu buffer, then take the selected buffers
  ;; and append the buffer at the cursor to the end.
  
  ;; If current buffer is a Buffer-menu buffer, then take the selected buffers
  ;; and append the buffer at the cursor to the end.
@@ -3902,9 +3914,9 @@ Ediff Control Panel to restore highlighting."
             (setq lis (cons (Buffer-menu-buffer t) lis)))
           lis))
      ))
             (setq lis (cons (Buffer-menu-buffer t) lis)))
           lis))
      ))
-      
+
  ;; Construct a unique buffer name.
  ;; Construct a unique buffer name.
-;; The first one tried is prefixsuffix, then prefix<2>suffix, 
+;; The first one tried is prefixsuffix, then prefix<2>suffix,
  ;; prefix<3>suffix, etc.
  (defun ediff-unique-buffer-name (prefix suffix)
    (if (null (get-buffer (concat prefix suffix)))
  ;; prefix<3>suffix, etc.
  (defun ediff-unique-buffer-name (prefix suffix)
    (if (null (get-buffer (concat prefix suffix)))
@@ -3913,7 +3925,7 @@ Ediff Control Panel to restore highlighting."
        (while (get-buffer (format "%s<%d>%s" prefix n suffix))
         (setq n (1+ n)))
        (format "%s<%d>%s" prefix n suffix))))
        (while (get-buffer (format "%s<%d>%s" prefix n suffix))
         (setq n (1+ n)))
        (format "%s<%d>%s" prefix n suffix))))
-  
+
  
  (defun ediff-submit-report ()
    "Submit bug report on Ediff."
  
  (defun ediff-submit-report ()
    "Submit bug report on Ediff."
@@ -3926,7 +3938,7 @@ Ediff Control Panel to restore highlighting."
      (setq varlist '(ediff-diff-program ediff-diff-options
                     ediff-patch-program ediff-patch-options
                     ediff-shell
      (setq varlist '(ediff-diff-program ediff-diff-options
                     ediff-patch-program ediff-patch-options
                     ediff-shell
-                   ediff-use-faces 
+                   ediff-use-faces
                     ediff-auto-refine ediff-highlighting-style
                     ediff-buffer-A ediff-buffer-B ediff-control-buffer
                     ediff-forward-word-function
                     ediff-auto-refine ediff-highlighting-style
                     ediff-buffer-A ediff-buffer-B ediff-control-buffer
                     ediff-forward-word-function
@@ -3948,10 +3960,10 @@ Please make a concise and accurate summary of what happened
  and mail it to the address above.
  -----------------------------------------------------------
  ")
  and mail it to the address above.
  -----------------------------------------------------------
  ")
-    
+
      (ediff-skip-unsuitable-frames)
      (ediff-reset-mouse)
      (ediff-skip-unsuitable-frames)
      (ediff-reset-mouse)
-    
+
      (switch-to-buffer ediff-msg-buffer)
      (erase-buffer)
      (delete-other-windows)
      (switch-to-buffer ediff-msg-buffer)
      (erase-buffer)
      (delete-other-windows)
@@ -3978,7 +3990,7 @@ byte-compilation may produce output like this:
          ** reference to free variable pm-color-alist
            ........................
         While compiling the end of the data:
          ** reference to free variable pm-color-alist
            ........................
         While compiling the end of the data:
-        ** The following functions are not known to be defined: 
+        ** The following functions are not known to be defined:
            ediff-valid-color-p, ediff-set-face,
            ........................
  
            ediff-valid-color-p, ediff-set-face,
            ........................
  
@@ -3988,7 +4000,7 @@ Please do not report those and similar things.  However, comments and
  suggestions are always welcome.
  
  Mail anyway? (y or n) ")
  suggestions are always welcome.
  
  Mail anyway? (y or n) ")
-      
+
      (if (y-or-n-p "Mail anyway? ")
         (progn
           (if (ediff-buffer-live-p ctl-buf)
      (if (y-or-n-p "Mail anyway? ")
         (progn
           (if (ediff-buffer-live-p ctl-buf)
@@ -3998,7 +4010,7 @@ Mail anyway? (y or n) ")
           (reporter-submit-bug-report "kifer@cs.stonybrook.edu"
                                       (ediff-version)
                                       varlist
           (reporter-submit-bug-report "kifer@cs.stonybrook.edu"
                                       (ediff-version)
                                       varlist
-                                     nil 
+                                     nil
                                       'delete-other-windows
                                       salutation))
        (bury-buffer)
                                       'delete-other-windows
                                       salutation))
        (bury-buffer)
@@ -4018,16 +4030,16 @@ Mail anyway? (y or n) ")
  (defun ediff-choose-syntax-table ()
    (setq ediff-syntax-table
         (ediff-with-current-buffer ediff-buffer-A
  (defun ediff-choose-syntax-table ()
    (setq ediff-syntax-table
         (ediff-with-current-buffer ediff-buffer-A
-         (if (not (memq major-mode 
+         (if (not (memq major-mode
                          '(fundamental-mode text-mode indented-text-mode)))
               (syntax-table))))
    (if (not ediff-syntax-table)
                          '(fundamental-mode text-mode indented-text-mode)))
               (syntax-table))))
    (if (not ediff-syntax-table)
-      (setq ediff-syntax-table 
+      (setq ediff-syntax-table
             (ediff-with-current-buffer ediff-buffer-B
               (syntax-table))))
    )
  
             (ediff-with-current-buffer ediff-buffer-B
               (syntax-table))))
    )
  
-       
+
  (defun ediff-deactivate-mark ()
    (ediff-cond-compile-for-xemacs-or-emacs
     (zmacs-deactivate-region) ; xemacs
  (defun ediff-deactivate-mark ()
    (ediff-cond-compile-for-xemacs-or-emacs
     (zmacs-deactivate-region) ; xemacs
@@ -4062,7 +4074,7 @@ Mail anyway? (y or n) ")
                (setq selective-display nil)))))
         ))
  
                (setq selective-display nil)))))
         ))
  
-        
+
  ;; The next two are modified versions from emerge.el.
  ;; VARS must be a list of symbols
  ;; ediff-save-variables returns an association list: ((var . val) ...)
  ;; The next two are modified versions from emerge.el.
  ;; VARS must be a list of symbols
  ;; ediff-save-variables returns an association list: ((var . val) ...)
@@ -4083,8 +4095,8 @@ Mail anyway? (y or n) ")
          (assoc-elt (assoc var assoc-list)))
    (if assoc-elt
        (setcdr assoc-elt value))))
          (assoc-elt (assoc var assoc-list)))
    (if assoc-elt
        (setcdr assoc-elt value))))
-  
-  
+
+
  ;; must execute in control buf
  (defun ediff-save-protected-variables ()
    (setq ediff-buffer-values-orig-A
  ;; must execute in control buf
  (defun ediff-save-protected-variables ()
    (setq ediff-buffer-values-orig-A
@@ -4144,7 +4156,7 @@ Mail anyway? (y or n) ")
  
  (defsubst ediff-save-time ()
    (setq ediff-command-begin-time (current-time)))
  
  (defsubst ediff-save-time ()
    (setq ediff-command-begin-time (current-time)))
-    
+
  (defun ediff-profile ()
    "Toggle profiling Ediff commands."
    (interactive)
  (defun ediff-profile ()
    "Toggle profiling Ediff commands."
    (interactive)
@@ -4165,7 +4177,7 @@ Mail anyway? (y or n) ")
        (add-hook pre-hook 'ediff-save-time t 'local)
        (add-hook post-hook 'ediff-calc-command-time nil 'local)
        (message "Ediff profiling enabled"))))
        (add-hook pre-hook 'ediff-save-time t 'local)
        (add-hook post-hook 'ediff-calc-command-time nil 'local)
        (message "Ediff profiling enabled"))))
-    
+
  (defun ediff-print-diff-vector (diff-vector-var)
    (princ (format "\n*** %S ***\n" diff-vector-var))
    (mapcar (lambda (overl-vec)
  (defun ediff-print-diff-vector (diff-vector-var)
    (princ (format "\n*** %S ***\n" diff-vector-var))
    (mapcar (lambda (overl-vec)
@@ -4176,7 +4188,7 @@ Mail anyway? (y or n) ")
  \t\tNo-fine-diff-flag: %S
  \t\tState-of-diff:\t   %S
  \t\tState-of-merge:\t   %S
  \t\tNo-fine-diff-flag: %S
  \t\tState-of-diff:\t   %S
  \t\tState-of-merge:\t   %S
-" 
+"
               (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
               (aref overl-vec 0)
               ;; fine-diff-vector
               (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
               (aref overl-vec 0)
               ;; fine-diff-vector
@@ -4190,7 +4202,7 @@ Mail anyway? (y or n) ")
               )))
           (eval diff-vector-var)))
  
               )))
           (eval diff-vector-var)))
  
-  
+
  
  (defun ediff-debug-info ()
    (interactive)
  
  (defun ediff-debug-info ()
    (interactive)
@@ -4233,7 +4245,7 @@ Mail anyway? (y or n) ")
           (nconc result (list (car lis1))))
        (setq lis1 (cdr lis1)))
      (cdr result)))
           (nconc result (list (car lis1))))
        (setq lis1 (cdr lis1)))
      (cdr result)))
-    
+
  
  ;; eliminates duplicates using comparison-func
  (defun ediff-union (lis1 lis2 comparison-func)
  
  ;; eliminates duplicates using comparison-func
  (defun ediff-union (lis1 lis2 comparison-func)
@@ -4278,7 +4290,7 @@ Mail anyway? (y or n) ")
  ;;(ediff-load-version-control 'silent)
  
  (run-hooks 'ediff-load-hook)
  ;;(ediff-load-version-control 'silent)
  
  (run-hooks 'ediff-load-hook)
-    
+
  
  ;;; Local Variables:
  ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
  
  ;;; Local Variables:
  ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
@@ -4286,4 +4298,5 @@ Mail anyway? (y or n) ")
  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
  ;;; End:
  
  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
  ;;; End:
  
+;;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879
  ;;; ediff-util.el ends here
  ;;; ediff-util.el ends here