diff options
| -rw-r--r-- | runtime/doc/change.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/pi_netrw.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/tips.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 4 |
6 files changed, 3 insertions, 24 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index a0ef627888..4dd515f3e0 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1158,8 +1158,8 @@ register. 7. Selection and drop registers "*, "+ and "~ Use these registers for storing and retrieving the selected text for the GUI. See |quotestar| and |quoteplus|. When the clipboard is not available or not -working, the unnamed register is used instead. For Unix systems the clipboard -is only available when the |+xterm_clipboard| feature is present. +working, the unnamed register is used instead. For Unix systems and Mac OS X, +see |nvim-clipboard|. *quote_~* *quote~* *<Drop>* The read-only "~ register stores the dropped text from the last drag'n'drop diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index f5e4bd8d9d..6a0fef6d55 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6834,11 +6834,6 @@ xim Compiled with X input method support |xim|. xpm Compiled with pixmap support. xpm_w32 Compiled with pixmap support for Win32. (Only for backward compatibility. Use "xpm" instead.) -xsmp Compiled with X session management support. -xsmp_interact Compiled with interactive X session management support. -xterm_clipboard Compiled with support for xterm clipboard. -xterm_save Compiled with support for saving and restoring the - xterm screen. x11 Compiled with X11 support. *string-match* diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index f7a7aa1ad5..80815a70ec 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -2060,7 +2060,7 @@ MARKED FILES: DIFF *netrw-md* {{{2 (See |netrw-mf| and |netrw-mr| for how to mark files) (uses the global marked file list) -Use vimdiff to visualize difference between selected files (two or +Use |diff-mode| to visualize difference between selected files (two or three may be selected for this). Uses the global marked file list. MARKED FILES: EDITING *netrw-me* {{{2 diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index e1d02da292..9ed8f1f544 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -160,13 +160,6 @@ entries similar to: > PS: If you find any difference, someone (your sysadmin?) should better check the complete termcap and terminfo database for consistency. -NOTE 1: If you recompile Vim with FEAT_XTERM_SAVE defined in feature.h, the -builtin xterm will include the mentioned "te" and "ti" entries. - -NOTE 2: If you want to disable the screen switching, and you don't want to -change your termcap, you can add these lines to your .vimrc: > - :set t_ti= t_te= - ============================================================================== Scrolling in Insert mode *scroll-insert* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index db9d652499..75585e878b 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -2282,11 +2282,6 @@ Macintosh: Or ask for permission to overwrite it (if file can be made writable) and restore file to readonly afterwards. Overwriting a file for which a swap file exists is similar issue. -7 When compiled with "xterm_clipboard", startup can be slower and might get - error message for invalid $DISPLAY. Try connecting to the X server in the - background (forked), so that Vim starts up quicker? Connect as soon as - the clipboard is to be used (Visual select mode starts, paste from - clipboard) 7 X11: Some people prefer to use CLIPBOARD instead of PRIMARY for the normal selection. Add an "xclipboard" argument to the 'clipboard' option? (Mark Waggoner) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index fa57a91da4..7d8853f4cd 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -409,10 +409,6 @@ m *+xim* X input method |xim| *+xfontset* X fontset support |xfontset| *+xpm* pixmap support m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support| - *+xsmp* XSMP (X session management) support - *+xsmp_interact* interactive XSMP (X session management) support -N *+xterm_clipboard* Unix only: xterm clipboard handling -m *+xterm_save* save and restore xterm screen |xterm-screens| */dyn* *E370* *E448* To some of the features "/dyn" is added when the |