Merge remote-tracking branch 'vanilla/next' into gaps-next

docs/userguide

@@ -1628,14 +1628,16 @@ buttons. This is useful if you want to have a named workspace that stays in
 order on the bar according to its number without displaying the number prefix.
 
 When +strip_workspace_numbers+ is set to +yes+, any workspace that has a name of
-the form "[n]:[NAME]" will display only the name. You could use this, for
+the form "[n][:][NAME]" will display only the name. You could use this, for
 instance, to display Roman numerals rather than digits by naming your
 workspaces to "1:I", "2:II", "3:III", "4:IV", ...
 
 When +strip_workspace_name+ is set to +yes+, any workspace that has a name of
-the form "[n]:[NAME]" will display only the number.
+the form "[n][:][NAME]" will display only the number.
 
-The default is to display the full name within the workspace button.
+The default is to display the full name within the workspace button. Be aware
+that the colon in the workspace name is optional, so `[n][NAME]` will also 
+have the the workspace name and number stripped correctly. 
 
 *Syntax*:
 ------------------------------

src/randr.c

@@ -974,10 +974,12 @@ void randr_disable_output(Output *output) {
             }
         }
 
-        /* Restore focus after con_detach / con_attach */
-        DLOG("now focusing next = %p\n", next);
-        con_focus(next);
-        workspace_show(con_get_workspace(next));
+        /* Restore focus after con_detach / con_attach. next can be NULL, see #3523. */
+        if (next) {
+            DLOG("now focusing next = %p\n", next);
+            con_focus(next);
+            workspace_show(con_get_workspace(next));
+        }
 
         /* 3: move the dock clients to the first output */
         Con *child;

src/startup.c

@@ -190,6 +190,7 @@ void start_application(const char *command, bool no_startup_id) {
             /* Setup the environment variable(s) */
             if (!no_startup_id)
                 sn_launcher_context_setup_child_process(context);
+            setenv("I3SOCK", current_socketpath, 1);
 
             execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, NULL);
             /* not reached */