src/command/cmd_defs.c

@@ -2638,7 +2638,8 @@ static const struct cmd_t command_defs[] = {
       CMD_DESC(
               "Spawn external editor to edit message. "
               "After editing the inputline may appear empty. Press enter to send the text anyways. "
-              "Use /executable to set your favourite editor." )
+              "Use /executable to set your favourite editor. "
+              "Ctrl-Z in the editor aborts the session and returns to Profanity." )
     },
 
     { CMD_PREAMBLE("/correct-editor",

src/profanity.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib-unix.h>
 
 #include "profanity.h"
 #include "common.h"
@@ -219,15 +218,6 @@ sigterm_handler(int sig)
     force_quit = TRUE;
 }
 
-// SIGUSR1 escape for an alive-but-stuck editor (WUNTRACED can't catch it).
-// Dispatched in the main loop. Trigger: `pkill -USR1 profanity`.
-static gboolean
-_emergency_resume_handler(gpointer data)
-{
-    editor_emergency_kill();
-    return G_SOURCE_CONTINUE;
-}
-
 static void
 sigtstp_handler(int sig)
 {
@@ -252,7 +242,6 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
     signal(SIGWINCH, ui_sigwinch_handler);
     signal(SIGTERM, sigterm_handler);
     signal(SIGHUP, sigterm_handler);
-    g_unix_signal_add(SIGUSR1, _emergency_resume_handler, NULL);
     if (pthread_mutex_init(&lock, NULL) != 0) {
         log_error("Mutex init failed");
         exit(1);

src/tools/editor.h

@@ -16,9 +16,7 @@
 
 gboolean launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* data), void* user_data);
 
-// SIGUSR1 escape: SIGTERM the editor child. Use when WUNTRACED can't catch
-// it (alive but stuck). Wired in profanity.c.
-void editor_emergency_kill(void);
+void editor_emergency_kill(void); // SIGCONT+SIGTERM the editor child
 
 // TRUE if editor child is STOPPED (Ctrl-Z / :stop / gdb-attach). Does not
 // reap; g_child_watch keeps handling exit.