r400 - in branches/vim-tiny/debian: . manpage runtime

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-05 19:51:08 +0000 (Sat, 05 Nov 2005)
New Revision: 400

Modified:
   branches/vim-tiny/debian/manpage/eview.1
   branches/vim-tiny/debian/rules
   branches/vim-tiny/debian/runtime/vimrc
   branches/vim-tiny/debian/vim-common.install
Log:
- added back eview/evim symlinks and manpages
- vimrc & papersize, the sage continue: this time avoid failing with rvim


Modified: branches/vim-tiny/debian/manpage/eview.1
===================================================================
--- branches/vim-tiny/debian/manpage/eview.1	2005-11-05 19:03:58 UTC (rev 399)
+++ branches/vim-tiny/debian/manpage/eview.1	2005-11-05 19:51:08 UTC (rev 400)
@@ -1 +1 @@
-.so man1/vim.1
+.so man1/evim.1

Modified: branches/vim-tiny/debian/rules
===================================================================
--- branches/vim-tiny/debian/rules	2005-11-05 19:03:58 UTC (rev 399)
+++ branches/vim-tiny/debian/rules	2005-11-05 19:51:08 UTC (rev 400)
@@ -256,7 +256,7 @@
 	 #cp debian/vim-install $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
 	 # gui symlinks
-	for n in gvim gview rgvim rgview gvimdiff; do \
+	for n in evim eview gvim gview rgvim rgview gvimdiff; do \
 		ln -fs vim $(DESTDIR)/usr/bin/$$n; \
 	done
 	ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink

Modified: branches/vim-tiny/debian/runtime/vimrc
===================================================================
--- branches/vim-tiny/debian/runtime/vimrc	2005-11-05 19:03:58 UTC (rev 399)
+++ branches/vim-tiny/debian/runtime/vimrc	2005-11-05 19:51:08 UTC (rev 400)
@@ -55,13 +55,16 @@
 
 " Set paper size from /etc/papersize if available (Debian-specific)
 if filereadable("/etc/papersize")
-  let s:shellbak = &shell
-  let &shell="/bin/sh"
-  let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
-  let &shell=s:shellbak
-  if strlen(s:papersize)
-    let &printoptions = "paper:" . s:papersize
-  endif
+  try
+    let s:shellbak = &shell
+    let &shell="/bin/sh"
+    let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
+    let &shell=s:shellbak
+    if strlen(s:papersize)
+      let &printoptions = "paper:" . s:papersize
+    endif
+  catch /^Vim\%((\a\+)\)\=:E145/
+  endtry
 endif
 
 " The following are commented out as they cause vim to behave a lot

Modified: branches/vim-tiny/debian/vim-common.install
===================================================================
--- branches/vim-tiny/debian/vim-common.install	2005-11-05 19:03:58 UTC (rev 399)
+++ branches/vim-tiny/debian/vim-common.install	2005-11-05 19:51:08 UTC (rev 400)
@@ -1,3 +1,5 @@
+debian/tmp/usr/bin/eview	  usr/bin/
+debian/tmp/usr/bin/evim		  usr/bin/
 debian/tmp/usr/bin/gview	  usr/bin/
 debian/tmp/usr/bin/gvimdiff	  usr/bin/
 debian/tmp/usr/bin/gvim		  usr/bin/