Revision: 6655
Author: ek.kato
Date: Mon Aug 2 22:43:55 2010
Log: * Merge r6650:6654 from trunk.
http://code.google.com/p/uim/source/detail?r=6655
Modified:
/branches/1.6
/branches/1.6/po
/branches/1.6/po/fr.po
/branches/1.6/po/ja.po
/branches/1.6/po/ko.po
/branches/1.6/scm/annotation-filter.scm
/branches/1.6/scm/im-custom.scm
/branches/1.6/scm/prime.scm
/branches/1.6/scm/process.scm
/branches/1.6/scm/tutcode-key-custom.scm
=======================================
--- /branches/1.6/po/fr.po Sun Jul 25 06:51:32 2010
+++ /branches/1.6/po/fr.po Mon Aug 2 22:43:55 2010
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: uim 1.4.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-07-25 22:48+0900\n"
+"POT-Creation-Date: 2010-08-03 14:29+0900\n"
"PO-Revision-Date: 2009-01-05 20:52+0900\n"
"Last-Translator: Thierry Vignaud <[email protected]>\n"
"Language-Team: fr <[email protected]>\n"
@@ -541,54 +541,59 @@
#: ../helper/toolbar-common-gtk.c:85
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:78
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:140
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:96
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:173
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:105
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:182
msgid "Switch input method"
msgstr ""
#: ../helper/toolbar-common-gtk.c:94
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:79
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:165
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:98
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:199
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:107
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:208
msgid "Preference"
msgstr ""
#: ../helper/toolbar-common-gtk.c:103
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:80
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:189
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:100
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:224
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:233
msgid "Japanese dictionary editor"
msgstr ""
#: ../helper/toolbar-common-gtk.c:112
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:81
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:213
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:102
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:249
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:111
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:258
msgid "Input pad"
msgstr ""
#: ../helper/toolbar-common-gtk.c:121
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:82
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:237
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:104
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:274
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:113
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:283
msgid "Handwriting input pad"
msgstr ""
#: ../helper/toolbar-common-gtk.c:134
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:83
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:260
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:106
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:298 ../scm/im-custom.scm:53
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:115
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:307 ../scm/im-custom.scm:53
msgid "Help"
msgstr "Aide"
-#: ../helper/toolbar-common-gtk.c:863
+#: ../helper/toolbar-common-gtk.c:247 ../helper/toolbar-common-gtk.c:491
+#, c-format
+msgid "Cannot launch '%s'."
+msgstr ""
+
+#: ../helper/toolbar-common-gtk.c:876
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:85
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:118
msgid "Quit this toolbar"
msgstr ""
@@ -655,6 +660,10 @@
msgid "Show this dialog on startup"
msgstr ""
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:56
+msgid "Cannot launch '%1'."
+msgstr ""
+
#: ../scm/action.scm:498 ../scm/action.scm:499
msgid "unknown"
msgstr "inconnu"
@@ -3201,7 +3210,7 @@
msgstr ""
#: ../scm/im-custom.scm:847
-msgid "Timeout"
+msgid "Timeout (msec)"
msgstr ""
#: ../scm/im-custom.scm:848
@@ -4425,18 +4434,23 @@
msgid "Prime connection is not defined"
msgstr ""
-#: ../scm/process.scm:56 ../scm/process.scm:87
+#: ../scm/process.scm:62 ../scm/process.scm:109
msgid "cannot fork"
msgstr ""
-#: ../scm/process.scm:66
+#: ../scm/process.scm:73
msgid "cannot duplicate stdin"
msgstr ""
-#: ../scm/process.scm:71
+#: ../scm/process.scm:80
msgid "cannot duplicate stdout"
msgstr ""
+#: ../scm/process.scm:85 ../scm/process.scm:114
+#, scheme-format
+msgid "cannot execute ~a"
+msgstr ""
+
#: ../scm/pyload.scm:42
msgid "New Pinyin (Simplified)"
msgstr "Pinyin (simplifié)"
=======================================
--- /branches/1.6/po/ja.po Mon Jul 26 03:39:02 2010
+++ /branches/1.6/po/ja.po Mon Aug 2 22:43:55 2010
@@ -99,7 +99,7 @@
msgstr ""
"Project-Id-Version: uim 1.5.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-07-25 22:48+0900\n"
+"POT-Creation-Date: 2010-08-03 14:29+0900\n"
"PO-Revision-Date: 2009-02-14 21:58+0900\n"
"Last-Translator: YamaKen <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -645,54 +645,59 @@
#: ../helper/toolbar-common-gtk.c:85
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:78
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:140
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:96
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:173
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:105
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:182
msgid "Switch input method"
msgstr "入力方式の切り換え"
#: ../helper/toolbar-common-gtk.c:94
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:79
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:165
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:98
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:199
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:107
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:208
msgid "Preference"
msgstr "設定"
#: ../helper/toolbar-common-gtk.c:103
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:80
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:189
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:100
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:224
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:233
msgid "Japanese dictionary editor"
msgstr "日本語辞書ツール"
#: ../helper/toolbar-common-gtk.c:112
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:81
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:213
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:102
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:249
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:111
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:258
msgid "Input pad"
msgstr "入力パッド"
#: ../helper/toolbar-common-gtk.c:121
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:82
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:237
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:104
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:274
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:113
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:283
msgid "Handwriting input pad"
msgstr "手書き入力パッド"
#: ../helper/toolbar-common-gtk.c:134
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:83
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:260
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:106
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:298 ../scm/im-custom.scm:53
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:115
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:307 ../scm/im-custom.scm:53
msgid "Help"
msgstr "ヘルプ"
-#: ../helper/toolbar-common-gtk.c:863
+#: ../helper/toolbar-common-gtk.c:247 ../helper/toolbar-common-gtk.c:491
+#, c-format
+msgid "Cannot launch '%s'."
+msgstr "'%s' を起動できません。"
+
+#: ../helper/toolbar-common-gtk.c:876
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:85
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:118
msgid "Quit this toolbar"
msgstr "終了"
@@ -761,6 +766,10 @@
msgid "Show this dialog on startup"
msgstr "起動時にこのダイアログを表示"
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:56
+msgid "Cannot launch '%1'."
+msgstr "'%1' を起動できません。"
+
#: ../scm/action.scm:498 ../scm/action.scm:499
msgid "unknown"
msgstr "不明"
@@ -3329,8 +3338,8 @@
msgstr "Httpプロキシポート番号"
#: ../scm/im-custom.scm:847
-msgid "Timeout"
-msgstr "タイムアウト"
+msgid "Timeout (msec)"
+msgstr "タイムアウト (msec)"
#: ../scm/im-custom.scm:848
msgid "Timeout of http connection (msec)."
@@ -4556,18 +4565,23 @@
msgid "Prime connection is not defined"
msgstr "PRIMEの通信が定義されていません。"
-#: ../scm/process.scm:56 ../scm/process.scm:87
+#: ../scm/process.scm:62 ../scm/process.scm:109
msgid "cannot fork"
msgstr "フォークできませんでした。"
-#: ../scm/process.scm:66
+#: ../scm/process.scm:73
msgid "cannot duplicate stdin"
msgstr "標準入力を複製できませんでした。"
-#: ../scm/process.scm:71
+#: ../scm/process.scm:80
msgid "cannot duplicate stdout"
msgstr "標準出力を複製できませんでした。"
+#: ../scm/process.scm:85 ../scm/process.scm:114
+#, scheme-format
+msgid "cannot execute ~a"
+msgstr "~a を実行できませんでした。"
+
#: ../scm/pyload.scm:42
msgid "New Pinyin (Simplified)"
msgstr "新ピンイン (簡体字)"
=======================================
--- /branches/1.6/po/ko.po Sun Jul 25 06:51:32 2010
+++ /branches/1.6/po/ko.po Mon Aug 2 22:43:55 2010
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: uim 1.4.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-07-25 22:48+0900\n"
+"POT-Creation-Date: 2010-08-03 14:29+0900\n"
"PO-Revision-Date: 2009-01-05 20:54+0900\n"
"Last-Translator: Jae-hyeon Park <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
@@ -550,54 +550,59 @@
#: ../helper/toolbar-common-gtk.c:85
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:78
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:140
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:96
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:173
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:105
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:182
msgid "Switch input method"
msgstr "입력기 전환"
#: ../helper/toolbar-common-gtk.c:94
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:79
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:165
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:98
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:199
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:107
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:208
msgid "Preference"
msgstr "설정"
#: ../helper/toolbar-common-gtk.c:103
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:80
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:189
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:100
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:224
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:233
msgid "Japanese dictionary editor"
msgstr "일본어 사전 도구"
#: ../helper/toolbar-common-gtk.c:112
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:81
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:213
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:102
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:249
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:111
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:258
msgid "Input pad"
msgstr "입력 패드"
#: ../helper/toolbar-common-gtk.c:121
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:82
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:237
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:104
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:274
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:113
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:283
msgid "Handwriting input pad"
msgstr "손글씨 입력 패드"
#: ../helper/toolbar-common-gtk.c:134
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:83
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:260
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:106
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:298 ../scm/im-custom.scm:53
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:115
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:307 ../scm/im-custom.scm:53
msgid "Help"
msgstr "도움말"
-#: ../helper/toolbar-common-gtk.c:863
+#: ../helper/toolbar-common-gtk.c:247 ../helper/toolbar-common-gtk.c:491
+#, c-format
+msgid "Cannot launch '%s'."
+msgstr ""
+
+#: ../helper/toolbar-common-gtk.c:876
#: ../qt/toolbar-common-quimhelpertoolbar.cpp:85
-#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:109
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:118
msgid "Quit this toolbar"
msgstr "종료"
@@ -666,6 +671,10 @@
msgid "Show this dialog on startup"
msgstr "시작할 때 이 대화창을 표시"
+#: ../qt4/toolbar/common-quimhelpertoolbar.cpp:56
+msgid "Cannot launch '%1'."
+msgstr ""
+
#: ../scm/action.scm:498 ../scm/action.scm:499
msgid "unknown"
msgstr "모름"
@@ -3212,7 +3221,7 @@
msgstr ""
#: ../scm/im-custom.scm:847
-msgid "Timeout"
+msgid "Timeout (msec)"
msgstr ""
#: ../scm/im-custom.scm:848
@@ -4436,18 +4445,23 @@
msgid "Prime connection is not defined"
msgstr ""
-#: ../scm/process.scm:56 ../scm/process.scm:87
+#: ../scm/process.scm:62 ../scm/process.scm:109
msgid "cannot fork"
msgstr ""
-#: ../scm/process.scm:66
+#: ../scm/process.scm:73
msgid "cannot duplicate stdin"
msgstr ""
-#: ../scm/process.scm:71
+#: ../scm/process.scm:80
msgid "cannot duplicate stdout"
msgstr ""
+#: ../scm/process.scm:85 ../scm/process.scm:114
+#, scheme-format
+msgid "cannot execute ~a"
+msgstr ""
+
#: ../scm/pyload.scm:42
msgid "New Pinyin (Simplified)"
msgstr ""
=======================================
--- /branches/1.6/scm/annotation-filter.scm Mon Jun 21 18:19:54 2010
+++ /branches/1.6/scm/annotation-filter.scm Mon Aug 2 22:43:55 2010
@@ -45,7 +45,7 @@
(define annotation-filter-socket-pair #f)
-(define (annotation-filter-open-unix-domain-socket)
+(define (annotation-filter-open-with-unix-domain-socket)
(and-let* ((fd (unix-domain-socket-connect
annotation-filter-unix-domain-socket-path)))
(cons fd fd)))
@@ -66,15 +66,20 @@
((eq? annotation-filter-server-setting? 'pipe)
(annotation-filter-open-with-pipe))
(else
- (uim-notify-fatal (N_ "Custom filter connection
is not defined"))))))
- (set! annotation-filter-socket-pair (cons (open-file-port (car
fds))
- (open-file-port (cdr
fds))))
- #t)))
+ (uim-notify-fatal (N_ "Custom filter connection
is not defined"))
+ #f))))
+ (if fds
+ (set! annotation-filter-socket-pair (cons
+ (open-file-port (car fds))
+ (open-file-port (cdr
fds))))
+ (set! annotation-filter-socket-pair #f)))))
(define (annotation-filter-read-message iport)
(let loop ((line (file-read-line iport))
(rest ""))
- (if (string=? "." line)
+ (if (or (not line)
+ (eof-object? line)
+ (string=? "." line))
rest
(loop (file-read-line iport) (string-append rest line)))))
=======================================
--- /branches/1.6/scm/im-custom.scm Thu Jul 22 18:17:58 2010
+++ /branches/1.6/scm/im-custom.scm Mon Aug 2 22:43:55 2010
@@ -844,7 +844,7 @@
(define-custom 'http-timeout 3000
'(http)
'(integer 0 65535)
- (N_ "Timeout")
+ (N_ "Timeout (msec)")
(N_ "Timeout of http connection (msec)."))
(load "predict-custom.scm")
=======================================
--- /branches/1.6/scm/prime.scm Sun Aug 1 17:30:14 2010
+++ /branches/1.6/scm/prime.scm Mon Aug 2 22:43:55 2010
@@ -867,7 +867,8 @@
((eq? prime-server-setting? 'pipe)
(prime-open-with-pipe "prime"))
(else
- (uim-notify-fatal (N_ "Prime connection is not
defined"))))))
+ (uim-notify-fatal (N_ "Prime connection is not
defined"))
+ #f))))
(if fds
(cons (open-file-port (car fds))
(open-file-port (cdr fds)))
=======================================
--- /branches/1.6/scm/process.scm Sun Aug 1 17:30:14 2010
+++ /branches/1.6/scm/process.scm Mon Aug 2 22:43:55 2010
@@ -29,6 +29,7 @@
;;; SUCH DAMAGE.
;;;;
+(require-extension (srfi 2))
(require "i18n.scm")
(require "fileio.scm")
(require-dynlib "process")
@@ -42,6 +43,10 @@
(execve file argv envp)
(execvp file argv))))
+(define process-exec-failed 1)
+(define process-dup2-failed 2)
+(define process-fork-failed 4)
+
(define (process-io file . args)
(let-optionals* args ((argv (list file)))
(and-let* ((pin (create-pipe))
@@ -50,7 +55,8 @@
(pin-out (cdr pin))
(pout-in (car pout))
(pout-out (cdr pout)))
- (let ((pid (process-fork)))
+ (let ((pid (process-fork))
+ (ret 0))
(cond ((< pid 0)
(begin
(uim-notify-fatal (N_ "cannot fork"))
@@ -63,22 +69,37 @@
(setsid)
(file-close pin-out)
(if (< (duplicate-fileno pin-in 0) 0)
- (uim-notify-fatal (N_ "cannot duplicate stdin")))
+ (begin
+ (uim-notify-fatal (N_ "cannot duplicate stdin"))
+ (set! ret (bitwise-ior ret process-dup2-failed))))
(file-close pin-in)
(file-close pout-in)
(if (< (duplicate-fileno pout-out 1) 0)
- (uim-notify-fatal (N_ "cannot duplicate stdout")))
+ (begin
+ (uim-notify-fatal (N_ "cannot duplicate stdout"))
+ (set! ret (bitwise-ior ret process-dup2-failed))))
(file-close pout-out)
(if (= (process-execute file argv) -1)
(uim-notify-fatal (format (N_ "cannot execute ~a") file)))
+ (set! ret (bitwise-ior ret process-exec-failed))
+ (file-write-string 1 (number->string ret))
(_exit 1)
)
(else ;; parent
(file-close pin-in)
(file-close pout-out)
- (cons pout-in pin-out)))))))
+ (if (and-let*
+ (((file-ready? (list pout-in) 100))
+ (lst (file-read pout-in 1))
+ ((not (eof-object? lst)))
+ ((> (string->number (list->string lst)) 0))))
+ (begin
+ (file-close pout-in)
+ (file-close pin-out)
+ #f)
+ (cons pout-in pin-out))))))))
(define (process-with-daemon file . args)
(let-optionals* args ((argv (list file)))
=======================================
--- /branches/1.6/scm/tutcode-key-custom.scm Sun Jul 18 17:46:13 2010
+++ /branches/1.6/scm/tutcode-key-custom.scm Mon Aug 2 22:43:55 2010
@@ -155,7 +155,7 @@
(N_ "[TUT-Code] register new entry to dictionary")
(N_ "long description will be here"))
-(define-custom 'tutcode-purge-candidate-key '("<IgnoreCase><Shift>x") ;; "X"
+(define-custom 'tutcode-purge-candidate-key '("<IgnoreShift>!")
'(tutcode-keys2)
'(key)
(N_ "[TUT-Code] purge the entry from dictionary")
