[uim] backport patch from upstream to fix the modeline issue with other leim-enabled IM on Emacs.

Akira TAGOH tagoh at fedoraproject.org
Tue Mar 22 11:53:03 UTC 2011


commit 21bccf6728cd728e52ee9f50a1181843b41cf92b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Mar 22 20:52:53 2011 +0900

    backport patch from upstream to fix the modeline issue with
    other leim-enabled IM on Emacs.

 uim-el-modeline.patch |   15 +++++++++++++++
 uim.spec              |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/uim-el-modeline.patch b/uim-el-modeline.patch
new file mode 100644
index 0000000..4e53417
--- /dev/null
+++ b/uim-el-modeline.patch
@@ -0,0 +1,15 @@
+Index: emacs/uim-leim.el
+===================================================================
+--- emacs/uim-leim.el	(リビジョン 6982)
++++ emacs/uim-leim.el	(作業コピー)
+@@ -109,8 +109,9 @@
+   )
+ 
+ (defun uim-leim-input-method-activate-hook ()
+-  (setq current-input-method-title uim-leim-mode-line-string)
++  ;; Don't set input-method-title here.
+ 
++  ;; However, leave code fore xemacs since I cannot test with xemacs for now.
+   (if uim-xemacs
+       (uim-leim-xemacs-modeline-init))
+   )
diff --git a/uim.spec b/uim.spec
index fbe19c4..22bce10 100644
--- a/uim.spec
+++ b/uim.spec
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -34,6 +34,7 @@ Source2:	uim-init.el
 Patch0:		uim-fix-implicit-dsolinking.patch
 Patch1:		uim-emacs-utf8.patch
 Patch2:		uim-enable-libgcroots.patch
+Patch3:		uim-el-modeline.patch
 
 
 Summary:	A multilingual input method library
@@ -232,6 +233,7 @@ many languages using the input table map from m17n-db.
 %patch0 -p1 -b .0-dso
 %patch1 -p1 -b .1-emacs
 %patch2 -p1 -b .2-libgcroots
+%patch3 -p0 -b .3-modeline
 autoconf
 
 
@@ -568,6 +570,10 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Tue Mar 22 2011 Akira TAGOH <tagoh at redhat.com> - 1.6.1-3
+- backport patch from upstream to fix the modeline issue with
+  other leim-enabled IM on Emacs.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list