--- vim-7.4.979/gvim-athena.desktop~ 2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-athena.desktop 2015-12-28 08:24:02.106735918 +0200
@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim Athena
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim Athena
+ # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[de]=Texteditor
+ GenericName[eo]=Tekstoredaktilo
@@ -71,7 +71,7 @@
Comment[zh_CN]=编辑文本文件
Comment[zh_TW]=編輯文字檔
Icon=gvim
--- vim-7.4.979/gvim-gnome.desktop~ 2015-12-28 08:32:38.000000000 +0200
+++ vim-7.4.979/gvim-gnome.desktop 2015-12-28 08:33:14.285396908 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim GNOME
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim GNOME
+ # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[de]=Texteditor
GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with GNOME L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--- vim-7.4.979/gvim-gtk.desktop~ 2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-gtk.desktop 2015-12-28 08:29:28.577015888 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim GTK
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim GTK
+ # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[de]=Texteditor
GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14 @@
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with GTK L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--- vim-7.4.979/gvim-motif.desktop~ 2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-motif.desktop 2015-12-28 08:31:11.245677767 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim Motif
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim Motif
+ # Translators: This is the Generic Application Name used in the Vim desktop file
GenericName[de]=Texteditor
GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14 @@
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with Motif L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
/*
* If a character was put back with vungetc, it was already processed.
* Return it directly.
---- vim72/src/option.c~ 2009-05-18 22:23:40.000000000 +0300
-+++ vim72/src/option.c 2009-05-18 22:30:25.277259155 +0300
-@@ -535,6 +535,9 @@
+--- vim72/src/optiondefs.h~ 2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/optiondefs.h 2009-05-18 22:30:25.277259155 +0300
+@@ -377,6 +377,9 @@
{"autoindent", "ai", P_BOOL|P_VI_DEF,
(char_u *)&p_ai, PV_AI,
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
{"autoprint", "ap", P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
-diff -cr vim70.orig/src/option.h vim70/src/option.h
-*** vim70.orig/src/option.h 2006-09-12 21:47:30.000000000 -0400
---- vim70/src/option.h 2006-09-12 21:54:23.000000000 -0400
-***************
-*** 312,317 ****
---- 312,318 ----
- #if defined(FEAT_GUI) && defined(MACOS_X)
- EXTERN int *p_antialias; /* 'antialias' */
- #endif
-+ EXTERN int p_apa; /* 'autopaste' */
- EXTERN int p_ar; /* 'autoread' */
- EXTERN int p_aw; /* 'autowrite' */
- EXTERN int p_awa; /* 'autowriteall' */
+--- vim72/src/option.h~ 2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300
+@@ -312,6 +312,7 @@
+ #if defined(FEAT_GUI) && defined(MACOS_X)
+ EXTERN int *p_antialias; // 'antialias'
+ #endif
++EXTERN int p_apa; /* 'autopaste' */
+ EXTERN int p_ar; // 'autoread'
+ EXTERN int p_aw; // 'autowrite'
+ EXTERN int p_awa; // 'autowriteall'
--- vim-7.0/runtime/filetype.vim~ 2006-04-29 14:54:54.702689335 +0300
+++ vim-7.0/runtime/filetype.vim 2006-04-29 14:56:07.254310876 +0300
-@@ -99,7 +99,7 @@
- au BufNewFile,BufRead build.xml setf ant
+@@ -1974,7 +1974,7 @@
- " Apache style config file
--au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
+ " More Apache style config files
+ au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
+-au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
+au BufNewFile,BufRead /etc/ftpd/conf.d/*.conf,proftpd*.conf* call s:StarSetf('apachestyle')
- " Apache config file
- au BufNewFile,BufRead .htaccess setf apache
+ " More Apache config files
+ au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf* call s:StarSetf('apache')