Author: sasugaanija
Date: Sun Apr 20 09:04:42 2008
New Revision: 5431
Modified:
branches/1.5/emacs/uim-el-agent.c
branches/1.5/emacs/uim-util.el
branches/1.5/emacs/uim.el
Log:
* Merge r5419 from trunk
Modified: branches/1.5/emacs/uim-el-agent.c
==============================================================================
--- branches/1.5/emacs/uim-el-agent.c (original)
+++ branches/1.5/emacs/uim-el-agent.c Sun Apr 20 09:04:42 2008
@@ -92,7 +92,7 @@
{
uim_agent_context *ua = get_uim_agent_context(context_id);
- if (ua == current) {
+ if (ua) {
/* keep preedit if exists */
show_preedit_uim_agent_context(ua);
show_candidate_uim_agent_context(ua);
Modified: branches/1.5/emacs/uim-util.el
==============================================================================
--- branches/1.5/emacs/uim-util.el (original)
+++ branches/1.5/emacs/uim-util.el Sun Apr 20 09:04:42 2008
@@ -299,8 +299,6 @@
(defun uim-goto-char (pt)
(set-window-point (get-buffer-window (current-buffer)) pt))
-(defun uim-point ()
- (window-point (get-buffer-window (current-buffer))))
(defun uim-get-vector-from-head (vec n)
(if (and (<= n (length vec))
Modified: branches/1.5/emacs/uim.el
==============================================================================
--- branches/1.5/emacs/uim.el (original)
+++ branches/1.5/emacs/uim.el Sun Apr 20 09:04:42 2008
@@ -1156,8 +1156,7 @@
(setq preedit-existed t)
(let ((inhibit-read-only t))
(uim-remove-preedit))
- (setq uim-preedit-displayed nil)
- (uim-goto-char uim-original-cursor))
+ (setq uim-preedit-displayed nil))
;; restore cursor point
(when (and uim-preedit-keymap-enabled uim-original-cursor)
@@ -1304,7 +1303,7 @@
(when buffer-undo-list-saved
(uim-save-undo))))
- (setq uim-original-cursor (uim-point))
+ (setq uim-original-cursor (point))
(if (or preedit candidate)
@@ -1334,7 +1333,7 @@
(uim-goto-char uim-preedit-cursor)
- (setq uim-candidate-cursor (uim-point))
+ (setq uim-candidate-cursor (point))
;; show candidate
(when (and candidate
