rpms/uim/devel uim-1.4.2-emacs23.patch, NONE, 1.1 uim-init.el, 1.1, 1.2 uim.spec, 1.56, 1.57

[Akira TAGOH (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748

Modified Files:
	uim-init.el uim.spec 
Added Files:
	uim-1.4.2-emacs23.patch 
Log Message:
* Tue Apr 22 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-3
- uim-1.4.2-emacs23.patch: Apply to get uim.el working on Emacs 23. (#443572)

uim-1.4.2-emacs23.patch:

--- NEW FILE uim-1.4.2-emacs23.patch ---
diff -ruN uim-1.4.2.orig/emacs/uim-keymap.el uim-1.4.2/emacs/uim-keymap.el
--- uim-1.4.2.orig/emacs/uim-keymap.el	2008-02-19 18:16:27.000000000 +0900
+++ uim-1.4.2/emacs/uim-keymap.el	2008-04-22 18:19:42.000000000 +0900
@@ -187,6 +187,13 @@
 	 (define-key uim-mode-map [27] 'uim-process-input)
 	 )
 
+	((and uim-emacs (= emacs-major-version 23)) ;;; GNU Emacs-22.x
+	 (define-key uim-mode-map [t] 'uim-process-input)
+	 (define-key uim-preedit-map [t] 'uim-process-input)
+
+	 (define-key uim-mode-map [27] 'uim-process-input)
+	 )
+
 	)
 
 


Index: uim-init.el
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim-init.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uim-init.el	15 Dec 2005 11:18:13 -0000	1.1
+++ uim-init.el	23 Apr 2008 05:19:17 -0000	1.2
@@ -1,6 +1,7 @@
-(require 'uim-leim)
-
 (add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
 (setq uim-el-agent "/usr/bin/uim-el-agent")
+
+(require 'uim-leim)
+
 ;(setq uim-candidate-display-inline t)
 ;(setq default-input-method "japanese-anthy-uim")


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- uim.spec	7 Apr 2008 11:42:00 -0000	1.56
+++ uim.spec	23 Apr 2008 05:19:17 -0000	1.57
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.2
-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+
@@ -26,6 +26,7 @@
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
+Patch0:		uim-1.4.2-emacs23.patch
 
 
 Summary:	A multilingual input method library
@@ -182,6 +183,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .emacs23
 
 
 %build
@@ -400,6 +402,9 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Tue Apr 22 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-3
+- uim-1.4.2-emacs23.patch: Apply to get uim.el working on Emacs 23. (#443572)
+
 * Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-2
 - Move Qt3 immodule plugin to uim-qt3.
 - Move the helper applications for Qt to uim-qt-common.