r979 - in /trunk/packages/vim/patches: Makefile_no-strip.diff debchangelog-ftplugin.vim.diff filetype.vim-better_tex_vs_plaintex.diff php.vim.diff ruby.vim-ftplugin_ri.diff series

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sat Jun 30 01:00:52 UTC 2007 

Author: jamessan
Date: Sat Jun 30 01:00:52 2007
New Revision: 979

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=979
Log:
De-fuzzed a couple patches.
Touched up the quiltifying of the three most recent patches (were missing -p0) so we can properly apply them from the extract target.

Modified:
    trunk/packages/vim/patches/Makefile_no-strip.diff
    trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff
    trunk/packages/vim/patches/filetype.vim-better_tex_vs_plaintex.diff
    trunk/packages/vim/patches/php.vim.diff
    trunk/packages/vim/patches/ruby.vim-ftplugin_ri.diff
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/patches/Makefile_no-strip.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/Makefile_no-strip.diff?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/Makefile_no-strip.diff (original)
+++ trunk/packages/vim/patches/Makefile_no-strip.diff Sat Jun 30 01:00:52 2007
@@ -1,7 +1,7 @@
-Index: vim-7.1/vim/src/Makefile
+Index: vim/src/Makefile
 ===================================================================
---- vim-7.1.orig/vim/src/Makefile	2007-06-17 17:59:03.000000000 +0100
-+++ vim-7.1/vim/src/Makefile	2007-06-17 17:59:21.000000000 +0100
+--- vim/src/Makefile.orig
++++ vim/src/Makefile
 @@ -1758,7 +1758,6 @@
  	  rm -f $(DEST_BIN)/$(VIMNAME).rm; \
  	fi

Modified: trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff (original)
+++ trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff Sat Jun 30 01:00:52 2007
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/runtime/ftplugin/debchangelog.vim.orig
 +++ vim/runtime/ftplugin/debchangelog.vim
-@@ -2,24 +2,26 @@
+@@ -2,7 +2,7 @@
  " Language:	Debian Changelog
  " Maintainer:	Michael Piefel <piefel at informatik.hu-berlin.de>
  "		Stefano Zacchiroli <zack at debian.org>
@@ -11,9 +11,7 @@
  " License:	GNU GPL, version 2.0 or later
  " URL:		http://svn.debian.org/wsvn/pkg-vim/trunk/runtime/ftplugin/debchangelog.vim?op=file&rev=0&sc=0
  
- if exists("b:did_ftplugin")
-   finish
- endif
+@@ -12,14 +12,16 @@
  let b:did_ftplugin=1
  
  " {{{1 Local settings (do on every load)
@@ -32,9 +30,9 @@
  
  " Clean unloading
  let b:undo_ftplugin = "setlocal tw< comments< foldmethod< foldexpr< foldtext<"
-@@ -260,6 +263,8 @@
-   return '='
- endfunction
+@@ -263,6 +265,8 @@
+ 
+ foldopen!   " unfold the entry the cursor is on (usually the first one)
  
 +silent! foldopen!   " unfold the entry the cursor is on (usually the first one)
 +

Modified: trunk/packages/vim/patches/filetype.vim-better_tex_vs_plaintex.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/filetype.vim-better_tex_vs_plaintex.diff?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/filetype.vim-better_tex_vs_plaintex.diff (original)
+++ trunk/packages/vim/patches/filetype.vim-better_tex_vs_plaintex.diff Sat Jun 30 01:00:52 2007
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/runtime/filetype.vim.orig
 +++ vim/runtime/filetype.vim
-@@ -1769,7 +1769,7 @@
+@@ -1857,7 +1857,7 @@
      call cursor(1,1)
      let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
      if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.

Modified: trunk/packages/vim/patches/php.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/php.vim.diff?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/php.vim.diff (original)
+++ trunk/packages/vim/patches/php.vim.diff Sat Jun 30 01:00:52 2007
@@ -2,12 +2,12 @@
 ===================================================================
 --- vim/runtime/syntax/php.vim.orig
 +++ vim/runtime/syntax/php.vim
