2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
	new macro that replaces viper-emacs-p and viper-xemacs-p in many
	cases. Used to reduce the number of warnings.

	* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
	(viper-standard-value): moved here from viper.el.
	(viper-set-unread-command-events): moved to viper-util.el
	(viper-check-minibuffer-overlay): make sure
	viper-minibuffer-overlay is moved to cover the entire input field.

	* viper-util.el:  use viper-cond-compile-for-xemacs-or-emacs.
	(viper-read-key-sequence, viper-set-unread-command-events,
	viper-char-symbol-sequence-p, viper-char-array-p): moved here.

	* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.

	* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.

	* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.

	* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
	viper-event-vector-p): moved to viper-util.el

	* viper.el (viper-standard-value): moved to viper-cmd.el.
	Use viper-cond-compile-for-xemacs-or-emacs.

	* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.

	* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.

	* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
	macro designed to be used in many places where ediff-emacs-p or
	ediff-xemacs-p was previously used. Reduces the number of
	warnings.
	Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
	of ediff-xemacs-p.
	(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
	ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
	ediff-whitespace-diff-region-p, ediff-get-region-contents):
	moved to ediff-util.el.
	(ediff-event-key): moved here.

	* ediff-merge.el: got rid of unreferenced variables.

	* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.

	* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
	(ediff-cleanup-mess): improved the way windows are set up after
	quitting ediff.
	(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
	(ediff-dispose-of-variant-according-to-user): new function
	designed to be smarter and also understands indirect buffers.
	(ediff-highlight-diff-in-one-buffer,
	ediff-unhighlight-diff-in-one-buffer,
	ediff-unhighlight-diffs-totally-in-one-buffer,
	ediff-highlight-diff, ediff-highlight-diff,
	ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
	ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
	ediff-get-region-contents, ediff-make-current-diff-overlay):
	moved here.
	(ediff-format-bindings-of): new function by Hannu Koivisto
	<azure@iki.fi>.
	(ediff-setup): make sure the merge buffer is always widened and
	modifiable.
	(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
	result of a merge into a file visited by another buffer.
	(ediff-arrange-autosave-in-merge-jobs): check if the merge file
	is visited by another buffer and ask to save/delete that buffer.
	(ediff-verify-file-merge-buffer): new function to do the above.

	* ediff-vers.el: load ediff-init.el at compile time.

	* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.

	* ediff.el (ediff-windows, ediff-regions-wordwise,
	ediff-regions-linewise): use indirect buffers to improve
	robustness and make it possible to compare regions of the same
	buffer (even overlapping regions).
	(ediff-clone-buffer-for-region-comparison,
	ediff-clone-buffer-for-window-comparison): new functions.
	(ediff-files-internal): refuse to compare identical files.
	(ediff-regions-internal): get rid of the warning about comparing
	regions of the same buffer.

	* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
	Plus the following fixes courtesy of Dave Love:
	Doc fixes.
	(ediff-word-1): Use word class and move - to the
	front per regexp documentation.
	(ediff-wordify): Bind forward-word-function outside loop.
	(ediff-copy-to-buffer): Use insert-buffer-substring rather than
	consing buffer contents.
	(ediff-goto-word): Move syntax table setting outside loop.

1 files changed, 104 insertions, 93 deletions

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 33c3e4a05c7..63485033466 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -1,8 +1,8 @@
 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
 
-;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
 
-;; Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
 ;; This file is part of GNU Emacs.
 
@@ -46,104 +46,114 @@
 ;; allow menus to be set up without ediff-wind.el being loaded
 ;;;###autoload
 (defvar ediff-window-setup-function)
+
+;; This is used to avoid compilation warnings. When emacs/xemacs forms can
+;; generate compile time warnings, we use this macro.
+;; In this case, the macro will expand into the form that is appropriate to the
+;; compiler at hand.
+;; Suggested by rms.
+(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
+  (if (string-match "XEmacs" emacs-version)
+      xemacs-form emacs-form))
  
 ;; Note we wrap this in a progn so that we pick up the whole def
 ;; for auto-autoload. That way we do not load ediff-hook.el when defining
 ;; the menus.
 ;;;###autoload
 (progn
-  (defun ediff-xemacs-init-menus ()
-    (if (featurep 'menubar)
-	(progn
-	  (add-submenu
-	   '("Tools") ediff-menu "OO-Browser...")
-	  (add-submenu
-	   '("Tools") ediff-merge-menu "OO-Browser...")
-	  (add-submenu
-	   '("Tools") epatch-menu "OO-Browser...")
-	  (add-submenu
-	   '("Tools") ediff-misc-menu "OO-Browser...")
-	  (add-menu-button
-	   '("Tools") "-------" "OO-Browser...")
-	  ))))
-
-
-;; explicit string-match is needed: ediff-xemacs-p is not defined at build time
+  (ediff-cond-compile-for-xemacs-or-emacs
+   ;; xemacs form
+   (defun ediff-xemacs-init-menus ()
+     (if (featurep 'menubar)
+	 (progn
+	   (add-submenu
+	    '("Tools") ediff-menu "OO-Browser...")
+	   (add-submenu
+	    '("Tools") ediff-merge-menu "OO-Browser...")
+	   (add-submenu
+	    '("Tools") epatch-menu "OO-Browser...")
+	   (add-submenu
+	    '("Tools") ediff-misc-menu "OO-Browser...")
+	   (add-menu-button
+	    '("Tools") "-------" "OO-Browser...")
+	   )))
+   nil ; emacs form
+   ))
+
+
 ;;;###autoload
-(cond ((string-match "XEmacs" emacs-version)
-       (defvar ediff-menu
-	 '("Compare"
-	   ["Two Files..."  ediff-files t]
-	   ["Two Buffers..." ediff-buffers t]
-	   ["Three Files..."  ediff-files3 t]
-	   ["Three Buffers..." ediff-buffers3 t]
-	   "---"
-	   ["Two Directories..." ediff-directories t]
-	   ["Three Directories..." ediff-directories3 t]
-	   "---"
-	   ["File with Revision..."  ediff-revision t]
-	   ["Directory Revisions..."  ediff-directory-revisions t]
-	   "---"
-	   ["Windows Word-by-word..." ediff-windows-wordwise t]
-	   ["Windows Line-by-line..." ediff-windows-linewise t]
-	   "---"
-	   ["Regions Word-by-word..." ediff-regions-wordwise t]
-	   ["Regions Line-by-line..." ediff-regions-linewise t]
-	   ))
-       (defvar ediff-merge-menu
-	 '("Merge"
-	   ["Files..."  ediff-merge-files t]
-	   ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
-	   ["Buffers..."  ediff-merge-buffers t]
-	   ["Buffers with Ancestor..."
-	    ediff-merge-buffers-with-ancestor t]
-	   "---"
-	   ["Directories..."  ediff-merge-directories t]
-	   ["Directories with Ancestor..."
-	    ediff-merge-directories-with-ancestor t]
-	   "---"
-	   ["Revisions..."  ediff-merge-revisions t]
-	   ["Revisions with Ancestor..."
-	    ediff-merge-revisions-with-ancestor t]
-	   ["Directory Revisions..." ediff-merge-directory-revisions t]
-	   ["Directory Revisions with Ancestor..."
-	    ediff-merge-directory-revisions-with-ancestor t]
-	   ))
-       (defvar epatch-menu
-	 '("Apply Patch"
-	   ["To a file..."  ediff-patch-file t]
-	   ["To a buffer..." ediff-patch-buffer t]
-	   ))
-       (defvar ediff-misc-menu
-	 '("Ediff Miscellanea"
-	   ["Ediff Manual..." ediff-documentation t]
-	   ["Customize Ediff..." ediff-customize t]
-	   ["List Ediff Sessions..." ediff-show-registry t]
-	   ["Use separate frame for Ediff control buffer..."
-	    ediff-toggle-multiframe
-	    :style toggle
-	    :selected (if (and (featurep 'ediff-util)
-			       (boundp 'ediff-window-setup-function))
-			  (eq ediff-window-setup-function
-			      'ediff-setup-windows-multiframe))]
-	   ["Use a toolbar with Ediff control buffer"
-	    ediff-toggle-use-toolbar
-	    :style toggle
-	    :selected (if (featurep 'ediff-tbar)
-			  (ediff-use-toolbar-p))]
-	   ))
-       
-       ;; put these menus before Object-Oriented-Browser in Tools menu
-;;;      (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
-;;;      (if (not purify-flag)
-;;;	   (ediff-xemacs-init-menus))
-;;;      )       
-       (if (and (featurep 'menubar) (not (featurep 'infodock))
-		(not (featurep 'ediff-hook)))
+(ediff-cond-compile-for-xemacs-or-emacs
+ (progn
+   (defvar ediff-menu
+     '("Compare"
+       ["Two Files..."  ediff-files t]
+       ["Two Buffers..." ediff-buffers t]
+       ["Three Files..."  ediff-files3 t]
+       ["Three Buffers..." ediff-buffers3 t]
+       "---"
+       ["Two Directories..." ediff-directories t]
+       ["Three Directories..." ediff-directories3 t]
+       "---"
+       ["File with Revision..."  ediff-revision t]
+       ["Directory Revisions..."  ediff-directory-revisions t]
+       "---"
+       ["Windows Word-by-word..." ediff-windows-wordwise t]
+       ["Windows Line-by-line..." ediff-windows-linewise t]
+       "---"
+       ["Regions Word-by-word..." ediff-regions-wordwise t]
+       ["Regions Line-by-line..." ediff-regions-linewise t]
+       ))
+   (defvar ediff-merge-menu
+     '("Merge"
+       ["Files..."  ediff-merge-files t]
+       ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
+       ["Buffers..."  ediff-merge-buffers t]
+       ["Buffers with Ancestor..."
+	ediff-merge-buffers-with-ancestor t]
+       "---"
+       ["Directories..."  ediff-merge-directories t]
+       ["Directories with Ancestor..."
+	ediff-merge-directories-with-ancestor t]
+       "---"
+       ["Revisions..."  ediff-merge-revisions t]
+       ["Revisions with Ancestor..."
+	ediff-merge-revisions-with-ancestor t]
+       ["Directory Revisions..." ediff-merge-directory-revisions t]
+       ["Directory Revisions with Ancestor..."
+	ediff-merge-directory-revisions-with-ancestor t]
+       ))
+   (defvar epatch-menu
+     '("Apply Patch"
+       ["To a file..."  ediff-patch-file t]
+       ["To a buffer..." ediff-patch-buffer t]
+       ))
+   (defvar ediff-misc-menu
+     '("Ediff Miscellanea"
+       ["Ediff Manual..." ediff-documentation t]
+       ["Customize Ediff..." ediff-customize t]
+       ["List Ediff Sessions..." ediff-show-registry t]
+       ["Use separate frame for Ediff control buffer..."
+	ediff-toggle-multiframe
+	:style toggle
+	:selected (if (and (featurep 'ediff-util)
+			   (boundp 'ediff-window-setup-function))
+		      (eq ediff-window-setup-function
+			  'ediff-setup-windows-multiframe))]
+       ["Use a toolbar with Ediff control buffer"
+	ediff-toggle-use-toolbar
+	:style toggle
+	:selected (if (featurep 'ediff-tbar)
+		      (ediff-use-toolbar-p))]
+       ))
+   
+   ;; put these menus before Object-Oriented-Browser in Tools menu
+   (if (and (featurep 'menubar) (not (featurep 'infodock))
+	    (not (featurep 'ediff-hook)))
 	   (ediff-xemacs-init-menus)))
-      
-      ;; Emacs--only if menu-bar is loaded
-      ((featurep 'menu-bar)
+ 
+ ;; Emacs--only if menu-bar is loaded
+ (if (featurep 'menu-bar)
+     (progn
        ;; initialize menu bar keymaps
        (defvar menu-bar-ediff-misc-menu
 	 (make-sparse-keymap "Ediff Miscellanea"))
@@ -240,7 +250,8 @@
 	 '("Ediff Manual..." . ediff-documentation))
        )
       
-      ) ; cond
+      ) ; emacs case
+ ) ; ediff-cond-compile-for-xemacs-or-emacs
 
 ;; arrange for autoloads
 (if purify-flag