138 lines
3.4 KiB
Diff
138 lines
3.4 KiB
Diff
--- emacs/uim-candidate.el
|
|
+++ emacs/uim-candidate.el
|
|
@@ -317,7 +317,7 @@
|
|
(setq cands
|
|
(concat (if (> page-space 0) (make-string page-space 32))
|
|
page-current "/" page-total " " cands))
|
|
- (message cands)
|
|
+ (message "%s" cands)
|
|
)
|
|
;; Emacs-20 or XEmacs
|
|
(let* ((page-space (- (string-width page-total)
|
|
@@ -378,7 +378,7 @@
|
|
?.))))))
|
|
|
|
(let (message-log-max)
|
|
- (message cands))
|
|
+ (message "%s" cands))
|
|
)
|
|
|
|
)
|
|
--- emacs/uim-helper.el
|
|
+++ emacs/uim-helper.el
|
|
@@ -100,7 +100,8 @@
|
|
(save-current-buffer
|
|
(set-buffer buffer) (erase-buffer))
|
|
|
|
- (message "uim.el: starting uim-el-helper-agent...")
|
|
+ (unless noninteractive
|
|
+ (message "uim.el: starting uim-el-helper-agent..."))
|
|
|
|
(setq proc (start-process "uim-el-helper-agent"
|
|
buffer uim-el-helper-agent))
|
|
@@ -134,7 +135,8 @@
|
|
|
|
(set-process-sentinel proc 'uim-helper-process-sentinel)
|
|
|
|
- (message "uim.el: starting uim-el-helper-agent... done")
|
|
+ (unless noninteractive
|
|
+ (message "uim.el: starting uim-el-helper-agent... done"))
|
|
|
|
proc
|
|
))
|
|
--- emacs/uim-leim.el
|
|
+++ emacs/uim-leim.el
|
|
@@ -51,11 +51,6 @@
|
|
(setq uim-leim-active nil)
|
|
(uim-mode-off))
|
|
|
|
-(defadvice toggle-input-method (around uim-toggle-input-method-around activate)
|
|
- (if buffer-read-only
|
|
- (not (message "uim.el: This buffer is read-only."))
|
|
- ad-do-it))
|
|
-
|
|
;; Activate function (callback?)
|
|
;; all uim related LEIM input methods call this function at activation time
|
|
(defun uim-leim-activate (&optional name)
|
|
@@ -109,8 +104,6 @@
|
|
)
|
|
|
|
(defun uim-leim-input-method-activate-hook ()
|
|
- (setq current-input-method-title uim-leim-mode-line-string)
|
|
-
|
|
(if uim-xemacs
|
|
(uim-leim-xemacs-modeline-init))
|
|
)
|
|
--- emacs/uim.el
|
|
+++ emacs/uim.el
|
|
@@ -95,7 +95,7 @@
|
|
(defun uim-check-im (im)
|
|
(if (assoc im uim-im-alist)
|
|
t
|
|
- (message (format "uim.el: invalid IM engine: %s" im))))
|
|
+ (message "uim.el: invalid IM engine: %s" im)))
|
|
|
|
;;
|
|
;; Get default IM engine name.
|
|
@@ -477,7 +477,8 @@
|
|
(save-current-buffer
|
|
(set-buffer buffer) (erase-buffer))
|
|
|
|
- (message "uim.el: starting uim-el-agent...")
|
|
+ (unless noninteractive
|
|
+ (message "uim.el: starting uim-el-agent..."))
|
|
|
|
(setq proc (start-process "uim-el-agent" buffer uim-el-agent))
|
|
|
|
@@ -508,7 +509,8 @@
|
|
|
|
(set-process-sentinel proc 'uim-process-sentinel)
|
|
|
|
- (message "uim.el: starting uim-el-agent... done")
|
|
+ (unless noninteractive
|
|
+ (message "uim.el: starting uim-el-agent... done"))
|
|
|
|
proc
|
|
))
|
|
@@ -952,7 +954,7 @@
|
|
(progn
|
|
(if uim-show-keystrokes
|
|
(let (message-log-max)
|
|
- (message (key-description keyvec))))
|
|
+ (message "%s" (key-description keyvec))))
|
|
|
|
(setq uim-last-key-vector keyvec)
|
|
|
|
@@ -1057,7 +1059,7 @@
|
|
(key-description (vector x))
|
|
" ")))
|
|
(append uim-last-key-vector nil))
|
|
- (message keymsg))
|
|
+ (message "%s" keymsg))
|
|
)
|
|
)))
|
|
|
|
@@ -1081,9 +1083,10 @@
|
|
;; display "ESC-" or something
|
|
(if uim-show-keystrokes
|
|
(let (message-log-max)
|
|
- (message (concat (key-description (vconcat uim-prefix-arg-vector
|
|
- uim-stacked-key-vector))
|
|
- "-"))))
|
|
+ (message "%s" (concat (key-description
|
|
+ (vconcat uim-prefix-arg-vector
|
|
+ uim-stacked-key-vector))
|
|
+ "-"))))
|
|
))
|
|
|
|
(if uim-emacs
|
|
@@ -1512,7 +1515,7 @@
|
|
;;
|
|
(defun uim-el-version ()
|
|
(interactive)
|
|
- (message uim-el-version))
|
|
+ (message "%s" uim-el-version))
|
|
|
|
|
|
|