r371 - branches/alternatives/debian/runtime

[Stefano Zacchiroli]

Author: zack
Date: 2005-10-21 09:58:07 +0000 (Fri, 21 Oct 2005)
New Revision: 371

Modified:
   branches/alternatives/debian/runtime/vimrc
Log:
merged vimrc change


Modified: branches/alternatives/debian/runtime/vimrc
===================================================================
--- branches/alternatives/debian/runtime/vimrc	2005-10-21 09:29:23 UTC (rev 370)
+++ branches/alternatives/debian/runtime/vimrc	2005-10-21 09:58:07 UTC (rev 371)
@@ -52,16 +52,15 @@
 augroup END
 
 " Set paper size from /etc/papersize if available (Debian-specific)
-try
-  if filereadable('/etc/papersize')
-    let s:papersize = matchstr(system('/bin/cat /etc/papersize'), '\p*')
-    if strlen(s:papersize)
-      let &printoptions = "paper:" . s:papersize
-    endif
-    unlet! s:papersize
+if filereadable("/etc/papersize")
+  silent exec "view /etc/papersize"
+  let s:t = getline(".")
+  silent exec "bd!"
+  let s:papersize = matchstr(s:t, "\\p*")
+  if strlen(s:papersize)
+    let &printoptions = "paper:" . s:papersize
   endif
-catch /E145/
-endtry
+endif
 
 " The following are commented out as they cause vim to behave a lot
 " different from regular vi. They are highly recommended though.