-@@ -146,7 +146,7 @@
+@@ -168,7 +168,7 @@
  syn keyword phpFunctions  fbsql_affected_rows fbsql_autocommit fbsql_change_user fbsql_close fbsql_commit fbsql_connect fbsql_create_blob fbsql_create_clob fbsql_create_db fbsql_data_seek fbsql_database_password fbsql_database fbsql_db_query fbsql_db_status fbsql_drop_db fbsql_errno fbsql_error fbsql_fetch_array fbsql_fetch_assoc fbsql_fetch_field fbsql_fetch_lengths fbsql_fetch_object fbsql_fetch_row fbsql_field_flags fbsql_field_len fbsql_field_name fbsql_field_seek fbsql_field_table fbsql_field_type fbsql_free_result fbsql_get_autostart_info fbsql_hostname fbsql_insert_id fbsql_list_dbs fbsql_list_fields fbsql_list_tables fbsql_next_result fbsql_num_fields fbsql_num_rows fbsql_password fbsql_pconnect fbsql_query fbsql_read_blob fbsql_read_clob fbsql_result fbsql_rollback fbsql_select_db fbsql_set_lob_mode fbsql_set_transaction fbsql_start_db fbsql_stop_db fbsql_tablename fbsql_username fbsql_warnings  contained
  syn keyword phpFunctions  fdf_add_doc_javascript fdf_add_template fdf_close fdf_create fdf_enum_values fdf_errno fdf_error fdf_get_ap fdf_get_attachment fdf_get_encoding fdf_get_file fdf_get_flags fdf_get_opt fdf_get_status fdf_get_value fdf_get_version fdf_header fdf_next_field_name fdf_open_string fdf_open fdf_remove_item fdf_save_string fdf_save fdf_set_ap fdf_set_encoding fdf_set_file fdf_set_flags fdf_set_javascript_action fdf_set_opt fdf_set_status fdf_set_submit_form_action fdf_set_target_frame fdf_set_value fdf_set_version  contained
  syn keyword phpFunctions  filepro_fieldcount filepro_fieldname filepro_fieldtype filepro_fieldwidth filepro_retrieve filepro_rowcount filepro contained
 -syn keyword phpFunctions  basename chgrp chmod chown clearstatcache copy delete dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink  contained
 +syn keyword phpFunctions  basename chgrp chmod chown clearstatcache copy dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink  contained
  syn keyword phpFunctions  fribidi_log2vis contained
- syn keyword phpFunctions  ftp_alloc ftp_cdup ftp_chdir ftp_chmod ftp_close ftp_connect ftp_delete ftp_exec ftp_fget ftp_fput ftp_get_option ftp_get ftp_login ftp_mdtm ftp_mkdir ftp_nb_continue ftp_nb_fget ftp_nb_fput ftp_nb_get ftp_nb_put ftp_nlist ftp_pasv ftp_put ftp_pwd ftp_quit ftp_raw ftp_rawlist ftp_rename ftp_rmdir ftp_set_option ftp_site ftp_size ftp_ssl_connect ftp_systype contained
+ syn keyword phpFunctions  ftp_alloc ftp_cdup ftp_chdir ftp_chmod ftp_close ftp_connect ftp_delete ftp_exec ftp_fget ftp_fput ftp_get_option ftp_get ftp_login ftp_mdtm ftp_mkdir ftp_nb_continue ftp_nb_fget ftp_nb_fput ftp_nb_get ftp_nb_put ftp_nlist ftp_pasv ftp_put ftp_pwd ftp_quit ftp_raw ftp_rawlist ftp_rename ftp_rmdir ftp_set_option ftp_site ftp_size ftp_ssl_connect ftp_systype  contained
  syn keyword phpFunctions  call_user_func_array call_user_func create_function func_get_arg func_get_args func_num_args function_exists get_defined_functions register_shutdown_function register_tick_function unregister_tick_function contained

Modified: trunk/packages/vim/patches/ruby.vim-ftplugin_ri.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/ruby.vim-ftplugin_ri.diff?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/ruby.vim-ftplugin_ri.diff (original)
+++ trunk/packages/vim/patches/ruby.vim-ftplugin_ri.diff Sat Jun 30 01:00:52 2007
@@ -2,9 +2,9 @@
 ===================================================================
 --- vim/runtime/ftplugin/ruby.vim.orig
 +++ vim/runtime/ftplugin/ruby.vim
-@@ -20,6 +20,9 @@
- let s:cpo_save = &cpo
- set cpo&vim
+@@ -26,6 +26,9 @@
+   setlocal keywordprg=ri
+ endif
  
 +" Debian patch: use ri for keyword lookup
 +setlocal keywordprg=ri

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=979&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sat Jun 30 01:00:52 2007
@@ -14,6 +14,6 @@
 zh_TW.po-swap_recovery_typo.diff -p0
 changelog.vim-date_end_entry.diff -p0
 javac_cmdline-vim.diff -p0
-Makefile_no-strip.diff
-debchangelog-closes_omni.vim.diff
-map.vim-syntax.diff
+Makefile_no-strip.diff -p0
+debchangelog-closes_omni.vim.diff -p0
+map.vim-syntax.diff -p0

More information about the pkg-vim-maintainers mailing list