diff options
Diffstat (limited to 'runtime/doc')
-rw-r--r-- | runtime/doc/eval.txt | 3 | ||||
-rw-r--r-- | runtime/doc/filetype.txt | 35 | ||||
-rw-r--r-- | runtime/doc/gui.txt | 21 | ||||
-rw-r--r-- | runtime/doc/mbyte.txt | 3 | ||||
-rw-r--r-- | runtime/doc/options.txt | 25 | ||||
-rw-r--r-- | runtime/doc/os_mac.txt | 2 | ||||
-rw-r--r-- | runtime/doc/print.txt | 10 | ||||
-rw-r--r-- | runtime/doc/quickref.txt | 1 | ||||
-rw-r--r-- | runtime/doc/spell.txt | 2 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 8 | ||||
-rw-r--r-- | runtime/doc/usr_05.txt | 1 | ||||
-rw-r--r-- | runtime/doc/vi_diff.txt | 5 |
13 files changed, 24 insertions, 94 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 092994c11d..46ee28a461 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6666,7 +6666,6 @@ arp Compiled with ARP support (Amiga). autocmd Compiled with autocommand support. |autocommand| balloon_eval Compiled with |balloon-eval| support. balloon_multiline GUI supports multiline balloons. -beos BeOS version of Vim. browse Compiled with |:browse| support, and browse() will work. browsefilter Compiled with support for |browsefilter|. @@ -6689,7 +6688,6 @@ digraphs Compiled with support for digraphs. dnd Compiled with support for the "~ register |quote_~|. dos16 16 bits DOS version of Vim. dos32 32 bits DOS (DJGPP) version of Vim. -ebcdic Compiled on a machine with ebcdic character set. emacs_tags Compiled with support for Emacs tags. eval Compiled with expression evaluation support. Always true, of course! @@ -6716,7 +6714,6 @@ gui_gtk Compiled with GTK+ GUI (any version). gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined). gui_mac Compiled with Macintosh GUI. gui_motif Compiled with Motif GUI. -gui_photon Compiled with Photon GUI. gui_running Vim is running in the GUI, or it will start soon. gui_win32 Compiled with MS Windows Win32 GUI. gui_win32s idem, and Win32s system being used (Windows 3.1) diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 94454fb469..2894814025 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -34,9 +34,8 @@ if you didn't do that already. Detail: The ":filetype on" command will load one of these files: Amiga $VIMRUNTIME/filetype.vim - Mac $VIMRUNTIME:filetype.vim + Mac $VIMRUNTIME/filetype.vim MS-DOS $VIMRUNTIME\filetype.vim - RiscOS Vim:Filetype Unix $VIMRUNTIME/filetype.vim VMS $VIMRUNTIME/filetype.vim This file is a Vim script that defines autocommands for the @@ -268,38 +267,6 @@ the 'runtimepath' for a directory to use. If there isn't one, set 'runtimepath' in the |system-vimrc|. Be careful to keep the default directories! - - *autocmd-osfiletypes* -NOTE: this code is currently disabled, as the RISC OS implementation was -removed. In the future this will use the 'filetype' option. - -On operating systems which support storing a file type with the file, you can -specify that an autocommand should only be executed if the file is of a -certain type. - -The actual type checking depends on which platform you are running Vim -on; see your system's documentation for details. - -To use osfiletype checking in an autocommand you should put a list of types to -match in angle brackets in place of a pattern, like this: > - - :au BufRead *.html,<&faf;HTML> runtime! syntax/html.vim - -This will match: - -- Any file whose name ends in ".html" -- Any file whose type is "&faf" or "HTML", where the meaning of these types - depends on which version of Vim you are using. - Unknown types are considered NOT to match. - -You can also specify a type and a pattern at the same time (in which case they -must both match): > - - :au BufRead <&fff>diff* - -This will match files of type "&fff" whose names start with "diff". - - *plugin-details* The "plugin" directory can be in any of the directories in the 'runtimepath' option. All of these directories will be searched for plugins and they are diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index bdddec585d..c174914c54 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -24,9 +24,7 @@ Other GUI documentation: 1. Starting the GUI *gui-start* *E229* *E233* First you must make sure you actually have a version of Vim with the GUI code -included. You can check this with the ":version" command, it says "with xxx -GUI", where "xxx" is X11-Motif, X11-Athena, Photon, GTK, GTK2, etc., or -"MS-Windows 32 bit GUI version". +included. How to start the GUI depends on the system used. Mostly you can run the GUI version of Vim with: @@ -690,13 +688,10 @@ because the item will never be selected. Use a single colon to keep it simple. *gui-toolbar* -The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11), -and Photon GUI. It should turn up in other GUIs in due course. The -default toolbar is setup in menu.vim. -The display of the toolbar is controlled by the 'guioptions' letter 'T'. You -can thus have menu & toolbar together, or either on its own, or neither. -The appearance is controlled by the 'toolbar' option. You can choose between -an image, text or both. +The default toolbar is setup in menu.vim. The display of the toolbar is +controlled by the 'guioptions' letter 'T'. You can thus have menu & toolbar +together, or either on its own, or neither. The appearance is controlled by +the 'toolbar' option. You can choose between an image, text or both. *toolbar-icon* The toolbar is defined as a special menu called ToolBar, which only has one @@ -779,9 +774,9 @@ from the main menu bar. You must then use the |:popup| or |:tearoff| command to display it. *popup-menu* -In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the -special menu "PopUp". This is the menu that is displayed when the right mouse -button is pressed, if 'mousemodel' is set to popup or popup_setpos. +You can define the special menu "PopUp". This is the menu that is displayed +when the right mouse button is pressed, if 'mousemodel' is set to popup or +popup_setpos. 5.3 Showing What Menus Are Mapped To *showing-menus* diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 87ae8777c2..2a5ccc626e 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -276,8 +276,7 @@ u Unicode Universal encoding, can replace all others. ISO 10646. Other encodings cannot be used by Vim internally. But files in other encodings can be edited by using conversion, see 'fileencoding'. -Note that all encodings must use ASCII for the characters up to 128 (except -when compiled for EBCDIC). +Note that all encodings must use ASCII for the characters up to 128. Supported 'encoding' values are: *encoding-values* 1 latin1 8-bit characters (ISO 8859-1, also used for cp1252) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 8672ab2af9..c646caae4f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3451,7 +3451,7 @@ A jump table for the options with a short description can be found at |Q_op|. the case of X). The font names given should be "normal" fonts. Vim will try to find the related bold and italic fonts. - For Win32, GTK, Motif, Mac OS and Photon: > + For Win32, GTK, Motif, and Mac OS: > :set guifont=* < will bring up a font requester, where you can pick the font you want. @@ -3648,7 +3648,7 @@ A jump table for the options with a short description can be found at |Q_op|. 't' Include tearoff menu items. Currently only works for Win32, GTK+, and Motif 1.2 GUI. *'go-T'* - 'T' Include Toolbar. Currently only in Win32, GTK+, Motif, Photon + 'T' Include Toolbar. Currently only in Win32, GTK+, Motif, and Athena GUIs. *'go-r'* 'r' Right-hand scrollbar is always present. @@ -4265,7 +4265,6 @@ A jump table for the options with a short description can be found at |Q_op|. "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,=" for AMIGA: "@,48-57,/,.,-,_,+,,,$,:" for VMS: "@,48-57,/,.,-,_,+,,,#,$,%,<,>,[,],:,;,~" - for OS/390: "@,240-249,/,.,-,_,+,,,#,$,%,~,=" otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=") global {not in Vi} @@ -5204,14 +5203,6 @@ A jump table for the options with a short description can be found at |Q_op|. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - - *'osfiletype'* *'oft'* -'osfiletype' 'oft' string (default: "") - local to buffer - {not in Vi} - This option was supported on RISC OS, which has been removed. - - *'paragraphs'* *'para'* 'paragraphs' 'para' string (default "IPLPPPQPP TPHPLIPpLpItpplpipbp") global @@ -5696,9 +5687,6 @@ A jump table for the options with a short description can be found at |Q_op|. Macintosh: "$VIM:vimfiles, $VIMRUNTIME, $VIM:vimfiles:after" - RISC-OS: "Choices:vimfiles, - $VIMRUNTIME, - Choices:vimfiles/after" VMS: "sys$login:vimfiles, $VIM/vimfiles, $VIMRUNTIME, @@ -7070,7 +7058,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'term' string (default is $TERM, if that fails: in the GUI: "builtin_gui" on Amiga: "amiga" - on BeOS: "beos-ansi" on Mac: "mac-ansi" on MS-DOS: "pcterm" on Unix: "ansi" @@ -7334,8 +7321,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'toolbar'* *'tb'* 'toolbar' 'tb' string (default "icons,tooltips") global - {only for |+GUI_GTK|, |+GUI_Athena|, |+GUI_Motif| and - |+GUI_Photon|} + {only for |+GUI_GTK|, |+GUI_Athena|, and |+GUI_Motif|} The contents of this option controls various toolbar settings. The possible values are: icons Toolbar buttons are shown with icons. @@ -7612,8 +7598,7 @@ A jump table for the options with a short description can be found at |Q_op|. "$VIM/vimfiles/view", for Unix: "~/.vim/view", for Macintosh: "$VIM:vimfiles:view" - for VMS: "sys$login:vimfiles/view" - for RiscOS: "Choices:vimfiles/view") + for VMS: "sys$login:vimfiles/view") global {not in Vi} {not available when compiled without the |+mksession| @@ -8007,7 +7992,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'winaltkeys' 'wak' string (default "menu") global {not in Vi} - {only used in Win32, Motif, GTK and Photon GUI} + {only used in Win32, Motif, and GTK} Some GUI versions allow the access to menu entries by using the ALT key in combination with a character that appears underlined in the menu. This conflicts with the use of the ALT key for mappings and diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 9ed23b4ae1..67790f1dea 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -54,7 +54,7 @@ algorithm is used: You can use the |$VIM| and |$VIMRUNTIME| variable. > - :so $VIMRUNTIME:syntax:syntax.vim + :so $VIMRUNTIME/syntax/syntax.vim ============================================================================== 2. .vimrc and .vim files *mac-vimfile* diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 5fcaa6f624..0ffc661c95 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -96,8 +96,7 @@ If the option is empty, then vim will use the system default printer for Windows: cp1252, Macintosh: mac-roman, VMS: dec-mcs, - HPUX: hp-roman8, - EBCDIC: ebcdic-uk) + HPUX: hp-roman8) global Sets the character encoding used when printing. This option tells VIM which print character encoding file from the "print" directory in 'runtimepath' to @@ -121,10 +120,9 @@ other than latin1 will require VIM to be compiled with the |+iconv| feature. If no conversion is possible then printing will fail. Any characters that cannot be converted will be replaced with upside down question marks. -Four print character encoding files are provided to support default Mac, VMS, -HPUX, and EBCDIC character encodings and are used by default on these -platforms. Code page 1252 print character encoding is used by default on -the Windows platform. +Three print character encoding files are provided to support default Mac, VMS, +and HPUX character encodings and are used by default on these platforms. Code +page 1252 print character encoding is used by default on the Windows platform. *pexpr-option* 'printexpr' 'pexpr' String (default: see below) diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 9a9e85d421..d320e6cd24 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -802,7 +802,6 @@ Short explanation of each option: *option-list* 'omnifunc' 'ofu' function for filetype-specific completion 'opendevice' 'odev' allow reading/writing devices on MS-Windows 'operatorfunc' 'opfunc' function to be called for |g@| operator -'osfiletype' 'oft' no longer supported 'paragraphs' 'para' nroff macros that separate paragraphs 'paste' allow pasting text 'pastetoggle' 'pt' key code that causes 'paste' to toggle diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 3ffd8932e1..91322def5b 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -336,8 +336,6 @@ If 'encoding' is "latin1" Vim will look for: This assumes none of them are found (Polish doesn't make sense when leaving out the non-ASCII characters). -Spelling for EBCDIC is currently not supported. - A spell file might not be available in the current 'encoding'. See |spell-mkspell| about how to create a spell file. Converting a spell file with "iconv" will NOT work! diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index dbd87721fc..bceaea0d83 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -767,7 +767,7 @@ accordingly. Vim proceeds in this order: a. If vim was started as |evim| or |eview| or with the |-y| argument, the script $VIMRUNTIME/evim.vim will be loaded. *system-vimrc* - b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, RISC-OS and Amiga + b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, and Amiga, the system vimrc file is read for initializations. The path of this file is shown with the ":version" command. Mostly it's "$VIM/vimrc". Note that this file is ALWAYS read in 'compatible' mode, since the diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 45f3ae6c4a..40f30ff077 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -232,8 +232,6 @@ Go through more coverity reports. Patch to add ":undorecover", get as much text out of the undo file as possible. (Christian Brabandt, 2014 Mar 12) -Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24) - Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16) Some quickfix messages appear twice. (Gary Johnson, 2014 Feb 16) @@ -2249,7 +2247,7 @@ GUI: Need better separation of Vim core and GUI code. 8 When fontset support is enabled, setting 'guifont' to a single font doesn't work. -8 Menu priority for sub-menus for: Amiga, BeOS. +8 Menu priority for sub-menus for: Amiga. 8 When translating menus ignore the part after the Tab, the shortcut. So that the same menu item with a different shortcut (e.g., for the Mac) are still translated. @@ -3743,7 +3741,7 @@ Win32 GUI: GUI: -8 Make inputdialog() work for Photon, Amiga. +8 Make inputdialog() work for Amiga. - <C--> cannot be mapped. Should be possible to recognize this as a normal "-" with the Ctrl modifier. 7 Implement ":popup" for other systems than Windows. @@ -3822,8 +3820,6 @@ GUI: Autocommands: -9 Rework the code from FEAT_OSFILETYPE for autocmd-osfiletypes to use - 'filetype'. Only for when the current buffer is known. - Put autocommand event names in a hashtable for faster lookup? 8 When the SwapExists event is triggered, provide information about the swap file, e.g., whether the process is running, file was modified, etc. diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index ac377675ee..a409d7e3ce 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -317,7 +317,6 @@ Then copy the file to your plugin directory: Amiga s:vimfiles/plugin Macintosh $VIM:vimfiles:plugin Mac OS X ~/.vim/plugin/ - RISC-OS Choices:vimfiles.plugin Example for Unix (assuming you didn't have a plugin directory yet): > diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index af06302243..a3abd2cfd3 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -137,10 +137,7 @@ Support for different systems. - In protected mode on Windows 3.1 and MS-DOS (DPMI driver required). - Windows 95 and Windows NT, with support for long file names. - VMS - - BeOS - Macintosh - - Risc OS - - IBM OS/390 Note that on some systems features need to be disabled to reduce resource usage, esp. on MS-DOS. For some outdated systems you need to use an older Vim version. @@ -162,7 +159,7 @@ Graphical User Interface (GUI). |gui| define your own menus. Better support for CTRL/SHIFT/ALT keys in combination with special keys and mouse. Supported for various platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32 - (Windows 95 and later), BeOS, Amiga and Macintosh. + (Windows 95 and later), Amiga and Macintosh. Multiple windows and buffers. |windows.txt| Vim can split the screen into several windows, each editing a |