CVS update by michaelk packages/xemacs-packages/ediff, ediff-diff.el ...

[xemacs-cvs at xemacs.org]

  User: michaelk
  Date: 06/10/23 21:23:50

  Modified:    packages/xemacs-packages/ediff ediff.el ediff-mult.el
                        ediff-diff.el ChangeLog
Log:
	* ediff-diff.el (ediff-same-file-contents): expand file names.

	* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.

Revision  Changes    Path
1.36      +1 -1      XEmacs/packages/xemacs-packages/ediff/ediff.el

Index: ediff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ediff.el	2006/09/18 18:57:30	1.35
+++ ediff.el	2006/10/23 19:23:49	1.36
@@ -8,7 +8,7 @@
 ;; Keywords: comparing, merging, patching, tools, unix
 
 (defconst ediff-version "2.81.1" "The current version of Ediff")
-(defconst ediff-date "September 18, 2006" "Date of last update")
+(defconst ediff-date "October 23, 2006" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.



1.27      +9 -5      XEmacs/packages/xemacs-packages/ediff/ediff-mult.el

Index: ediff-mult.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-mult.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ediff-mult.el	2006/08/25 16:43:18	1.26
+++ ediff-mult.el	2006/10/23 19:23:49	1.27
@@ -1637,11 +1637,15 @@ Useful commands:
 	     (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
 	     (erase-buffer)
 	     (shell-command
-	      (format "%s %s %s %s"
-		      ediff-custom-diff-program ediff-custom-diff-options
-		      (ediff-get-session-objA-name session)
-		      (ediff-get-session-objB-name session))
-	      t))
+	      (format
+	       "%s %s %s %s"
+	       (shell-quote-argument ediff-custom-diff-program)
+	       ediff-custom-diff-options
+	       (shell-quote-argument (ediff-get-session-objA-name session))
+	       (shell-quote-argument (ediff-get-session-objB-name session))
+	       )
+	      t)
+	     )
 	   (save-excursion
 	     (set-buffer meta-diff-buff)
 	     (goto-char (point-max))



1.30      +3 -1      XEmacs/packages/xemacs-packages/ediff/ediff-diff.el

Index: ediff-diff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-diff.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ediff-diff.el	2006/08/25 16:43:18	1.29
+++ ediff-diff.el	2006/10/23 19:23:49	1.30
@@ -1450,7 +1450,9 @@ arguments to `skip-chars-forward'."
       (condition-case nil
 	  (let ((res
 		 (apply 'call-process ediff-cmp-program nil nil nil
-			(append ediff-cmp-options (list f1 f2)))))
+			(append ediff-cmp-options (list (expand-file-name f1)
+							(expand-file-name f2))))
+		 ))
 	    (and (numberp res) (eq res 0)))
 	(error (format "Cannot execute program %S." ediff-cmp-program)))
     ))



1.108     +6 -0      XEmacs/packages/xemacs-packages/ediff/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ChangeLog	2006/09/23 14:29:41	1.107
+++ ChangeLog	2006/10/23 19:23:49	1.108
@@ -1,3 +1,9 @@
+2006-10-23  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
+	* ediff-diff.el (ediff-same-file-contents): expand file names.
+	
+	* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
+	
 2006-09-23  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.64 released.