aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorMichael Reed <Pyrohh@users.noreply.github.com>2015-11-11 12:19:40 -0500
committerMichael Reed <Pyrohh@users.noreply.github.com>2015-11-11 12:19:40 -0500
commit1ee6a6e7d4ace3ab59fa34161d3090eef7a417ed (patch)
tree03e486371819f8aba909d32755190a371fdeaeff /runtime
parent947e356cdaa931bec9b2314c36bbfed926514030 (diff)
parent2fbcc9ab769ee5f86a649824f59e0e008e072fb6 (diff)
downloadrneovim-1ee6a6e7d4ace3ab59fa34161d3090eef7a417ed.tar.gz
rneovim-1ee6a6e7d4ace3ab59fa34161d3090eef7a417ed.tar.bz2
rneovim-1ee6a6e7d4ace3ab59fa34161d3090eef7a417ed.zip
Merge pull request #3641 from Pyrohh/X11
[RFC] Be more explicit about the lack of X11 integration Reviewed-by: @justinmk
Diffstat (limited to 'runtime')
-rw-r--r--runtime/CMakeLists.txt2
-rw-r--r--runtime/doc/Makefile2
-rw-r--r--runtime/doc/vim_diff.txt1
3 files changed, 3 insertions, 2 deletions
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