From 9d62b078de989c7838dab7fb0ca13449a0084311387a9abae6b4c6dcebe68854 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 28 Apr 2008 14:26:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=34 --- fix-window-configuration-problem.patch | 22 ++++++++++++++++++++++ xemacs.changes | 6 ++++++ xemacs.spec | 7 ++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-window-configuration-problem.patch diff --git a/fix-window-configuration-problem.patch b/fix-window-configuration-problem.patch new file mode 100644 index 0000000..0cad59c --- /dev/null +++ b/fix-window-configuration-problem.patch @@ -0,0 +1,22 @@ +diff --git a/src/window.c b/src/window.c +--- a/src/window.c ++++ b/src/window.c +@@ -3601,7 +3601,17 @@ + /* All but the last window should have a height which is + a multiple of the default line height. */ + if (!NILP (c->next)) +- pos = (pos / line_size) * line_size; ++ { ++ /* ++ * Round up when we're shrinking, down when we're growing ++ * to make sure that pairs of grow / shrink meant to ++ * cancel out actually do cancel out. ++ */ ++ if (pixel_adj_left < 0) ++ pos = ((pos + line_size -1) / line_size) * line_size; ++ else ++ pos = (pos / line_size) * line_size; ++ } + + /* Avoid confusion: don't delete child if it becomes too small */ + set_window_pixsize (child, pos + first - last_pos, 1, set_height); diff --git a/xemacs.changes b/xemacs.changes index ba24767..79f9fde 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 28 14:27:29 CEST 2008 - mfabian@suse.de + +- add fix-window-configuration-problem.patch + (see http://article.gmane.org/gmane.emacs.xemacs.beta/27797) + ------------------------------------------------------------------- Tue Apr 01 19:47:45 CEST 2008 - mfabian@suse.de diff --git a/xemacs.spec b/xemacs.spec index 44fc83d..d698993 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -37,7 +37,7 @@ Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on Version: 21.5.28.20080401 -Release: 1 +Release: 7 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -92,6 +92,7 @@ Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch47: xaw3d-config.patch +Patch48: fix-window-configuration-problem.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -184,6 +185,7 @@ Authors: %patch43 -p1 %patch45 -p0 %patch47 +%patch48 -p1 %patch292811 -p1 %patch301352 -p1 %patch0 -p1 @@ -588,6 +590,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Mon Apr 28 2008 mfabian@suse.de +- add fix-window-configuration-problem.patch + (see http://article.gmane.org/gmane.emacs.xemacs.beta/27797) * Tue Apr 01 2008 mfabian@suse.de - update to 21.5.28.20080401 to fix the problem reported here: http://article.gmane.org/gmane.emacs.xemacs.beta/26999/match=zawinski+save+window+excursion+broken