← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/303_option.c.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:
debian/patches/303_option.c.diff
1
 
diff -urN vim64/src/option.c vim64.new/src/option.c
2
 
--- vim64/src/option.c  2005-10-08 16:27:46.000000000 +0200
3
 
+++ vim64.new/src/option.c      2005-10-16 17:56:15.007237360 +0200
4
 
@@ -2512,7 +2512,8 @@
5
 
 # endif
6
 
 #endif
7
 
        )
8
 
-       set_string_default("sh", p);
9
 
+       if (strlen(p) != 0)
10
 
+           set_string_default("sh", p);
11
 
 
12
 
 #ifdef FEAT_WILDIGN
13
 
     /*