From e10044015841711b989f9a898d427bcc1fdb4c32 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 24 Oct 2020 20:49:43 +0200 Subject: patch 8.2.1898: command modifier parsing always uses global cmdmod Problem: Command modifier parsing always uses global cmdmod. Solution: Pass in cmdmod_T to use. Rename struct fields consistently. --- src/os_unix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/os_unix.c') diff --git a/src/os_unix.c b/src/os_unix.c index 27a88823f..d38cb9de4 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -7868,15 +7868,15 @@ clip_xterm_set_selection(Clipboard_T *cbd) static void xsmp_handle_interaction(SmcConn smc_conn, SmPointer client_data UNUSED) { - cmdmod_T save_cmdmod; + int save_cmod_flags; int cancel_shutdown = False; - save_cmdmod = cmdmod; - cmdmod.confirm = TRUE; + save_cmod_flags = cmdmod.cmod_flags; + cmdmod.cmod_flags |= CMOD_CONFIRM; if (check_changed_any(FALSE, FALSE)) // Mustn't logout cancel_shutdown = True; - cmdmod = save_cmdmod; + cmdmod.cmod_flags = save_cmod_flags; setcursor(); // position cursor out_flush(); -- cgit v1.2.1