From 1a1ee352ff582bc2595e06a3247f0f88ab9df0d3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 5 May 2018 21:41:03 +0200
Subject: [PATCH] [commandline] Change "--selection" to "--current-selection"

Plus documentation.

Work towards #4255.
---
 doc_src/commandline.txt     | 4 +++-
 src/builtin_commandline.cpp | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt
index 54869fa96..ce054737a 100644
--- a/doc_src/commandline.txt
+++ b/doc_src/commandline.txt
@@ -35,7 +35,9 @@ The following options change what part of the commandline is printed or updated:
 
 - `-p` or `--current-process` select the current process
 
-- `-t` or `--current-token` select the current token.
+- `-s` or `--current-selection` selects the current selection
+
+- `-t` or `--current-token` select the current token
 
 The following options change the way `commandline` prints the current commandline buffer:
 
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 161470f46..e392f37ea 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -213,10 +213,11 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     static const struct woption long_options[] = {{L"append", no_argument, NULL, 'a'},
                                                   {L"insert", no_argument, NULL, 'i'},
                                                   {L"replace", no_argument, NULL, 'r'},
+                                                  {L"current-buffer", no_argument, NULL, 'b'},
                                                   {L"current-job", no_argument, NULL, 'j'},
                                                   {L"current-process", no_argument, NULL, 'p'},
+                                                  {L"current-selection", no_argument, NULL, 's'},
                                                   {L"current-token", no_argument, NULL, 't'},
-                                                  {L"current-buffer", no_argument, NULL, 'b'},
                                                   {L"cut-at-cursor", no_argument, NULL, 'c'},
                                                   {L"function", no_argument, NULL, 'f'},
                                                   {L"tokenize", no_argument, NULL, 'o'},
@@ -225,7 +226,6 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
                                                   {L"cursor", no_argument, NULL, 'C'},
                                                   {L"line", no_argument, NULL, 'L'},
                                                   {L"search-mode", no_argument, NULL, 'S'},
-                                                  {L"selection", no_argument, NULL, 's'},
                                                   {L"paging-mode", no_argument, NULL, 'P'},
                                                   {NULL, 0, NULL, 0}};