aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-10-31 14:31:35 -0400
committerMichael Reed <m.reed@mykolab.com>2015-11-11 12:31:53 -0500
commit150d08801c1a0174b76b27a14c23099af7447aa8 (patch)
tree82aecc4fb5f5aab9aa24f3fb4c34ead9706bd11c
parent3b615980c814eff3fa284dd07b61fbf50885f4ab (diff)
downloadrneovim-150d08801c1a0174b76b27a14c23099af7447aa8.tar.gz
rneovim-150d08801c1a0174b76b27a14c23099af7447aa8.tar.bz2
rneovim-150d08801c1a0174b76b27a14c23099af7447aa8.zip
doc: Nuke os_mac.txt
Pretty much all of this stuff is outdated. Reviewed-by: @justinmk
-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
4 files changed, 2 insertions, 126 deletions
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.