committing changes in /etc after apt run

Package changes:
+libtcl8.6 8.6.8+dfsg-3 amd64
+vim-gtk3 2:8.0.1453-1ubuntu1.1 amd64
+vim-gui-common 2:8.0.1453-1ubuntu1.1 all

diff --git a/.etckeeper b/.etckeeper
index 83f0aa7c8de52be841fccae0f4d1437b4c50c19b..da5921eadafc930115197e1470f42b851720391f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2956,6 +2956,7 @@ maybe chmod 0644 'vde2/libvdemgmt/sendcmd.rc'
 maybe chmod 0644 'vde2/vdecmd'
 maybe chmod 0644 'vdpau_wrapper.cfg'
 maybe chmod 0755 'vim'
+maybe chmod 0644 'vim/gvimrc'
 maybe chmod 0644 'vim/vimrc'
 maybe chmod 0644 'vim/vimrc.local'
 maybe chmod 0644 'vim/vimrc.tiny'

diff --git a/alternatives/eview b/alternatives/eview
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/eview
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/evim b/alternatives/evim
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/evim
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/ex b/alternatives/ex
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/ex
+++ b/alternatives/ex
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/gview b/alternatives/gview
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/gview
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/gvim b/alternatives/gvim
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/gvim
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/gvimdiff b/alternatives/gvimdiff
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/gvimdiff
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/rgview b/alternatives/rgview
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/rgview
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/rgvim b/alternatives/rgvim
new file mode 120000 (symlink)
index 0000000..b021177
--- /dev/null
+++ b/alternatives/rgvim
@@ -0,0 +1 @@
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/rview b/alternatives/rview
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/rview
+++ b/alternatives/rview
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/rvim b/alternatives/rvim
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/rvim
+++ b/alternatives/rvim
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/vi b/alternatives/vi
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/vi
+++ b/alternatives/vi
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/view b/alternatives/view
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/view
+++ b/alternatives/view
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/vim b/alternatives/vim
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/vim
+++ b/alternatives/vim
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/alternatives/vimdiff b/alternatives/vimdiff
index 1d112dac81210d7a950b7fae25d2a1f4372e86f5..b021177f822c732f779147f120e079d1282e2fa5 120000 (symlink)
--- a/alternatives/vimdiff
+++ b/alternatives/vimdiff
@@ -1 +1 @@
-/usr/bin/vim.basic
\ No newline at end of file
+/usr/bin/vim.gtk3
\ No newline at end of file

diff --git a/mailcap b/mailcap
index dc185f0217556e6dfc887c2288c7cf8b0c2a5376..2cb41c28c9f44818e61898304db61a414d798f1a 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -300,6 +300,21 @@ image/webp; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY
 x-scheme-handler/http; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
 x-scheme-handler/https; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
 x-scheme-handler/ftp; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
+text/english; gvim -f %s; test=test -n "$DISPLAY"
+text/plain; gvim -f %s; test=test -n "$DISPLAY"
+text/x-makefile; gvim -f %s; test=test -n "$DISPLAY"
+text/x-c++hdr; gvim -f %s; test=test -n "$DISPLAY"
+text/x-c++src; gvim -f %s; test=test -n "$DISPLAY"
+text/x-chdr; gvim -f %s; test=test -n "$DISPLAY"
+text/x-csrc; gvim -f %s; test=test -n "$DISPLAY"
+text/x-java; gvim -f %s; test=test -n "$DISPLAY"
+text/x-moc; gvim -f %s; test=test -n "$DISPLAY"
+text/x-pascal; gvim -f %s; test=test -n "$DISPLAY"
+text/x-tcl; gvim -f %s; test=test -n "$DISPLAY"
+text/x-tex; gvim -f %s; test=test -n "$DISPLAY"
+application/x-shellscript; gvim -f %s; test=test -n "$DISPLAY"
+text/x-c; gvim -f %s; test=test -n "$DISPLAY"
+text/x-c++; gvim -f %s; test=test -n "$DISPLAY"
 x-scheme-handler/irc; hexchat --no-auto --no-plugins %s; test=test -n "$DISPLAY"
 x-scheme-handler/ircs; hexchat --no-auto --no-plugins %s; test=test -n "$DISPLAY"
 application/x-java-archive; /usr/lib/jvm/java-8-oracle/bin/java -jar %s; test=test -n "$DISPLAY"
@@ -556,6 +571,7 @@ x-scheme-handler/info; yelp %s; test=test -n "$DISPLAY"
 x-scheme-handler/man; yelp %s; test=test -n "$DISPLAY"
 image/*; xreader %s; test=test -n "$DISPLAY"
 text/plain; view %s; edit=vim %s; compose=vim %s; test=test -x /usr/bin/vim; needsterminal
+text/plain; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
 video/mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"
 video/x-mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"
 video/mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"
@@ -667,6 +683,7 @@ application/x-troff-man; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; d
 text/troff; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page
 text/*; less '%s'; needsterminal
 text/*; view %s; edit=vim %s; compose=vim %s; test=test -x /usr/bin/vim; needsterminal
+text/*; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
 application/x-info; /usr/bin/info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document
 application/x-tar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput
 application/x-gtar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput

diff --git a/vim/gvimrc b/vim/gvimrc
new file mode 100644 (file)
index 0000000..94bdf44
--- /dev/null
+++ b/vim/gvimrc
@@ -0,0 +1,19 @@
+" Make external commands work through a pipe instead of a pseudo-tty
+"set noguipty
+
+" You can also specify a different font, overriding the default font
+"if has('gui_gtk2')
+"  set guifont=Bitstream\ Vera\ Sans\ Mono\ 12
+"else
+"  set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+"endif
+
+" If you want to run gvim with a dark background, try using a different
+" colorscheme or running 'gvim -reverse'.
+" http://www.cs.cmu.edu/~maverick/VimColorSchemeTest/ has examples and
+" downloads for the colorschemes on vim.org
+
+" Source a global configuration file if available
+if filereadable("/etc/vim/gvimrc.local")
+  source /etc/vim/gvimrc.local
+endif