Mercurial > hg
changeset 364:33b8e801ffa6
Merge changeset 315 (65aa05520556)
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 24 Jul 2005 15:13:53 +0100 |
parents | 913915140ad2 (current diff) 65aa05520556 (diff) |
children | ddb6593bedc9 |
files | mcabber/NEWS mcabber/README mcabber/configure.ac mcabber/doc/mcabber.1 mcabber/doc/mcabber.1.html mcabber/doc/mcabber.1.txt mcabber/libjabber/xmltok_impl_c.h mcabber/mcabberrc.example mcabber/src/Makefile.am mcabber/src/commands.c mcabber/src/hbuf.h mcabber/src/histolog.c mcabber/src/hooks.c mcabber/src/hooks.h mcabber/src/jabglue.c mcabber/src/main.c mcabber/src/roster.c mcabber/src/roster.h mcabber/src/screen.c mcabber/src/screen.h mcabber/src/settings.c mcabber/src/settings.h mcabber/src/utf8.c mcabber/src/utils.c mcabber/src/utils.h |
diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/src/commands.c Sun Jul 24 15:01:24 2005 +0100 +++ b/mcabber/src/commands.c Sun Jul 24 15:13:53 2005 +0100 @@ -514,6 +514,8 @@ gpointer bud; if (!strcasecmp(arg, "abort")) { + if (scr_get_multimode()) + scr_LogPrint("Leaving multi-line message mode"); scr_set_multimode(FALSE); return; } else if ((!strcasecmp(arg, "begin")) || (!strcasecmp(arg, "verbatim"))) {
--- a/mcabber/src/main.c Sun Jul 24 15:01:24 2005 +0100 +++ b/mcabber/src/main.c Sun Jul 24 15:13:53 2005 +0100 @@ -127,8 +127,8 @@ mcabber_disconnect("Killed by SIGINT"); LastSigtermTime = now; signal(SIGINT, sig_handler); + scr_handle_sigint(); scr_LogPrint("Hit Ctrl-C twice to leave mcabber"); - scr_handle_sigint(); } else { ut_WriteLog("Caught signal: %d\n", signum); }
--- a/mcabber/src/screen.c Sun Jul 24 15:01:24 2005 +0100 +++ b/mcabber/src/screen.c Sun Jul 24 15:13:53 2005 +0100 @@ -1399,7 +1399,8 @@ void scr_handle_sigint(void) { - scr_LogPrint("In screen. completion_started=%d", completion_started); + // Leave multi-line mode + process_command("/msay abort"); // Same as Ctrl-g, now scr_cancel_current_completion(); scr_end_current_completion();