Commits

Anonymous committed c188a15

2000-01-19 Michael Kifer <kifer@cs.sunysb.edu>

* ediff.el (ediff-patch-file): use better defaults.

* ediff.texi: add credits.

2001-01-19 Colin Walters <walters@cis.ohio-state.edu>

* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
diff mode, if available.

2001-01-19 Vin Shelton <acs@@xemacs.org>

* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button

2001-01-19 Steve Youngs <youngs@xemacs.org>

* ediff-init.el (subst-char-in-string): Define and use it, unless
it's already defined.

2001-01-17 Stephen J. Turnbull <stephen@xemacs.org>

* Makefile: Add edebug to REQUIRES (for def-edebug-spec).

Comments (0)

Files changed (7)

+2000-01-19  Michael Kifer  <kifer@cs.sunysb.edu>
+	
+	* ediff.el (ediff-patch-file): use better defaults.
+	
+	* ediff.texi: add credits.
+	
+2001-01-19  Colin Walters <walters@cis.ohio-state.edu>
+	
+	* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
+	diff mode, if available.
+	
+2001-01-19  Vin Shelton <acs@@xemacs.org>
+	
+	* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button
+	
+2001-01-19  Steve Youngs  <youngs@xemacs.org>
+
+	* ediff-init.el (subst-char-in-string): Define and use it, unless
+	it's already defined.
+
+2001-01-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Makefile:  Add edebug to REQUIRES (for def-edebug-spec).
+	
 2000-12-25  Michael Kifer  <kifer@cs.sunysb.edu>
 	
 	* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
 MAINTAINER = Michael Kifer <kifer@cs.sunysb.edu>
 PACKAGE = ediff
 PKG_TYPE = regular
-REQUIRES = pcl-cvs elib dired xemacs-base
+REQUIRES = pcl-cvs elib dired xemacs-base edebug
 CATEGORY = prog
 
 ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \
 	  (add-submenu
 	   '("Tools") ediff-misc-menu "OO-Browser...")
 	  (add-menu-button
-	   '("Tools")
-	   ["-------" nil nil] "OO-Browser...")
+	   '("Tools") "-------" "OO-Browser...")
 	  ))))
 
 
 (defsubst ediff-nonempty-string-p (string)
   (and (stringp string) (not (string= string ""))))
 
+(unless (fboundp 'subst-char-in-string)
+  (defun subst-char-in-string (fromchar tochar string &optional inplace)
+    "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+    (let ((i (length string))
+	  (newstr (if inplace string (copy-sequence string))))
+      (while (> i 0)
+	(setq i (1- i))
+	(if (eq (aref newstr i) fromchar)
+	    (aset newstr i tochar)))
+      newstr)))
+
 (defun ediff-abbrev-jobname (jobname)
   (cond ((eq jobname 'ediff-directories)
 	 "Compare two directories")
     (ediff-exec-process
      ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
      ediff-custom-diff-options file-A file-B)
+    (condition-case nil
+	;; put the diff file in diff-mode, if it is available
+	(prog
+	 (require 'diff-mode)
+	 (with-current-buffer ediff-custom-diff-buffer
+	   (diff-mode)))
+      (error))
     (delete-file file-A)
     (delete-file file-B)
     ))
 ;; Keywords: comparing, merging, patching, tools, unix
 
 (defconst ediff-version "2.75" "The current version of Ediff")
-(defconst ediff-date "October 29, 2000" "Date of last update")  
+(defconst ediff-date "January 19, 2001" "Date of last update")  
 
 
 ;; This file is part of GNU Emacs.
 			      (buffer-file-name patch-buf))))
 			   (t default-directory)))
     (setq source-file
-	  ;; the default is the directory, not the visited file name
 	  (read-file-name 
 	   "File to patch (directory, if multifile patch): "
-	   source-dir (ediff-get-default-file-name)))
+	   ;; use an explicit initial file
+	   source-dir nil nil (ediff-get-default-file-name)))
     (ediff-dispatch-file-patching-job patch-buf source-file)))
 
 ;;;###autoload
 Heribert Schuetz (schuetz@@ecrc.de),
 Andy Scott (ascott@@pcocd2.intel.com),
 Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de),
-Scott O.@: Sherman (Scott.Sherman@@mci.com),
+Vin Shelton (acs@@xemacs.org),
+Scott O. Sherman (Scott.Sherman@@mci.com),
 Richard Stallman (rms@@gnu.org),
 Richard Stanton (stanton@@haas.berkeley.edu),
 Ake Stenhoff (etxaksf@@aom.ericsson.se),
 Ray Tomlinson (tomlinso@@bbn.com),
 Raymond Toy (toy@@rtp.ericsson.se),
 Jan Vroonhof (vroonhof@@math.ethz.ch),
+Colin Walters (walters@@cis.ohio-state.edu),
 Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be),
 Klaus Weber (gizmo@@zork.north.de),
 Ben Wing (ben@@xemacs.org),
 Tom Wurgler (twurgler@@goodyear.com),
+Steve Youngs (youngs@@xemacs.org),
 Ilya Zakharevich (ilya@@math.ohio-state.edu),
 Eli Zaretskii (eliz@@is.elta.co.il)
 @end example