2005-11-25 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-wind (ediff-make-wide-display): Slight simplification.

	* ediff.el (ediff-date): Changed the date of last update.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f334200b218d2d7aadae6f4a66abf7626103979e..b7bff6d2362b5821cfe786f0f60e4196005d2b2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,15 @@
 2005-11-25  Michael Kifer  <kifer@cs.stonybrook.edu>
        
-       * viper-keym.el (viper-ESC-key): use different values in terminal and
+       * viper-keym.el (viper-ESC-key): Use different values in terminal and
        window modes.
        
-       * viper.el (viper-emacs-state-mode-list): delete mail-mode, add
+       * viper.el (viper-emacs-state-mode-list): Delete mail-mode, add
        jde-javadoc-checker-report-mode.
        
+       * ediff-wind (ediff-make-wide-display): Slight simplification.
+       
+       * ediff.el (ediff-date): Changed the date of last update.
+       
 2005-11-24  Chong Yidong  <cyd@stupidchicken.com>
 
        * hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index e15c92d4bc9d0460b95272bad5fe2170ef2070e8..1a360a28f6eba7de6ef1d1d15ba2892bbbc14d15 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -1135,9 +1135,7 @@ It assumes that it is called from within the control buffer."
          (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

diff --git a/lisp/ediff.el b/lisp/ediff.el
index 696fc9668e6b78656bdc90fed48a4e12dd3dce5b..32ca177388e712c8e6da767be77c49d655fb4249 100644 (file)
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -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.