andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

	* ediff.el (ediff-date): Changed the date of last update.
This commit is contained in:
Michael Kifer 2005-11-25 07:29:10 +00:00
parent 0680ea10b4
commit 9b01475db9
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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'.

4
lisp/ediff-wind.el
View file

@ -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

2
lisp/ediff.el
View file

@ -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.