Codebase list mozc / f75c9f4
Remove unnecessary patches Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 12 years ago
5 changed file(s) with 0 addition(s) and 142 deletion(s). Raw diff Collapse all Expand all
+0
-34
debian/patches/emacs_mozc_isuue48.patch less more
0 # http://code.google.com/p/mozc/issues/detail?id=48
1 # irieshinsuke
2
3 Index: unix/emacs/mozc.el
4 ===================================================================
5 --- a/unix/emacs/mozc.el (revision 47)
6 +++ b/unix/emacs/mozc.el (working copy)
7 @@ -112,10 +112,6 @@
8 ;; disabled
9 (mozc-clean-up-session)
10 ;; enabled
11 - ;; Check the terminal type.
12 - (unless window-system
13 - ;; TODO(yukishiino): Better supports tty terminals.
14 - (error "Mozc doesn't support a tty terminal"))
15 ;; Put the keymap at the top of the list of minor mode keymaps.
16 (setq minor-mode-map-alist
17 (cons (cons 'mozc-mode mozc-mode-map)
18 @@ -198,7 +194,7 @@
19 without Mozc finding another command bound to the key sequence.
20
21 EVENT is the last input event, which is usually passed by the command loop."
22 - (interactive (list last-input-event))
23 + (interactive (list last-command-event))
24 (cond
25 ;; Keyboard event
26 ((or (integerp event) (symbolp event))
27 @@ -247,6 +243,7 @@
28 (cons (case basic-type
29 ;; TODO(yuizumi): Supports Kana input.
30 (?\s 'space) ; space
31 + (127 'backspace)
32 (t basic-type))
33 (event-modifiers event))))
+0
-34
debian/patches/ibus_mozc_issue18.patch less more
0 Index: unix/ibus/mozc_engine.cc
1 ===================================================================
2 --- a/unix/ibus/mozc_engine.cc (リビジョン 35)
3 +++ b/unix/ibus/mozc_engine.cc (作業コピー)
4 @@ -499,17 +499,19 @@
5 IBusProperty *prop = NULL;
6
7 #ifndef OS_CHROMEOS
8 - DCHECK(prop_mozc_tool_);
9 - while (prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++)) {
10 - if (!g_strcmp0(property_name, prop->key)) {
11 - const MozcEngineToolProperty *entry =
12 - reinterpret_cast<const MozcEngineToolProperty*>(
13 - g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
14 - DCHECK(entry->mode);
15 - if (!session_->LaunchTool(entry->mode, "")) {
16 - LOG(ERROR) << "cannot launch: " << entry->mode;
17 + if (IsMozcToolAvailable()) {
18 + DCHECK(prop_mozc_tool_);
19 + while (prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++)) {
20 + if (!g_strcmp0(property_name, prop->key)) {
21 + const MozcEngineToolProperty *entry =
22 + reinterpret_cast<const MozcEngineToolProperty*>(
23 + g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
24 + DCHECK(entry->mode);
25 + if (!session_->LaunchTool(entry->mode, "")) {
26 + LOG(ERROR) << "cannot launch: " << entry->mode;
27 + }
28 + return;
29 }
30 - return;
31 }
32 }
33 #endif
+0
-20
debian/patches/mozc-el-not-suggest-in-minibuffer-fixed.patch less more
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
-41
debian/patches/mozc-el-pseudo-cursor.patch less more
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
-13
debian/patches/r47-r48.patch less more
0 Index: unix/ibus/session.cc
1 ===================================================================
2 --- a/unix/ibus/session.cc (リビジョン 47)
3 +++ b/unix/ibus/session.cc (作業コピー)
4 @@ -158,7 +158,7 @@
5
6 commands::Command command;
7 command.mutable_input()->set_type(commands::Input::CREATE_SESSION);
8 - command.mutable_input()->set_capability(client_capability_);
9 + command.mutable_input()->mutable_capability()->CopyFrom(client_capability_);
10 if (!handler_->EvalCommand(&command)) {
11 LOG(ERROR) << "EvalCommand failed";
12 return false;