CVS update by michaelk packages/xemacs-packages/ediff, ChangeLog ...

[xemacs-cvs at xemacs.org]

  User: michaelk
  Date: 07/06/12 23:20:38

  Modified:    packages/xemacs-packages/ediff ediff-ptch.el ediff-init.el
                        ChangeLog
Log:
	* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
	parenthesis.

	* ediff-init.el: doc strings.

Revision  Changes    Path
1.20      +1 -1      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.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ediff-ptch.el	2007/06/12 19:25:24	1.19
+++ ediff-ptch.el	2007/06/12 21:20:35	1.20
@@ -139,7 +139,7 @@ patch.  So, don't change these variables
 	  "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)"
 	  "\\|" 	; GNU unified format diff 2-liner
 	  "^--- \\([^\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
 program."



1.38      +3 -1      XEmacs/packages/xemacs-packages/ediff/ediff-init.el

Index: ediff-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-init.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ediff-init.el	2007/06/12 19:25:25	1.37
+++ ediff-init.el	2007/06/12 21:20:35	1.38
@@ -102,7 +102,7 @@ that Ediff doesn't know about.")
        (boundp 'ediff-use-toolbar-p)
        ediff-use-toolbar-p))		;Does the user want it ?
 
-;; Defines SYMBOL as an advertised local variable.
+;; Defines VAR as an advertised local variable.
 ;; Performs a defvar, then executes `make-variable-buffer-local' on
 ;; the variable.  Also sets the `permanent-local' property,
 ;; so that `kill-all-local-variables' (called by major-mode setting
@@ -110,6 +110,7 @@ that Ediff doesn't know about.")
 ;;
 ;; Plagiarised from `emerge-defvar-local' for XEmacs.
 (defmacro ediff-defvar-local (var value doc)
+  "Defines VAR as a local variable."
   (declare (indent defun))
   `(progn
      (defvar ,var ,value ,doc)
@@ -259,6 +260,7 @@ It needs to be killed when we quit the s
 ;; Doesn't save the point and mark.
 ;; This is `with-current-buffer' with the added test for live buffers."
 (defmacro ediff-with-current-buffer (buffer &rest body)
+  "Evaluates BODY in BUFFER."
   (declare (indent 1) (debug (form body)))
   `(if (ediff-buffer-live-p ,buffer)
        (save-current-buffer



1.117     +7 -0      XEmacs/packages/xemacs-packages/ediff/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- ChangeLog	2007/06/12 19:25:25	1.116
+++ ChangeLog	2007/06/12 21:20:36	1.117
@@ -1,5 +1,12 @@
 2007-06-12  Michael Kifer  <kifer at cs.stonybrook.edu>
 	
+	* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
+	parenthesis.
+	
+	* ediff-init.el: doc strings.
+	
+2007-06-12  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
 	* ediff-mult.el
 	(ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
 	new variables.