aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-11-14 00:02:29 -0800
committerGitHub <noreply@github.com>2019-11-14 00:02:29 -0800
commite3b08a0fc43eef91b51f8166a036e86b5bdf5613 (patch)
treeaab224f640e8986e377c6d5a7615077f6b8d3f7d /runtime
parent570ee5f404966a6ffd9a5241d91adc6a9f5f2c9d (diff)
parenta0c18bf2017ac7d38d13014a810bda44d09dfcbb (diff)
downloadrneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.tar.gz
rneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.tar.bz2
rneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.zip
Merge #11384 from janlazo/vim-8.1.2293
vim-patch:8.1.{927,2293}
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 52d8624935..d29d9c2676 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2242,8 +2242,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'fileformat'* *'ff'*
'fileformat' 'ff' string (Windows default: "dos",
- Unix default: "unix",
- Macintosh default: "mac")
+ Unix default: "unix")
local to buffer
This gives the <EOL> of the current buffer, which is used for
reading/writing the buffer from/to a file:
@@ -2265,7 +2264,6 @@ A jump table for the options with a short description can be found at |Q_op|.
'fileformats' 'ffs' string (default:
Vim+Vi Win32: "dos,unix",
Vim Unix: "unix,dos",
- Vim Mac: "mac,unix,dos",
Vi others: "")
global
This gives the end-of-line (<EOL>) formats that will be tried when