# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 1132903750 0
# Node ID 231622e4e399c072607273d902f64a8f902df2f0
# Parent  e1bb7e4a441312d315a5eebc5872f276abfaebdb
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 -r e1bb7e4a4413 -r 231622e4e399 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 25 07:18:07 2005 +0000
+++ b/lisp/ChangeLog	Fri Nov 25 07:29:10 2005 +0000
@@ -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 -r e1bb7e4a4413 -r 231622e4e399 lisp/ediff-wind.el
--- a/lisp/ediff-wind.el	Fri Nov 25 07:18:07 2005 +0000
+++ b/lisp/ediff-wind.el	Fri Nov 25 07:29:10 2005 +0000
@@ -1135,9 +1135,7 @@
 	  (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 -r e1bb7e4a4413 -r 231622e4e399 lisp/ediff.el
--- a/lisp/ediff.el	Fri Nov 25 07:18:07 2005 +0000
+++ b/lisp/ediff.el	Fri Nov 25 07:29:10 2005 +0000
@@ -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.