User: michaelk
Date: 05/11/25 08:31:39
Modified: packages/xemacs-packages/ediff ediff.el ediff-wind.el
ChangeLog
Log:
* ediff-wind (ediff-make-wide-display): Slight simplification.
* ediff.el (ediff-date): Changed the date of last update.
Revision Changes Path
1.32 +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.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ediff.el 2005/10/06 00:17:44 1.31
+++ ediff.el 2005/11/25 07:31:38 1.32
@@ -8,7 +8,7 @@
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.80.1" "The current version of Ediff")
-(defconst ediff-date "October 5, 2005" "Date of last update")
+(defconst ediff-date "November 25, 2005" "Date of last update")
;; This file is part of GNU Emacs.
1.21 +1 -3 XEmacs/packages/xemacs-packages/ediff/ediff-wind.el
Index: ediff-wind.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-wind.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ediff-wind.el 2005/10/06 00:17:44 1.20
+++ ediff-wind.el 2005/11/25 07:31:38 1.21
@@ -1135,9 +1135,7 @@ It assumes that it is called from within
(list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params)))))
(cons 'width (cdr (assoc 'width frame-A-params))))
ediff-wide-display-frame frame-A)
- (modify-frame-parameters frame-A (list (cons 'left cw)
- (cons 'width wd)))))
-
+ (modify-frame-parameters frame-A `((left . ,cw) (width . ,wd)))))
;; Revise the mode line to display which difference we have selected
1.96 +7 -1 XEmacs/packages/xemacs-packages/ediff/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ChangeLog 2005/11/16 07:52:56 1.95
+++ ChangeLog 2005/11/25 07:31:38 1.96
@@ -1,7 +1,13 @@
+2005-11-25 Michael Kifer <kifer(a)cs.stonybrook.edu>
+
+ * ediff-wind (ediff-make-wide-display): Slight simplification.
+
+ * ediff.el (ediff-date): Changed the date of last update.
+
2005-11-16 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.58 released.
-
+
2005-11-15 Michael Kifer <kifer(a)cs.stonybrook.edu>
* ediff-util (ediff-make-temp-file): use proper file-name-handler