| [c2236868] | 1 | Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org> |
|---|
| 2 | Date: 06-17-2007 |
|---|
| 3 | Initial Package Version: 7.1 |
|---|
| 4 | Origin: Upstream |
|---|
| 5 | Upstream Status: Applied |
|---|
| 6 | Description: Contains all upstream patches up to 7.1.002 |
|---|
| 7 | |
|---|
| 8 | diff -Naur vim71.orig/runtime/filetype.vim vim71/runtime/filetype.vim |
|---|
| 9 | --- vim71.orig/runtime/filetype.vim 2007-06-17 11:49:56.000000000 -0400 |
|---|
| 10 | +++ vim71/runtime/filetype.vim 2007-06-17 11:50:51.000000000 -0400 |
|---|
| 11 | @@ -1,7 +1,7 @@ |
|---|
| 12 | " Vim support file to detect file types |
|---|
| 13 | " |
|---|
| 14 | " Maintainer: Bram Moolenaar <Bram@vim.org> |
|---|
| 15 | -" Last Change: 2007 May 10 |
|---|
| 16 | +" Last Change: 2007 May 15 |
|---|
| 17 | |
|---|
| 18 | " Listen very carefully, I will say this only once |
|---|
| 19 | if exists("did_load_filetypes") |
|---|
| 20 | @@ -1286,7 +1286,7 @@ |
|---|
| 21 | au BufNewFile,BufRead *.it,*.ih setf ppwiz |
|---|
| 22 | |
|---|
| 23 | " Oracle Pro*C/C++ |
|---|
| 24 | -au BufNewFile,BufRead .pc setf proc |
|---|
| 25 | +au BufNewFile,BufRead *.pc setf proc |
|---|
| 26 | |
|---|
| 27 | " Privoxy actions file |
|---|
| 28 | au BufNewFile,BufRead *.action setf privoxy |
|---|
| 29 | diff -Naur vim71.orig/src/gui_gtk.c vim71/src/gui_gtk.c |
|---|
| 30 | --- vim71.orig/src/gui_gtk.c 2007-06-17 11:49:56.000000000 -0400 |
|---|
| 31 | +++ vim71/src/gui_gtk.c 2007-06-17 11:50:48.000000000 -0400 |
|---|
| 32 | @@ -53,8 +53,8 @@ |
|---|
| 33 | # ifdef bindtextdomain |
|---|
| 34 | # undef bindtextdomain |
|---|
| 35 | # endif |
|---|
| 36 | -# ifdef bindtextdomain_codeset |
|---|
| 37 | -# undef bindtextdomain_codeset |
|---|
| 38 | +# ifdef bind_textdomain_codeset |
|---|
| 39 | +# undef bind_textdomain_codeset |
|---|
| 40 | # endif |
|---|
| 41 | # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) |
|---|
| 42 | # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ |
|---|
| 43 | diff -Naur vim71.orig/src/gui_gtk_x11.c vim71/src/gui_gtk_x11.c |
|---|
| 44 | --- vim71.orig/src/gui_gtk_x11.c 2007-06-17 11:49:56.000000000 -0400 |
|---|
| 45 | +++ vim71/src/gui_gtk_x11.c 2007-06-17 11:50:48.000000000 -0400 |
|---|
| 46 | @@ -36,8 +36,8 @@ |
|---|
| 47 | # ifdef bindtextdomain |
|---|
| 48 | # undef bindtextdomain |
|---|
| 49 | # endif |
|---|
| 50 | -# ifdef bindtextdomain_codeset |
|---|
| 51 | -# undef bindtextdomain_codeset |
|---|
| 52 | +# ifdef bind_textdomain_codeset |
|---|
| 53 | +# undef bind_textdomain_codeset |
|---|
| 54 | # endif |
|---|
| 55 | # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) |
|---|
| 56 | # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ |
|---|
| 57 | diff -Naur vim71.orig/src/version.c vim71/src/version.c |
|---|
| 58 | --- vim71.orig/src/version.c 2007-06-17 11:49:56.000000000 -0400 |
|---|
| 59 | +++ vim71/src/version.c 2007-06-17 11:50:51.000000000 -0400 |
|---|
| 60 | @@ -667,6 +667,10 @@ |
|---|
| 61 | static int included_patches[] = |
|---|
| 62 | { /* Add new patch number below this line */ |
|---|
| 63 | /**/ |
|---|
| 64 | + 2, |
|---|
| 65 | +/**/ |
|---|
| 66 | + 1, |
|---|
| 67 | +/**/ |
|---|
| 68 | 0 |
|---|
| 69 | }; |
|---|
| 70 | |
|---|
