~ubuntu-branches/ubuntu/edgy/vim/edgy-updates

« back to all changes in this revision

Viewing changes to patches/105_tutor.vim.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-02-02 13:55:52 UTC
  • Revision ID: james.westby@ubuntu.com-20060202135552-o60gcf576osqpmcg
Tags: 1:6.4-006+2ubuntu1
* Synchronize with Debian unstable.
* Convert Ubuntu patches to use quilt.
* Re-register alternative for `editor'.
* Install .desktop file again, add attribute NoDisplay=true.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -Nrua vim63.orig/runtime/tutor/tutor.vim vim63/runtime/tutor/tutor.vim
 
2
--- vim~/vim/runtime/tutor/tutor.vim    2005-03-15 10:18:48.000000000 +0100
 
3
+++ vim/vim/runtime/tutor/tutor.vim     2005-03-15 13:43:47.947664650 +0100
 
4
@@ -15,11 +15,16 @@
 
5
   let s:ext = "." . $xx
 
6
 else
 
7
   let s:lang = ""
 
8
-  if exists("v:lang") && v:lang != "C"
 
9
+  if exists("v:lang")
 
10
     let s:lang = v:lang
 
11
-  elseif strlen($LANG) > 0 && $LANG != "C"
 
12
+  elseif strlen($LC_ALL) > 0
 
13
+    let s:lang = $LC_ALL
 
14
+  elseif strlen($LANG) > 0
 
15
     let s:lang = $LANG
 
16
   endif
 
17
+  if s:lang == "C"
 
18
+    let s:lang = ""
 
19
+  endif
 
20
   if s:lang != ""
 
21
     " Remove "@euro" (ignoring case), it may be at the end
 
22
     let s:lang = substitute(s:lang, '\c@euro', '', '')