packages: vim/vim.spec, vim/7.3.076 (NEW), vim/7.3.077 (NEW), vim/7.3.078 (...
glen
glen at pld-linux.org
Thu Dec 9 12:19:00 CET 2010
Author: glen Date: Thu Dec 9 11:19:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- (auto)up to 7.3.081
---- Files affected:
packages/vim:
vim.spec (1.535 -> 1.536) , 7.3.076 (NONE -> 1.1) (NEW), 7.3.077 (NONE -> 1.1) (NEW), 7.3.078 (NONE -> 1.1) (NEW), 7.3.079 (NONE -> 1.1) (NEW), 7.3.080 (NONE -> 1.1) (NEW), 7.3.081 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.535 packages/vim/vim.spec:1.536
--- packages/vim/vim.spec:1.535 Fri Dec 3 23:27:41 2010
+++ packages/vim/vim.spec Thu Dec 9 12:18:54 2010
@@ -28,7 +28,7 @@
# curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
%define ver 7.3
-%define patchlevel 075
+%define patchlevel 081
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -1380,6 +1380,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.536 2010/12/09 11:18:54 glen
+- (auto)up to 7.3.081
+
Revision 1.535 2010/12/03 22:27:41 adamg
- updated to 7.3.075
================================================================
Index: packages/vim/7.3.076
diff -u /dev/null packages/vim/7.3.076:1.1
--- /dev/null Thu Dec 9 12:19:00 2010
+++ packages/vim/7.3.076 Thu Dec 9 12:18:54 2010
@@ -0,0 +1,203 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.076
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.076
+Problem: Clang warnings for dead code.
+Solution: Remove it. (Carlo Teubner)
+Files: src/gui_gtk.c, src/if_ruby.c, src/misc2.c, src/netbeans.c,
+ src/spell.c
+
+
+*** ../vim-7.3.075/src/gui_gtk.c 2010-11-24 18:48:08.000000000 +0100
+--- src/gui_gtk.c 2010-12-08 12:25:17.000000000 +0100
+***************
+*** 1798,1804 ****
+ char_u *repl_text;
+ gboolean direction_down;
+ SharedFindReplace *sfr;
+- int rc;
+
+ flags = (int)(long)data; /* avoid a lint warning here */
+
+--- 1798,1803 ----
+***************
+*** 1824,1830 ****
+
+ repl_text = CONVERT_FROM_UTF8(repl_text);
+ find_text = CONVERT_FROM_UTF8(find_text);
+! rc = gui_do_findrepl(flags, find_text, repl_text, direction_down);
+ CONVERT_FROM_UTF8_FREE(repl_text);
+ CONVERT_FROM_UTF8_FREE(find_text);
+ }
+--- 1823,1829 ----
+
+ repl_text = CONVERT_FROM_UTF8(repl_text);
+ find_text = CONVERT_FROM_UTF8(find_text);
+! gui_do_findrepl(flags, find_text, repl_text, direction_down);
+ CONVERT_FROM_UTF8_FREE(repl_text);
+ CONVERT_FROM_UTF8_FREE(find_text);
+ }
+*** ../vim-7.3.075/src/if_ruby.c 2010-11-24 17:03:34.000000000 +0100
+--- src/if_ruby.c 2010-12-08 12:30:38.000000000 +0100
+***************
+*** 586,594 ****
+ if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
+ return;
+ for (i = eap->line1; i <= eap->line2; i++) {
+! VALUE line, oldline;
+
+! line = oldline = vim_str2rb_enc_str((char *)ml_get(i));
+ rb_lastline_set(line);
+ eval_enc_string_protect((char *) eap->arg, &state);
+ if (state) {
+--- 586,594 ----
+ if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
+ return;
+ for (i = eap->line1; i <= eap->line2; i++) {
+! VALUE line;
+
+! line = vim_str2rb_enc_str((char *)ml_get(i));
+ rb_lastline_set(line);
+ eval_enc_string_protect((char *) eap->arg, &state);
+ if (state) {
+*** ../vim-7.3.075/src/misc2.c 2010-08-15 21:57:32.000000000 +0200
+--- src/misc2.c 2010-12-08 12:42:44.000000000 +0100
+***************
+*** 200,206 ****
+ }
+ #endif
+
+- idx = -1;
+ ptr = line;
+ while (col <= wcol && *ptr != NUL)
+ {
+--- 200,205 ----
+***************
+*** 1223,1229 ****
+ #endif
+
+ /*
+! * copy a string into newly allocated memory
+ */
+ char_u *
+ vim_strsave(string)
+--- 1222,1228 ----
+ #endif
+
+ /*
+! * Copy "string" into newly allocated memory.
+ */
+ char_u *
+ vim_strsave(string)
+***************
+*** 1239,1244 ****
+--- 1238,1249 ----
+ return p;
+ }
+
++ /*
++ * Copy up to "len" bytes of "string" into newly allocated memory and
++ * terminate with a NUL.
++ * The allocated memory always has size "len + 1", also when "string" is
++ * shorter.
++ */
+ char_u *
+ vim_strnsave(string, len)
+ char_u *string;
+*** ../vim-7.3.075/src/netbeans.c 2010-12-02 17:09:48.000000000 +0100
+--- src/netbeans.c 2010-12-08 12:43:57.000000000 +0100
+***************
+*** 960,966 ****
+ keyQ_T *key_node = keyHead.next;
+ queue_T *cmd_node = head.next;
+ nbbuf_T buf;
+- buf_T *bufp;
+ int i;
+
+ /* free the netbeans buffer list */
+--- 960,965 ----
+***************
+*** 969,975 ****
+ buf = buf_list[i];
+ vim_free(buf.displayname);
+ vim_free(buf.signmap);
+! if ((bufp=buf.bufp) != NULL)
+ {
+ buf.bufp->b_netbeans_file = FALSE;
+ buf.bufp->b_was_netbeans_file = FALSE;
+--- 968,974 ----
+ buf = buf_list[i];
+ vim_free(buf.displayname);
+ vim_free(buf.signmap);
+! if (buf.bufp != NULL)
+ {
+ buf.bufp->b_netbeans_file = FALSE;
+ buf.bufp->b_was_netbeans_file = FALSE;
+*** ../vim-7.3.075/src/spell.c 2010-09-29 18:32:47.000000000 +0200
+--- src/spell.c 2010-12-08 12:47:13.000000000 +0100
+***************
+*** 9839,9848 ****
+ {
+ /* be quick for ASCII */
+ if (wp->w_s->b_spell_ismw[*p])
+- {
+ s = p + 1; /* skip a mid-word character */
+- l = MB_BYTE2LEN(*s);
+- }
+ }
+ else
+ {
+--- 9839,9845 ----
+***************
+*** 9850,9859 ****
+ if (c < 256 ? wp->w_s->b_spell_ismw[c]
+ : (wp->w_s->b_spell_ismw_mb != NULL
+ && vim_strchr(wp->w_s->b_spell_ismw_mb, c) != NULL))
+- {
+ s = p + l;
+- l = MB_BYTE2LEN(*s);
+- }
+ }
+
+ c = mb_ptr2char(s);
+--- 9847,9853 ----
+***************
+*** 13813,13823 ****
+ su->su_sfmaxscore = cleanup_suggestions(gap,
+ su->su_sfmaxscore, SUG_CLEAN_COUNT(su));
+ else
+- {
+- i = su->su_maxscore;
+ su->su_maxscore = cleanup_suggestions(gap,
+ su->su_maxscore, SUG_CLEAN_COUNT(su));
+- }
+ }
+ }
+ }
+--- 13807,13814 ----
+*** ../vim-7.3.075/src/version.c 2010-12-02 21:44:35.000000000 +0100
+--- src/version.c 2010-12-08 13:10:00.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 76,
+ /**/
+
+--
+Never enter the boss's office unless it's absolutely necessary. Every boss
+saves one corner of the desk for useless assignments that are doled out like
+Halloween candy to each visitor.
+ (Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.077
diff -u /dev/null packages/vim/7.3.077:1.1
--- /dev/null Thu Dec 9 12:19:00 2010
+++ packages/vim/7.3.077 Thu Dec 9 12:18:54 2010
@@ -0,0 +1,134 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.077
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.077
+Problem: When updating crypt of swapfile fails there is no error message.
+ (Carlo Teubner)
+Solution: Add the error message.
+Files: src/memline.c
+
+
+*** ../vim-7.3.076/src/memline.c 2010-08-15 21:57:31.000000000 +0200
+--- src/memline.c 2010-12-08 12:39:10.000000000 +0100
+***************
+*** 582,587 ****
+--- 582,590 ----
+ idx = ip->ip_index + 1; /* go to next index */
+ page_count = 1;
+ }
++
++ if (error > 0)
++ EMSG(_("E843: Error while updating swap file crypt"));
+ }
+
+ mfp->mf_old_key = NULL;
+***************
+*** 2384,2390 ****
+ * Make a copy of the line if necessary.
+ */
+ /*
+! * get a pointer to a (read-only copy of a) line
+ *
+ * On failure an error message is given and IObuff is returned (to avoid
+ * having to check for error everywhere).
+--- 2387,2393 ----
+ * Make a copy of the line if necessary.
+ */
+ /*
+! * Return a pointer to a (read-only copy of a) line.
+ *
+ * On failure an error message is given and IObuff is returned (to avoid
+ * having to check for error everywhere).
+***************
+*** 2397,2403 ****
+ }
+
+ /*
+! * ml_get_pos: get pointer to position 'pos'
+ */
+ char_u *
+ ml_get_pos(pos)
+--- 2400,2406 ----
+ }
+
+ /*
+! * Return pointer to position "pos".
+ */
+ char_u *
+ ml_get_pos(pos)
+***************
+*** 2407,2413 ****
+ }
+
+ /*
+! * ml_get_curline: get pointer to cursor line.
+ */
+ char_u *
+ ml_get_curline()
+--- 2410,2416 ----
+ }
+
+ /*
+! * Return pointer to cursor line.
+ */
+ char_u *
+ ml_get_curline()
+***************
+*** 2416,2422 ****
+ }
+
+ /*
+! * ml_get_cursor: get pointer to cursor position
+ */
+ char_u *
+ ml_get_cursor()
+--- 2419,2425 ----
+ }
+
+ /*
+! * Return pointer to cursor position.
+ */
+ char_u *
+ ml_get_cursor()
+***************
+*** 2426,2432 ****
+ }
+
+ /*
+! * get a pointer to a line in a specific buffer
+ *
+ * "will_change": if TRUE mark the buffer dirty (chars in the line will be
+ * changed)
+--- 2429,2435 ----
+ }
+
+ /*
+! * Return a pointer to a line in a specific buffer
+ *
+ * "will_change": if TRUE mark the buffer dirty (chars in the line will be
+ * changed)
+*** ../vim-7.3.076/src/version.c 2010-12-08 13:11:15.000000000 +0100
+--- src/version.c 2010-12-08 13:15:44.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 77,
+ /**/
+
+--
+An operatingsystem is just a name you give to the rest of bloating
+idiosyncratic machine-based-features you left out of your editor.
+ (author unknown)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.078
diff -u /dev/null packages/vim/7.3.078:1.1
--- /dev/null Thu Dec 9 12:19:00 2010
+++ packages/vim/7.3.078 Thu Dec 9 12:18:54 2010
@@ -0,0 +1,58 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.078
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.078
+Problem: Warning for unused variable.
+Solution: Adjuste #ifdefs.
+Files: src/ops.c
+
+
+*** ../vim-7.3.077/src/ops.c 2010-12-02 21:43:10.000000000 +0100
+--- src/ops.c 2010-12-08 14:21:48.000000000 +0100
+***************
+*** 2844,2850 ****
+--- 2844,2852 ----
+ char_u *p;
+ char_u *pnew;
+ struct block_def bd;
++ #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+ int did_star = FALSE;
++ #endif
+
+ /* check for read-only register */
+ if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE))
+***************
+*** 3127,3133 ****
+--- 3129,3137 ----
+
+ clip_own_selection(&clip_star);
+ clip_gen_set_selection(&clip_star);
++ # ifdef FEAT_X11
+ did_star = TRUE;
++ # endif
+ }
+
+ # ifdef FEAT_X11
+*** ../vim-7.3.077/src/version.c 2010-12-08 13:16:58.000000000 +0100
+--- src/version.c 2010-12-08 14:22:42.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 78,
+ /**/
+
+--
+A)bort, R)etry, D)o it right this time
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.079
diff -u /dev/null packages/vim/7.3.079:1.1
--- /dev/null Thu Dec 9 12:19:00 2010
+++ packages/vim/7.3.079 Thu Dec 9 12:18:54 2010
@@ -0,0 +1,50 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.079
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.079
+Problem: Duplicate lines in makefile.
+Solution: Remove the lines. (Hong Xu)
+Files: src/Make_mvc.mak
+
+
+*** ../vim-7.3.078/src/Make_mvc.mak 2010-11-03 21:59:23.000000000 +0100
+--- src/Make_mvc.mak 2010-12-08 14:53:16.000000000 +0100
+***************
+*** 380,388 ****
+ !if "$(_NMAKE_VER)" == "10.00.30319.01"
+ MSVCVER = 10.0
+ !endif
+- !if "$(_NMAKE_VER)" == "9.00.30729.01"
+- MSVCVER = 9.0
+- !endif
+ !endif
+
+ # Abort bulding VIM if version of VC is unrecognised.
+--- 380,385 ----
+*** ../vim-7.3.078/src/version.c 2010-12-08 14:23:08.000000000 +0100
+--- src/version.c 2010-12-08 14:54:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 79,
+ /**/
+
+--
+login: yes
+password: I don't know, please tell me
+password is incorrect
+login: yes
+password: incorrect
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.080
diff -u /dev/null packages/vim/7.3.080:1.1
--- /dev/null Thu Dec 9 12:19:00 2010
+++ packages/vim/7.3.080 Thu Dec 9 12:18:54 2010
@@ -0,0 +1,205 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.080
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.080
+Problem: Spell doesn't work on VMS.
+Solution: Use different file names. (Zoltan Bartos, Zoltan Arpadffy)
+Files: src/spell.c
+
+
+*** ../vim-7.3.079/src/spell.c 2010-12-08 13:11:15.000000000 +0100
+--- src/spell.c 2010-12-08 17:01:13.000000000 +0100
+***************
+*** 327,332 ****
+--- 327,342 ----
+ typedef long idx_T;
+ #endif
+
++ #ifdef VMS
++ # define SPL_FNAME_TMPL "%s_%s.spl"
++ # define SPL_FNAME_ADD "_add."
++ # define SPL_FNAME_ASCII "_ascii."
++ #else
++ # define SPL_FNAME_TMPL "%s.%s.spl"
++ # define SPL_FNAME_ADD ".add."
++ # define SPL_FNAME_ASCII ".ascii."
++ #endif
++
+ /* Flags used for a word. Only the lowest byte can be used, the region byte
+ * comes above it. */
+ #define WF_REGION 0x01 /* region byte follows */
+***************
+*** 2471,2484 ****
+ * Find the first spell file for "lang" in 'runtimepath' and load it.
+ */
+ vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! "spell/%s.%s.spl", lang, spell_enc());
+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+
+ if (r == FAIL && *sl.sl_lang != NUL)
+ {
+ /* Try loading the ASCII version. */
+ vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! "spell/%s.ascii.spl", lang);
+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+
+ #ifdef FEAT_AUTOCMD
+--- 2481,2504 ----
+ * Find the first spell file for "lang" in 'runtimepath' and load it.
+ */
+ vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! #ifdef VMS
+! "spell/%s_%s.spl",
+! #else
+! "spell/%s.%s.spl",
+! #endif
+! lang, spell_enc());
+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+
+ if (r == FAIL && *sl.sl_lang != NUL)
+ {
+ /* Try loading the ASCII version. */
+ vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
+! #ifdef VMS
+! "spell/%s_ascii.spl",
+! #else
+! "spell/%s.ascii.spl",
+! #endif
+! lang);
+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+
+ #ifdef FEAT_AUTOCMD
+***************
+*** 2496,2502 ****
+
+ if (r == FAIL)
+ {
+! smsg((char_u *)_("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
+ lang, spell_enc(), lang);
+ }
+ else if (sl.sl_slang != NULL)
+--- 2516,2527 ----
+
+ if (r == FAIL)
+ {
+! smsg((char_u *)
+! #ifdef VMS
+! _("Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""),
+! #else
+! _("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
+! #endif
+ lang, spell_enc(), lang);
+ }
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.535&r2=1.536&f=u
More information about the pld-cvs-commit
mailing list