Merge pull request #3641 from Pyrohh/X11

[RFC] Be more explicit about the lack of X11 integration

Reviewed-by: @justinmk 

7 files changed, 6 insertions, 8 deletions

diff --git a/cmake/GenerateHelptags.cmake.in b/cmake/GenerateHelptags.cmake.in
index 0df10d730e..3ced2c0b17 100644
--- a/cmake/GenerateHelptags.cmake.in
+++ b/cmake/GenerateHelptags.cmake.in
@@ -25,7 +25,7 @@ file(WRITE ${EMPTY_FILE} "")
 execute_process(
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim
     -u NONE
-    -esX
+    -es
     -c "helptags ++t ."
     -c quit
   WORKING_DIRECTORY ${HELPTAGS_WORKING_DIRECTORY}
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 46c5cf8235..ef8e38b553 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -38,7 +38,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
   COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
     -u NONE
     -i NONE
-    -esX
+    -es
     --headless
     -c "helptags ++t ."
     -c quit
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 07b4226151..7423e63673 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -20,7 +20,7 @@ all: tags html
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags: $(DOCS)
-	$(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
+	$(VIMEXE) -u NONE -es -c "helptags ++t ." -c quit
 
 # Use "doctags" to generate the tags file.  Only works for English!
 tags: doctags $(DOCS)
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index b8de17738a..976890f7d7 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -218,6 +218,7 @@ Other commands:
 Other compile-time features:
   EBCDIC
   Emacs tags support
+  X11 integration (see |x11-selection|)
 
 Nvim does not have a built-in GUI and hence the following aliases have been
 removed: gvim, gex, gview, rgvim, rgview
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 43723ff363..def0c46ae9 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -935,9 +935,6 @@ static void command_line_scan(mparm_T *parmp)
           want_argument = TRUE;
           break;
 
-        case 'X':                 /* "-X"  don't connect to X server */
-          break;
-
         case 'Z':                 /* "-Z"  restricted mode */
           restricted = TRUE;
           break;
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 243ac19b33..6687918df4 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -82,7 +82,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
     set(poFile ${CMAKE_CURRENT_SOURCE_DIR}/${name}.po)
 
     add_custom_target(check-po-${name}
-      COMMAND $<TARGET_FILE:nvim> -u NONE -n -e -X
+      COMMAND $<TARGET_FILE:nvim> -u NONE -n -e
           -S ${CMAKE_CURRENT_SOURCE_DIR}/check.vim
           -c "if error == 0 | q | endif" -c cq ${poFile} ||
           ${CMAKE_COMMAND} -E echo "${name}.po failed the check."
diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim
index 4cb500292d..afee9d882c 100644
--- a/src/nvim/testdir/test49.vim
+++ b/src/nvim/testdir/test49.vim
@@ -456,7 +456,7 @@ function! ExtraVim(...)
     " messing up the user's viminfo file.
     let redirect = a:0 ?
 	\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
-    exec "!echo '" . debug_quits . "q' | ../../../build/bin/nvim -u NONE -N -Xes" . redirect .
+    exec "!echo '" . debug_quits . "q' | ../../../build/bin/nvim -u NONE -N -es" . redirect .
 	\ " -c 'debuggreedy|set viminfo+=nviminfo'" .
 	\ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
 	\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .