diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-10-16 21:31:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-16 21:31:29 -0400 |
commit | 3a5a8aa5adec0ff86f75895bde141d93dbb58d34 (patch) | |
tree | 8a17c1f3dfa4c4f009063b6c53e93223837fad10 | |
parent | Truncate message, append buffer overflow message if too long. (diff) | |
parent | Merge pull request #2855 from SpeedJack/sysconfdir-fhs-compliant (diff) | |
download | sway-3a5a8aa5adec0ff86f75895bde141d93dbb58d34.tar.gz sway-3a5a8aa5adec0ff86f75895bde141d93dbb58d34.tar.zst sway-3a5a8aa5adec0ff86f75895bde141d93dbb58d34.zip |
Merge branch 'master' into feature/2842_TruncateMessage
-rw-r--r-- | meson.build | 4 | ||||
-rw-r--r-- | sway/commands/workspace.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 31c3e53e..3fb1e81e 100644 --- a/meson.build +++ b/meson.build | |||
@@ -114,7 +114,7 @@ if scdoc.found() | |||
114 | endforeach | 114 | endforeach |
115 | endif | 115 | endif |
116 | 116 | ||
117 | add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') | 117 | add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') |
118 | 118 | ||
119 | version = get_option('sway-version') | 119 | version = get_option('sway-version') |
120 | if version != '' | 120 | if version != '' |
@@ -157,7 +157,7 @@ subdir('swaynag') | |||
157 | subdir('swaylock') | 157 | subdir('swaylock') |
158 | 158 | ||
159 | config = configuration_data() | 159 | config = configuration_data() |
160 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) | 160 | config.set('sysconfdir', sysconfdir) |
161 | config.set('datadir', join_paths(prefix, datadir)) | 161 | config.set('datadir', join_paths(prefix, datadir)) |
162 | config.set('prefix', prefix) | 162 | config.set('prefix', prefix) |
163 | 163 | ||
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 61aa443d..58c2201d 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c | |||
@@ -142,7 +142,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
142 | strcasecmp(argv[0], "current") == 0) { | 142 | strcasecmp(argv[0], "current") == 0) { |
143 | ws = workspace_by_name(argv[0]); | 143 | ws = workspace_by_name(argv[0]); |
144 | } else if (strcasecmp(argv[0], "back_and_forth") == 0) { | 144 | } else if (strcasecmp(argv[0], "back_and_forth") == 0) { |
145 | if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) { | 145 | if (!prev_workspace_name) { |
146 | return cmd_results_new(CMD_INVALID, "workspace", | ||
147 | "There is no previous workspace"); | ||
148 | } | ||
149 | if (!(ws = workspace_by_name(argv[0]))) { | ||
146 | ws = workspace_create(NULL, prev_workspace_name); | 150 | ws = workspace_create(NULL, prev_workspace_name); |
147 | } | 151 | } |
148 | } else { | 152 | } else { |