Now that parsing is common, merge some of the small, related commands

together to use the same code.

Also add some arguments (such as -n and -p) to some commands to match
existing commands.

1 files changed, 6 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 0f7f403e..4c48ccdb 100644
--- a/Makefile
+++ b/Makefile
@@ -9,20 +9,20 @@ SRCS=	arguments.c attributes.c cfg.c client.c clock.c \
 	cmd-choose-buffer.c cmd-delete-buffer.c cmd-detach-client.c \
 	cmd-find-window.c cmd-has-session.c cmd-kill-pane.c \
 	cmd-kill-server.c cmd-kill-session.c cmd-kill-window.c \
-	cmd-last-pane.c cmd-last-window.c cmd-link-window.c cmd-list-buffers.c \
+	cmd-link-window.c cmd-list-buffers.c \
 	cmd-list-clients.c cmd-list-commands.c cmd-list-keys.c \
 	cmd-list-sessions.c cmd-list-windows.c cmd-list-panes.c \
 	cmd-list.c cmd-load-buffer.c cmd-join-pane.c \
-	cmd-lock-server.c cmd-lock-client.c cmd-lock-session.c \
+	cmd-lock-server.c \
 	cmd-move-window.c cmd-new-session.c cmd-new-window.c \
-	cmd-next-layout.c cmd-next-window.c cmd-paste-buffer.c \
-	cmd-previous-layout.c cmd-previous-window.c cmd-refresh-client.c \
+	cmd-paste-buffer.c \
+	cmd-refresh-client.c \
 	cmd-rename-session.c cmd-rename-window.c cmd-resize-pane.c \
 	cmd-respawn-window.c cmd-rotate-window.c cmd-save-buffer.c \
 	cmd-select-layout.c cmd-select-pane.c cmd-select-window.c \
 	cmd-send-keys.c cmd-send-prefix.c cmd-server-info.c cmd-set-buffer.c \
-	cmd-set-option.c cmd-set-window-option.c cmd-show-buffer.c \
-	cmd-show-messages.c cmd-show-options.c cmd-show-window-options.c \
+	cmd-set-option.c cmd-show-buffer.c \
+	cmd-show-messages.c cmd-show-options.c \
 	cmd-source-file.c cmd-split-window.c cmd-start-server.c cmd-string.c \
 	cmd-run-shell.c cmd-suspend-client.c cmd-swap-pane.c cmd-swap-window.c \
 	cmd-switch-client.c cmd-unbind-key.c cmd-unlink-window.c \