# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1122214433 -3600
# Node ID 33b8e801ffa65a7d441e017022a76cccc17e9e27
# Parent  913915140ad26063607c6d5153b034c223b356ce# Parent  65aa055205563d7ec6b949ed2d900d14dbfea8c2
Merge changeset 315 (65aa05520556)


diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/NEWS
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/README
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/configure.ac
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/doc/mcabber.1
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/doc/mcabber.1.html
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/doc/mcabber.1.txt
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/libjabber/xmltok_impl_c.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/mcabberrc.example
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/Makefile.am
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/commands.c
--- 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"))) {
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/hbuf.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/histolog.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/hooks.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/hooks.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/jabglue.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/main.c
--- 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);
   }
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/roster.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/roster.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/screen.c
--- 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();
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/screen.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/settings.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/settings.h
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/utf8.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/utils.c
diff -r 913915140ad2 -r 33b8e801ffa6 mcabber/src/utils.h