aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/GenerateHelptags.cmake.in2
-rw-r--r--runtime/CMakeLists.txt2
-rw-r--r--runtime/doc/Makefile2
-rw-r--r--runtime/doc/help.txt1
-rw-r--r--runtime/doc/os_mac.txt116
-rw-r--r--runtime/doc/starting.txt5
-rw-r--r--runtime/doc/todo.txt6
-rw-r--r--runtime/doc/vim_diff.txt1
-rw-r--r--runtime/doc/windows.txt22
-rw-r--r--src/nvim/buffer.c18
-rw-r--r--src/nvim/ex_cmds.lua6
-rw-r--r--src/nvim/main.c3
-rw-r--r--src/nvim/po/CMakeLists.txt2
-rw-r--r--src/nvim/testdir/test49.vim2
-rw-r--r--src/nvim/version.c2
15 files changed, 47 insertions, 143 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/help.txt b/runtime/doc/help.txt
index 76903d50a5..9ca96dfd79 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -160,7 +160,6 @@ Versions ~
|vi_diff.txt| Main differences between Vim and Vi
*sys-file-list*
Remarks about specific systems ~
-|os_mac.txt| Macintosh
|os_win32.txt| MS-Windows
*standard-plugin-list*
Standard plugins ~
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
deleted file mode 100644
index 3eebb7ef0d..0000000000
--- a/runtime/doc/os_mac.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-*os_mac.txt* For Vim version 7.4. Last change: 2006 Apr 30
-
-
- VIM REFERENCE MANUAL by Bram Moolenaar et al.
-
-
- *mac* *Mac* *macintosh* *Macintosh*
-
-This file documents the particularities of the Macintosh version of Vim.
-
-NOTE: This file is a bit outdated. You might find more useful info here:
- http://macvim.org/
-
-1. Filename Convention |mac-filename|
-2. .vimrc an .vim files |mac-vimfile|
-3. FAQ |mac-faq|
-4. Known Lack |mac-lack|
-5. Mac Bug Report |mac-bug|
-6. Compiling Vim |mac-compile|
-
-There was a Mac port for version 3.0 of Vim. Here are the first few lines
-from the old file:
-
-VIM Release Notes
-Initial Macintosh release, VIM version 3.0
-19 October 1994
-
-Eric Fischer
-<enf1@midway.uchicago.edu>, <eric@jcp.uchicago.edu>, <etaoin@uchicago.edu>
-5759 N. Guilford Ave
-Indianapolis IN 46220 USA
-
-==============================================================================
-1. Filename Convention *mac-filename*
-
-Starting with Vim version 7 you can just use the unix path separators with
-Vim. In order to determine if the specified filename is relative to the
-current folder or absolute (i.e. relative to the "Desktop"), the following
-algorithm is used:
-
- If the path start by a "/", the path is absolute
- If the path start by a ":", the path is relative
- If the path doesn't start by neither a "/" nor ":",
- and a ":" is found before a "/" then the path is absolute
->
- :e /HD/text
- :e HD:text
-< Edit the file "text" of the disk "HD" >
- :e :src:main.c
- :e src/main.c
-< Edit the file "main.c" in the folder "src" in the current folder >
- :e os_mac.c
-< Edit the file "os_mac.c" in the current folder.
-
-You can use the |$VIM| and |$VIMRUNTIME| variable. >
-
- :so $VIMRUNTIME/syntax/syntax.vim
-
-==============================================================================
-2. .vimrc and .vim files *mac-vimfile*
-
-It is recommended to use Unix style line separators for Vim scripts, thus a
-single newline character.
-
-When starting up Vim will load the $VIMRUNTIME/macmap.vim script to define
-default command-key mappings.
-
-On older systems files starting with a dot "." are discouraged, thus the rc
-files are named "vimrc" or "_vimrc" and "gvimrc" or "_gvimrc". These files
-can be in any format (mac, dos or unix).
-
-==============================================================================
-3. Mac FAQ *mac-faq*
-
-On the internet: http://macvim.org/OSX/index.php#FAQ
-
-Q: I can't enter non-ASCII character in Apple Terminal.
-A: Under Window Settings, Emulation, make sure that "Escape non-ASCII
- characters" is not checked.
-
-Q: How do I start the GUI from the command line?
-A: Assuming that Vim.app is located in /Applications:
- open /Applications/Vim.app
- Or:
- /Applications/Vim.app/Contents/MacOS/Vim -g {arguments}
-
-Q: How can I set $PATH to something reasonable when I start Vim.app from the
- GUI or with open?
-A: The following trick works with most shells. Put it in your vimrc file.
- This is included in the system vimrc file included with the binaries
- distributed at macvim.org . >
- let s:path = system("echo echo VIMPATH'${PATH}' | $SHELL -l")
- let $PATH = matchstr(s:path, 'VIMPATH\zs.\{-}\ze\n')
-
-==============================================================================
-4. Mac Lack *mac-lack*
-
-In a terminal CTRL-^ needs to be entered as Shift-Control-6. CTRL-@ as
-Shift-Control-2.
-
-==============================================================================
-5. Mac Bug Report *mac-bug*
-
-When reporting any Mac specific bug or feature change, please use the vim-mac
-maillist |vim-mac|. However, you need to be subscribed. An alternative is to
-send a message to the current MacVim maintainers:
-
- mac@vim.org
-
-==============================================================================
-6. Compiling Vim *mac-compile*
-
-See the file "src/INSTALLmac.txt" that comes with the source files.
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 6e72f0cf6b..572823eca9 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -402,10 +402,9 @@ accordingly. Vim proceeds in this order:
initializations until 4. are skipped. Only the "-u" option is
interpreted.
*system-vimrc*
- a. For Unix, MS-DOS, MS-Windows, and Macintosh, the system vimrc file is
- read for initializations. The path of this file is shown with the
+ a. For Unix, MS-Windows, and Macintosh, the system vimrc file is read for
+ initializations. The path of this file is shown with the
":version" command. Mostly it's "$VIM/vimrc".
- For the Macintosh the $VIMRUNTIME/macmap.vim is read.
*VIMINIT* *EXINIT* *$MYVIMRC*
b. Four places are searched for initializations. The first that exists
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 65e69a901b..eeed014fdb 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1140,9 +1140,6 @@ Now that colnr_T is int instead of unsigned, more type casts can be removed.
'delcombine' does not work for the command line. (Tony Mechelynck, 2009 Jul
20)
-Don't load macmap.vim on startup, turn it into a plugin. (Ron Aaron,
-2009 Apr 7) Reminder Apr 14.
-
Add "no_hlsearch" to winsaveview().
Cursorline highlighting combines with Search ('hlsearch') but not with
@@ -1389,9 +1386,6 @@ The utf class table is missing some entries:
Visual line mode doesn't highlight properly when 'showbreak' is used and the
line doesn't fit. (Dasn, 2008 May 1)
-Mac: Move Carbon todo items to os_mac.txt. Note that this version is frozen,
-try the Cocoa version.
-
Mac: After a ":vsplit" the left scrollbar doesn't appear until 'columns' is
changed or the window is resized.
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/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 95be125c33..0e83c1fc89 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -971,9 +971,10 @@ A buffer can also be unlisted. This means it exists, but it is not in the
list of buffers. |unlisted-buffer|
-:files[!] *:files*
-:buffers[!] *:buffers* *:ls*
-:ls[!] Show all buffers. Example:
+:files[!] [flags] *:files*
+:buffers[!] [flags] *:buffers* *:ls*
+:ls[!] [flags]
+ Show all buffers. Example:
1 #h "/test/text" line 1 ~
2u "asdf" line 0 ~
@@ -999,6 +1000,21 @@ list of buffers. |unlisted-buffer|
+ a modified buffer
x a buffer with read errors
+ [flags] can be a combination of the following characters,
+ which restrict the buffers to be listed:
+ + modified buffers
+ - buffers with 'modifiable' off
+ = readonly buffers
+ a active buffers
+ u unloaded buffers (overrides the "!")
+ h hidden buffers
+ x buffers with a read error
+ % current buffer
+ # alternate buffer
+ Combining flags means they are "and"ed together, e.g.:
+ h+ hidden buffers which are modified
+ a+ active buffers which are modified
+
*:bad* *:badd*
:bad[d] [+lnum] {fname}
Add file name {fname} to the buffer list, without loading it.
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index b3eba4f5f6..10106bcb1d 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2159,9 +2159,23 @@ void buflist_list(exarg_T *eap)
int i;
for (buf = firstbuf; buf != NULL && !got_int; buf = buf->b_next) {
- /* skip unlisted buffers, unless ! was used */
- if (!buf->b_p_bl && !eap->forceit)
+ // skip unspecified buffers
+ if ((!buf->b_p_bl && !eap->forceit && !strchr((char *)eap->arg, 'u'))
+ || (strchr((char *)eap->arg, 'u') && buf->b_p_bl)
+ || (strchr((char *)eap->arg, '+')
+ && ((buf->b_flags & BF_READERR) || !bufIsChanged(buf)))
+ || (strchr((char *)eap->arg, 'a')
+ && (buf->b_ml.ml_mfp == NULL || buf->b_nwindows == 0))
+ || (strchr((char *)eap->arg, 'h')
+ && (buf->b_ml.ml_mfp == NULL || buf->b_nwindows != 0))
+ || (strchr((char *)eap->arg, '-') && buf->b_p_ma)
+ || (strchr((char *)eap->arg, '=') && !buf->b_p_ro)
+ || (strchr((char *)eap->arg, 'x') && !(buf->b_flags & BF_READERR))
+ || (strchr((char *)eap->arg, '%') && buf != curbuf)
+ || (strchr((char *)eap->arg, '#')
+ && (buf == curbuf || curwin->w_alt_fnum != buf->b_fnum))) {
continue;
+ }
msg_putchar('\n');
if (buf_spname(buf) != NULL)
STRLCPY(NameBuff, buf_spname(buf), MAXPATHL);
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 50814c4eb4..79b53b9fb5 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -267,7 +267,7 @@ return {
},
{
command='buffers',
- flags=bit.bor(BANG, TRLBAR, CMDWIN),
+ flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
addr_type=ADDR_LINES,
func='buflist_list',
},
@@ -885,7 +885,7 @@ return {
},
{
command='files',
- flags=bit.bor(BANG, TRLBAR, CMDWIN),
+ flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
addr_type=ADDR_LINES,
func='buflist_list',
},
@@ -1521,7 +1521,7 @@ return {
},
{
command='ls',
- flags=bit.bor(BANG, TRLBAR, CMDWIN),
+ flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
addr_type=ADDR_LINES,
func='buflist_list',
},
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 0020ce3c97..83fe32cccb 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 .
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7c8f16ee40..45b36e7d99 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -133,7 +133,7 @@ static int included_patches[] = {
// 794 NA
793,
// 792,
- // 791,
+ 791,
// 790,
// 789,
// 788 NA
generated by cgit (git 2.34.1) at 2025-06-24 11:25:59 +0000