commit f2ad1aa734f98e8e0edae8fdce3c9b1848388a5d
parent 6ffacbcfaba9d0c2a2f0bc254abbef14a3ff5697
Author: ukai <ukai>
Date: Thu, 27 Dec 2001 17:23:06 +0000
[w3m-dev 02757]
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 02757]
+ * main.c (execdict): w = conv_from_system(word)
+ * main.c (dictword): call execdict() only
+
2001-12-27 Fumitoshi UKAI <ukai@debian.or.jp>
* url.c (openSSLHandle): accept_this_file is out of
diff --git a/main.c b/main.c
@@ -4600,6 +4600,7 @@ GetWord(Buffer *buf)
static void
execdict(char *word)
{
+ char *w;
Buffer *buf;
MySignalHandler(*prevtrap) ();
@@ -4607,11 +4608,15 @@ execdict(char *word)
displayBuffer(Currentbuf, B_NORMAL);
return;
}
+ w = conv_to_system(word);
+ if (*w == '\0') {
+ displayBuffer(Currentbuf, B_NORMAL);
+ return;
+ }
prevtrap = signal(SIGINT, intTrap);
crmode();
- buf = getshell(myExtCommand(DICTCMD, shell_quote(word), FALSE)->ptr);
- buf->filename = word;
- word = conv_from_system(word);
+ buf = getshell(myExtCommand(DICTCMD, shell_quote(w), FALSE)->ptr);
+ buf->filename = w;
buf->buffername = Sprintf("%s %s", DICTBUFFERNAME, word)->ptr;
signal(SIGINT, prevtrap);
term_raw();
@@ -4632,13 +4637,7 @@ execdict(char *word)
void
dictword(void)
{
- char *word = inputStr("(dictionary)!", "");
-
- if (word != NULL)
- word = conv_to_system(word);
- if (word == NULL || *word == '\0')
- return;
- execdict(word);
+ execdict(inputStr("(dictionary)!", ""));
}
void