User: michaelk Date: 05/11/29 07:16:21 Modified: packages/xemacs-packages/ediff ediff-wind.el ChangeLog Log: * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): preserve user position. Revision Changes Path 1.22 +5 -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.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- ediff-wind.el 2005/11/25 07:31:38 1.21 +++ ediff-wind.el 2005/11/29 06:16:20 1.22 ＠＠ -955,8 +955,9 ＠＠ into icons, regardless of the window man (minibuffer-window designated-minibuffer-frame)) (cons 'width fwidth) - (cons 'height fheight)) - ) + (cons 'height fheight) + (cons 'user-position t) + )) ;; adjust autoraise (setq adjusted-parameters ＠＠ -1135,7 +1136,8 ＠＠ 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 `((left . ,cw) (width . ,wd))))) + (modify-frame-parameters + frame-A `((left . ,cw) (width . ,wd) (user-position t))))) ;; Revise the mode line to display which difference we have selected 1.98 +6 -1 XEmacs/packages/xemacs-packages/ediff/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -r1.97 -r1.98 --- ChangeLog 2005/11/25 08:14:43 1.97 +++ ChangeLog 2005/11/29 06:16:20 1.98 ＠＠ -1,7 +1,12 ＠＠ +2005-11-29 Michael Kifer <kifer(a)cs.stonybrook.edu&gt; + + * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): + preserve user position. + 2005-11-25 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.59 released. - + 2005-11-25 Michael Kifer <kifer(a)cs.stonybrook.edu&gt; * ediff-wind (ediff-make-wide-display): Slight simplification.