r58 - in trunk/vim/debian: . patches

Pierre Habouzit madcoder-guest@costa.debian.org
Tue, 15 Mar 2005 10:35:02 +0100


Author: madcoder-guest
Date: 2005-03-15 10:35:01 +0100 (Tue, 15 Mar 2005)
New Revision: 58

Added:
   trunk/vim/debian/patches/105_tutor.vim.diff
Modified:
   trunk/vim/debian/changelog
Log:
fix vimtutor locales ignorance

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-15 09:33:33 UTC (rev 57)
+++ trunk/vim/debian/changelog	2005-03-15 09:35:01 UTC (rev 58)
@@ -11,8 +11,9 @@
     + Fix some debcontrol.vim issues:
       - don't search emails in fields that have not one (closes: #114508).
       - fix debcontrolName according to Policy (closes: #148144).
+    + Fix tutor.vim to use usual locale envvars semantics (closes: #289113)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 15 Mar 2005 10:33:07 +0100
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 15 Mar 2005 10:34:52 +0100
 
 vim (1:6.3-064+1) unstable; urgency=low
 

Added: trunk/vim/debian/patches/105_tutor.vim.diff
===================================================================
--- trunk/vim/debian/patches/105_tutor.vim.diff	2005-03-15 09:33:33 UTC (rev 57)
+++ trunk/vim/debian/patches/105_tutor.vim.diff	2005-03-15 09:35:01 UTC (rev 58)
@@ -0,0 +1,23 @@
+diff -Nrua vim63.orig/runtime/tutor/tutor.vim vim63/runtime/tutor/tutor.vim
+--- vim63.orig/runtime/tutor/tutor.vim	2005-03-15 10:18:48.846942561 +0100
++++ vim63/runtime/tutor/tutor.vim	2005-03-15 10:24:37.470087403 +0100
+@@ -15,10 +15,17 @@
+   let s:ext = "." . $xx
+ else
+   let s:lang = ""
+-  if exists("v:lang") && v:lang != "C"
++  if exists("v:lang")
+     let s:lang = v:lang
+-  elseif strlen($LANG) > 0 && $LANG != "C"
++  elseif strlen($LC_MESSAGES) > 0
+     let s:lang = $LANG
++  elseif strlen($LC_ALL) > 0
++    let s:lang = $LANG
++  elseif strlen($LANG) > 0
++    let s:lang = $LANG
++  endif
++  if s:lang == "C"
++    let s:lang=""
+   endif
+   if s:lang != ""
+     " Remove "@euro" (ignoring case), it may be at the end