aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-11-10 01:45:03 -0500
committerMichael Reed <m.reed@mykolab.com>2015-11-10 20:10:55 -0500
commit2fbcc9ab769ee5f86a649824f59e0e008e072fb6 (patch)
tree26abffa31069d06a0554546e221a00b9ea5e5651 /src
parent3b615980c814eff3fa284dd07b61fbf50885f4ab (diff)
downloadrneovim-2fbcc9ab769ee5f86a649824f59e0e008e072fb6.tar.gz
rneovim-2fbcc9ab769ee5f86a649824f59e0e008e072fb6.tar.bz2
rneovim-2fbcc9ab769ee5f86a649824f59e0e008e072fb6.zip
Be more explicit about the lack of X11 integration
I don't want anyone getting the idea that the `-X` flag they might have used has anything to do with why the `+` is working for them
Diffstat (limited to 'src')
-rw-r--r--src/nvim/main.c3
-rw-r--r--src/nvim/po/CMakeLists.txt2
-rw-r--r--src/nvim/testdir/test49.vim2
3 files changed, 2 insertions, 5 deletions
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 .