aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-11-12 22:42:30 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-11-13 19:25:39 -0500
commit6989ac05f45f2c3c9539522272fd2c73960fa134 (patch)
tree1228bd86c27a688823aa496ece03c4015ed3053a
parent0cb6fc804dbf7b46772ea14e8c7b40909b97202c (diff)
downloadrneovim-6989ac05f45f2c3c9539522272fd2c73960fa134.tar.gz
rneovim-6989ac05f45f2c3c9539522272fd2c73960fa134.tar.bz2
rneovim-6989ac05f45f2c3c9539522272fd2c73960fa134.zip
vim-patch:8.1.0927: USE_CR is never defined
Problem: USE_CR is never defined. Solution: Remove usage of USE_CR. (Ken Takata, closes vim/vim#3958) https://github.com/vim/vim/commit/00590740081489db69f43d9f1c0e3f70e29ce6da
-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