Add some patch from mozc BTS.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Nobuhiro Iwamatsu
13 years ago
|
0 |
# http://code.google.com/p/mozc/issues/detail?id=51
|
|
1 |
# irieshinsuke
|
|
2 |
|
|
3 |
=== modified file 'unix/emacs/mozc.el'
|
|
4 |
--- a/unix/emacs/mozc.el 2010-10-10 05:46:39 +0000
|
|
5 |
+++ b/unix/emacs/mozc.el 2010-10-11 23:35:23 +0000
|
|
6 |
@@ -439,8 +439,10 @@
|
|
7 |
(defsubst mozc-cand-echo-area-update (candidates)
|
|
8 |
"Update the candidate list in the echo area.
|
|
9 |
CANDIDATES must be the candidates field in a response protobuf."
|
|
10 |
- (let (message-log-max)
|
|
11 |
- (message "%s" (mozc-cand-echo-area-make-contents candidates))))
|
|
12 |
+ (unless (and (minibufferp)
|
|
13 |
+ (eq (mozc-protobuf-get candidates 'category) 'suggestion))
|
|
14 |
+ (let (message-log-max)
|
|
15 |
+ (message "%s" (mozc-cand-echo-area-make-contents candidates)))))
|
|
16 |
|
|
17 |
(defun mozc-cand-echo-area-make-contents (candidates)
|
|
18 |
"Make a list of candidates as an echo area message.
|
|
19 |
|
|
0 |
# http://code.google.com/p/mozc/issues/detail?id=50
|
|
1 |
|
|
2 |
=== modified file 'unix/emacs/mozc.el'
|
|
3 |
--- a/unix/emacs/mozc.el 2010-10-10 05:14:56 +0000
|
|
4 |
+++ b/unix/emacs/mozc.el 2010-10-10 05:46:39 +0000
|
|
5 |
@@ -351,16 +351,24 @@
|
|
6 |
"Make a preedit text and set its text properties.
|
|
7 |
PREEDIT must be the preedit field in a response protobuf.
|
|
8 |
Non-nil SEPARATOR is inserted between each piece of segments."
|
|
9 |
- (mapconcat
|
|
10 |
- (lambda (segment)
|
|
11 |
- (apply 'propertize (mozc-protobuf-get segment 'value)
|
|
12 |
- (case (mozc-protobuf-get segment 'annotation)
|
|
13 |
- (highlight
|
|
14 |
- '(face mozc-preedit-selected-face))
|
|
15 |
- (t
|
|
16 |
- '(face mozc-preedit-face)))))
|
|
17 |
- (mozc-protobuf-get preedit 'segment)
|
|
18 |
- separator))
|
|
19 |
+ (let* ((segments (mozc-protobuf-get preedit 'segment))
|
|
20 |
+ (retval (mapconcat
|
|
21 |
+ (lambda (segment)
|
|
22 |
+ (apply 'propertize (mozc-protobuf-get segment 'value)
|
|
23 |
+ (case (mozc-protobuf-get segment 'annotation)
|
|
24 |
+ (highlight
|
|
25 |
+ '(face mozc-preedit-selected-face))
|
|
26 |
+ (t
|
|
27 |
+ '(face mozc-preedit-face)))))
|
|
28 |
+ segments
|
|
29 |
+ separator))
|
|
30 |
+ (cursor (mozc-protobuf-get preedit 'cursor)))
|
|
31 |
+ (if (and (= 1 (length segments))
|
|
32 |
+ (< cursor (length retval)))
|
|
33 |
+ (put-text-property cursor (1+ cursor)
|
|
34 |
+ 'face 'mozc-preedit-selected-face
|
|
35 |
+ retval))
|
|
36 |
+ retval))
|
|
37 |
|
|
38 |
(defvar mozc-preedit-style nil
|
|
39 |
"Visual style of preedit.
|
|
40 |
|
0 | 0 |
0001-Add-support-kfreebsd.patch
|
1 | 1 |
0002-Add-uim-mozc-r204.patch
|
2 | 2 |
r47-r48.patch
|
|
3 |
emacs_mozc_isuue48.patch
|
|
4 |
mozc-el-pseudo-cursor.patch
|
|
5 |
mozc-el-not-suggest-in-minibuffer-fixed.patch
|
3 | 6 |
add_file_to_gypfile_check.patch
|