From 8dc8285e9cda2149830bfed0bc758a778444947e Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Mon, 19 Dec 2022 14:06:58 +0000 Subject: [PATCH] fixup!: remove more --- cmake.config/iwyu/mapping.imp | 1 - runtime/autoload/netrw.vim | 43 ----------------------------------- runtime/doc/help.txt | 5 ---- runtime/doc/index.txt | 1 - runtime/doc/pi_netrw.txt | 9 -------- runtime/doc/various.txt | 4 +--- runtime/doc/vi_diff.txt | 4 ---- runtime/menu.vim | 13 ++--------- scripts/gen_help_html.lua | 1 - 9 files changed, 3 insertions(+), 78 deletions(-) diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 47f42742651fdd..b47a2d4ca6ebab 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -69,7 +69,6 @@ { include: [ '"garray.h.generated.h"', private, '"nvim/garray.h"', public ] }, { include: [ '"getchar.h.generated.h"', private, '"nvim/getchar.h"', public ] }, { include: [ '"grid.h.generated.h"', private, '"nvim/grid.h"', public ] }, - { include: [ '"hardcopy.h.generated.h"', private, '"nvim/hardcopy.h"', public ] }, { include: [ '"hashtab.h.generated.h"', private, '"nvim/hashtab.h"', public ] }, { include: [ '"help.h.generated.h"', private, '"nvim/help.h"', public ] }, { include: [ '"highlight.h.generated.h"', private, '"nvim/highlight.h"', public ] }, diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 24d2cfc460c6e4..2fcf0b32c7bb3c 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -6446,7 +6446,6 @@ fun! s:NetrwMaps(islocal) " if !hasmapto('NetrwMarkFileGrep') |nmap mg NetrwMarkFileGrep|endif " if !hasmapto('NetrwMarkHideSfx') |nmap mh NetrwMarkHideSfx|endif " if !hasmapto('NetrwMarkFileMove') |nmap mm NetrwMarkFileMove|endif -" if !hasmapto('NetrwMarkFilePrint') |nmap mp NetrwMarkFilePrint|endif " if !hasmapto('NetrwMarkFileRegexp') |nmap mr NetrwMarkFileRegexp|endif " if !hasmapto('NetrwMarkFileSource') |nmap ms NetrwMarkFileSource|endif " if !hasmapto('NetrwMarkFileTag') |nmap mT NetrwMarkFileTag|endif @@ -6509,7 +6508,6 @@ fun! s:NetrwMaps(islocal) nnoremap mg :call NetrwMarkFileGrep(1) nnoremap mh :call NetrwMarkHideSfx(1) nnoremap mm :call NetrwMarkFileMove(1) - nnoremap mp :call NetrwMarkFilePrint(1) nnoremap mr :call NetrwMarkFileRegexp(1) nnoremap ms :call NetrwMarkFileSource(1) nnoremap mT :call NetrwMarkFileTag(1) @@ -6622,7 +6620,6 @@ fun! s:NetrwMaps(islocal) nnoremap mg :call NetrwMarkFileGrep(0) nnoremap mh :call NetrwMarkHideSfx(0) nnoremap mm :call NetrwMarkFileMove(0) - nnoremap mp :call NetrwMarkFilePrint(0) nnoremap mr :call NetrwMarkFileRegexp(0) nnoremap ms :call NetrwMarkFileSource(0) nnoremap mT :call NetrwMarkFileTag(0) @@ -7839,46 +7836,6 @@ fun! s:NetrwMarkFileMove(islocal) " call Dret("s:NetrwMarkFileMove") endfun -" --------------------------------------------------------------------- -" s:NetrwMarkFilePrint: (invoked by mp) This function prints marked files {{{2 -" using the hardcopy command. Local marked-file list only. -fun! s:NetrwMarkFilePrint(islocal) -" call Dfunc("s:NetrwMarkFilePrint(islocal=".a:islocal.")") - let curbufnr= bufnr("%") - - " sanity check - if !exists("s:netrwmarkfilelist_{curbufnr}") || empty(s:netrwmarkfilelist_{curbufnr}) - NetrwKeepj call netrw#ErrorMsg(2,"there are no marked files in this window (:help netrw-mf)",66) -" call Dret("s:NetrwMarkFilePrint") - return - endif -" call Decho("sanity chk passed: s:netrwmarkfilelist_".curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}),'~'.expand("")) - let curdir= s:NetrwGetCurdir(a:islocal) - - if exists("s:netrwmarkfilelist_{curbufnr}") - let netrwmarkfilelist = s:netrwmarkfilelist_{curbufnr} - call s:NetrwUnmarkList(curbufnr,curdir) - for fname in netrwmarkfilelist - if a:islocal - if g:netrw_keepdir - let fname= s:ComposePath(curdir,fname) - endif - else - let fname= curdir.fname - endif - 1split - " the autocmds will handle both local and remote files -" call Decho("exe sil e ".escape(fname,' '),'~'.expand("")) - exe "sil NetrwKeepj e ".fnameescape(fname) -" call Decho("hardcopy",'~'.expand("")) - hardcopy - q - endfor - 2match none - endif -" call Dret("s:NetrwMarkFilePrint") -endfun - " --------------------------------------------------------------------- " s:NetrwMarkFileRegexp: (invoked by mr) This function is used to mark {{{2 " files when given a regexp (for which a prompt is diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 9cf0ea69f2da43..07f898f99c2a3c 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -169,11 +169,6 @@ DEVELOPING NVIM |dev-style| Development style guidelines |debug.txt| Debugging Vim itself ------------------------------------------------------------------------------- -OTHER - -|print.txt| For your briefcase and fax machine - *standard-plugin-list* Standard plugins ~ |matchit.txt| Extended |%| matching diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 66353e05f30b85..a6aa036b55f474 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1310,7 +1310,6 @@ tag command action ~ |:grepadd| :grepa[dd] like :grep, but append to current list |:gui| :gu[i] start the GUI |:gvim| :gv[im] start the GUI -|:hardcopy| :ha[rdcopy] send text to the printer |:help| :h[elp] open a help window |:helpclose| :helpc[lose] close one help window |:helpgrep| :helpg[rep] like ":grep" but searches help files diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 972c42107c932e..e42c63630959c5 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -2419,15 +2419,6 @@ from the current window (where one does the mf) to the target. Associated setting variable: |g:netrw_localmovecmd| |g:netrw_ssh_cmd| -MARKED FILES: PRINTING *netrw-mp* {{{2 - (See |netrw-mf| and |netrw-mr| for how to mark files) - (uses the local marked file list) - -When "mp" is used, netrw will apply the |:hardcopy| command to marked files. -What netrw does is open each file in a one-line window, execute hardcopy, then -close the one-line window. - - MARKED FILES: SOURCING *netrw-ms* {{{2 (See |netrw-mf| and |netrw-mr| for how to mark files) (uses the local marked file list) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index cd178cfbbbfc1f..e13d892fd646e9 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -102,9 +102,7 @@ g8 Print the hex values of the bytes used in the *:p* *:pr* *:print* *E749* :[range]p[rint] [flags] Print [range] lines (default current line). - Note: If you are looking for a way to print your text - on paper see |:hardcopy|. In the GUI you can use the - File.Print menu entry. + In the GUI you can use the File.Print menu entry. See |ex-flags| for [flags]. The |:filter| command can be used to only show lines matching a pattern. diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index cef2859eb52a43..afabddb7f94f7a 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -337,10 +337,6 @@ Viminfo. The 'viminfo' option can be set to select which items to store in the .viminfo file. This is off by default. -Printing. |printing| - The |:hardcopy| command sends text to the printer. This can include - syntax highlighting. - Mouse support. |mouse-using| The mouse is supported in the GUI version, in an xterm for Unix, for BSDs with sysmouse, for Linux with gpm, and for Win32. It can be used diff --git a/runtime/menu.vim b/runtime/menu.vim index 87155248f17c09..2671bb51cbf55c 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -139,12 +139,7 @@ if has("diff") an 10.420 &File.Split\ Patched\ &By\.\.\. :browse vert diffpatch endif -if has("printer") - an 10.500 &File.-SEP3- - an 10.510 &File.&Print :hardcopy - vunmenu &File.&Print - vnoremenu &File.&Print :hardcopy -elseif has("unix") +if has("unix") an 10.500 &File.-SEP3- an 10.510 &File.&Print :w !lpr vunmenu &File.&Print @@ -1069,11 +1064,7 @@ if has("toolbar") an 1.20 ToolBar.Save :if expand("%") == ""browse confirm welseconfirm wendif an 1.30 ToolBar.SaveAll :browse confirm wa - if has("printer") - an 1.40 ToolBar.Print :hardcopy - vunmenu ToolBar.Print - vnoremenu ToolBar.Print :hardcopy - elseif has("unix") + if has("unix") an 1.40 ToolBar.Print :w !lpr vunmenu ToolBar.Print vnoremenu ToolBar.Print :w !lpr diff --git a/scripts/gen_help_html.lua b/scripts/gen_help_html.lua index 78fb9177645c5f..4f42633c57bc28 100644 --- a/scripts/gen_help_html.lua +++ b/scripts/gen_help_html.lua @@ -88,7 +88,6 @@ local exclude_invalid_urls = { ["http://papp.plan9.de"] = "syntax.txt", ["http://wiki.services.openoffice.org/wiki/Dictionaries"] = "spell.txt", ["http://www.adapower.com"] = "ft_ada.txt", - ["http://www.ghostscript.com/"] = "print.txt", ["http://www.jclark.com/"] = "quickfix.txt", }