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

[xemacs-cvs at xemacs.org]

  User: michaelk
  Date: 07/08/19 15:50:55

  Modified:    packages/xemacs-packages/ediff ediff.el ediff-util.el
                        ediff-ptch.el ediff-diff.el ChangeLog
Log:
	* ediff-util.el (ediff-make-temp-file): use the coding system of the
	buffer for which file is created.

Revision  Changes    Path
1.39      +2 -2      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.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ediff.el	2007/01/23 21:42:43	1.38
+++ ediff.el	2007/08/19 13:50:51	1.39
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.81.1" "The current version of Ediff")
-(defconst ediff-date "October 23, 2006" "Date of last update")
+(defconst ediff-version "2.81.2" "The current version of Ediff")
+(defconst ediff-date "August 18, 2007" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.



1.36      +5 -1      XEmacs/packages/xemacs-packages/ediff/ediff-util.el

Index: ediff-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ediff-util.el	2007/06/12 19:25:24	1.35
+++ ediff-util.el	2007/08/19 13:50:51	1.36
@@ -3164,7 +3164,11 @@ Hit \\[ediff-recenter] to reset the wind
 (defun ediff-make-temp-file (buff &optional prefix given-file start end)
   (let* ((p (ediff-convert-standard-filename (or prefix "ediff")))
 	 (short-p p)
-	 (coding-system-for-write ediff-coding-system-for-write)
+	 (coding-system-for-write
+	  (ediff-with-current-buffer buff
+	    (if (boundp 'buffer-file-coding-system)
+		buffer-file-coding-system
+	      ediff-coding-system-for-write)))
 	 f short-f)
     (if (and (fboundp 'msdos-long-file-names)
 	     (not (msdos-long-file-names))



1.21      +4 -2      XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el

Index: ediff-ptch.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ediff-ptch.el	2007/06/12 21:20:35	1.20
+++ ediff-ptch.el	2007/08/19 13:50:51	1.21
@@ -134,11 +134,13 @@ patch.  So, don't change these variables
   :type '(choice (const nil) string)
   :group 'ediff-ptch)
 
+;; This context diff does not recognize spaces inside files, but removing ' '
+;; from [^ \t] breaks normal patches for some reason
 (defcustom ediff-context-diff-label-regexp
   (concat "\\(" 	; context diff 2-liner
-	  "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)"
+	  "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)"
 	  "\\|" 	; GNU unified format diff 2-liner
-	  "^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)"
+	  "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)"
 	  "\\)")
   "*Regexp matching filename 2-liners at the start of each context diff.
 You probably don't want to change that, unless you are using an obscure patch



1.34      +2 -2      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.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ediff-diff.el	2007/01/23 21:42:44	1.33
+++ ediff-diff.el	2007/08/19 13:50:51	1.34
@@ -867,7 +867,7 @@ one optional arguments, diff-number to r
 	     (ediff-make-fine-diffs n 'noforce)
 	   (ediff-make-fine-diffs n 'skip)))
 
-	;; highlight iff fine diffs already exist
+	;; highlight if fine diffs already exist
 	((eq ediff-auto-refine 'off)
 	 (ediff-make-fine-diffs n 'skip))))
 
@@ -1459,7 +1459,7 @@ arguments to `skip-chars-forward'."
 
 
 (defun ediff-same-contents (d1 d2 &optional filter-re)
-  "Returns t iff D1 and D2 have the same content.
+  "Return t if D1 and D2 have the same content.
 D1 and D2 can either be both directories or both regular files.
 Symlinks and the likes are not handled.
 If FILTER-RE is non-nil, recursive checking in directories



1.119     +11 -1     XEmacs/packages/xemacs-packages/ediff/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- ChangeLog	2007/06/12 22:01:57	1.118
+++ ChangeLog	2007/08/19 13:50:51	1.119
@@ -1,7 +1,17 @@
+2007-08-19  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
+	* ediff-util.el (ediff-make-temp-file): use the coding system of the
+	buffer for which file is created.
+	
+2007-06-13  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
+	* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
+	previous patch
+	
 2007-06-13  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.69 released.
-
+	
 2007-06-12  Michael Kifer  <kifer at cs.stonybrook.edu>
 	
 	* ediff-ptch.el (ediff-context-diff-label-regexp): spurious