From da5b2e6c70a25bc8e6559241313535a04baa5a027da6f98084516a64c106d87a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 31 May 2012 15:31:11 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=50 --- xemacs-21.5.31-array.patch | 27 +++++++++++++++++++++++++++ xemacs.changes | 5 +++++ xemacs.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 xemacs-21.5.31-array.patch diff --git a/xemacs-21.5.31-array.patch b/xemacs-21.5.31-array.patch new file mode 100644 index 0000000..1d4769d --- /dev/null +++ b/xemacs-21.5.31-array.patch @@ -0,0 +1,27 @@ +--- src/events.c ++++ src/events.c 2012-05-31 15:13:06.832009873 +0000 +@@ -1611,8 +1611,11 @@ upshift_event (Lisp_Object event) + XSET_EVENT_KEY_KEYSYM (event, make_char (c + 'A' - 'a')); + else + if (!(XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_SHIFT)) +- XSET_EVENT_KEY_MODIFIERS +- (event, XEVENT_KEY_MODIFIERS (event) |= XEMACS_MOD_SHIFT); ++ { ++ Lisp_Object tmp = XEVENT_KEY_MODIFIERS (event); ++ tmp |= XEMACS_MOD_SHIFT; ++ XSET_EVENT_KEY_MODIFIERS (event, tmp); ++ } + } + + void +--- src/mule-wnnfns.c ++++ src/mule-wnnfns.c 2012-05-31 15:27:10.952509987 +0000 +@@ -2117,7 +2117,7 @@ yes_or_no (UExtbyte *s) + c2m (s, mbuf, charset); + /* truncate "(Y/N)" */ + for (len = 0; (mbuf[len]) && (len < 512); len++); +- for (; (mbuf[len] != '(') && (len > 0); len--); ++ for (len--; (mbuf[len] != '(') && (len >= 0); len--); + { + Lisp_Object yes, str; + struct gcpro gcpro1; diff --git a/xemacs.changes b/xemacs.changes index d0a04f2..0975723 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 15:30:38 UTC 2012 - werner@suse.de + +- Fix compiler warnings + ------------------------------------------------------------------- Thu May 31 14:51:02 UTC 2012 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 4a346cf..1312cbb 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -90,6 +90,7 @@ Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch +Patch53: xemacs-21.5.31-array.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -168,6 +169,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar. %patch51 -p0 %patch52 -p0 %endif +%patch53 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1