Author: randy
Date: 2008-08-28 09:45:56 -0600 (Thu, 28 Aug 2008)
New Revision: 1969
Added:
trunk/vim/vim-7.2-fixes-1.patch
Log:
Created a vim-7.2 fixes patch which incorporates upstream patches 1 thru 6
Added: trunk/vim/vim-7.2-fixes-1.patch
===================================================================
--- trunk/vim/vim-7.2-fixes-1.patch (rev 0)
+++ trunk/vim/vim-7.2-fixes-1.patch 2008-08-28 15:45:56 UTC (rev 1969)
@@ -0,0 +1,236 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2008-08-28
+Initial Package Version: 7.2
+Upstream Status: Already in upstream patch repo
+Origin: Upstream
+Description: This patch is upstream patch numbers 1 thru 6
+
+
+diff -Naur vim72-orig/runtime/scripts.vim vim72/runtime/scripts.vim
+--- vim72-orig/runtime/scripts.vim 2008-08-08 22:27:21.000000000 +0000
++++ vim72/runtime/scripts.vim 2008-08-28 15:23:19.000000000 +0000
+@@ -234,6 +234,10 @@
+ elseif s:line1 =~ '\<DTD\s\+XHTML\s'
+ set ft=xhtml
+
++ " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
++ elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
++ set ft=html
++
+ " PDF
+ elseif s:line1 =~ '^%PDF-'
+ set ft=pdf
+
+diff -Naur vim72-orig/src/eval.c vim72/src/eval.c
+--- vim72-orig/src/eval.c 2008-08-07 19:37:22.000000000 +0000
++++ vim72/src/eval.c 2008-08-28 15:23:15.000000000 +0000
+@@ -3657,8 +3657,8 @@
+ }
+
+ /*
+- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
+- * it refers to a List or Dictionary that is locked.
++ * Return TRUE if typeval "tv" is locked: Either that value is locked itself
++ * or it refers to a List or Dictionary that is locked.
+ */
+ static int
+ tv_islocked(tv)
+@@ -15838,10 +15838,9 @@
+ if (res == FAIL)
+ res = ITEM_COMPARE_FAIL;
+ else
+- /* return value has wrong type */
+ res = get_tv_number_chk(&rettv, &item_compare_func_err);
+ if (item_compare_func_err)
+- res = ITEM_COMPARE_FAIL;
++ res = ITEM_COMPARE_FAIL; /* return value has wrong type */
+ clear_tv(&rettv);
+ return res;
+ }
+@@ -20590,6 +20589,9 @@
+ int st_len = 0;
+
+ todo = (int)func_hashtab.ht_used;
++ if (todo == 0)
++ return; /* nothing to dump */
++
+ sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
+
+ for (hi = func_hashtab.ht_array; todo > 0; ++hi)
+@@ -20638,6 +20640,8 @@
+ prof_self_cmp);
+ prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
+ }
++
++ vim_free(sorttab);
+ }
+
+ static void
+@@ -21204,7 +21208,7 @@
+ if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+ func_do_profile(fp);
+ if (fp->uf_profiling
+- || (fc.caller != NULL && &fc.caller->func->uf_profiling))
++ || (fc.caller != NULL && fc.caller->func->uf_profiling))
+ {
+ ++fp->uf_tm_count;
+ profile_start(&call_start);
+@@ -21235,13 +21239,13 @@
+
+ #ifdef FEAT_PROFILE
+ if (do_profiling == PROF_YES && (fp->uf_profiling
+- || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
++ || (fc.caller != NULL && fc.caller->func->uf_profiling)))
+ {
+ profile_end(&call_start);
+ profile_sub_wait(&wait_start, &call_start);
+ profile_add(&fp->uf_tm_total, &call_start);
+ profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+- if (fc.caller != NULL && &fc.caller->func->uf_profiling)
++ if (fc.caller != NULL && fc.caller->func->uf_profiling)
+ {
+ profile_add(&fc.caller->func->uf_tm_children, &call_start);
+ profile_add(&fc.caller->func->uf_tml_children, &call_start);
+
+diff -Naur vim72-orig/src/if_cscope.c vim72/src/if_cscope.c
+--- vim72-orig/src/if_cscope.c 2008-06-24 16:32:34.000000000 +0000
++++ vim72/src/if_cscope.c 2008-08-28 15:23:11.000000000 +0000
+@@ -74,7 +74,7 @@
+ { "add", cs_add,
+ N_("Add a new database"), "add file|dir [pre-path]
[flags]", 0 },
+ { "find", cs_find,
+- N_("Query for a pattern"), FIND_USAGE, 1 },
++ N_("Query for a pattern"), "find c|d|e|f|g|i|s|t name", 1 },
+ { "help", cs_help,
+ N_("Show this message"), "help", 0 },
+ { "kill", cs_kill,
+@@ -1180,7 +1180,16 @@
+ (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+ cmdp->name, _(cmdp->help), cmdp->usage);
+ if (strcmp(cmdp->name, "find") == 0)
+- MSG_PUTS(FIND_HELP);
++ MSG_PUTS(_("\n"
++ " c: Find functions calling this function\n"
++ " d: Find functions called by this function\n"
++ " e: Find this egrep pattern\n"
++ " f: Find this file\n"
++ " g: Find this definition\n"
++ " i: Find files #including this file\n"
++ " s: Find this C symbol\n"
++ " t: Find assignments to\n"));
++
+ cmdp++;
+ }
+
+diff -Naur vim72-orig/src/if_cscope.h vim72/src/if_cscope.h
+--- vim72-orig/src/if_cscope.h 2007-09-02 14:51:08.000000000 +0000
++++ vim72/src/if_cscope.h 2008-08-28 15:23:11.000000000 +0000
+@@ -42,17 +42,6 @@
+ * f 7name Find this file
+ * i 8name Find files #including this file
+ */
+-#define FIND_USAGE "find c|d|e|f|g|i|s|t name"
+-#define FIND_HELP "\n\
+- c: Find functions calling this function\n\
+- d: Find functions called by this function\n\
+- e: Find this egrep pattern\n\
+- f: Find this file\n\
+- g: Find this definition\n\
+- i: Find files #including this file\n\
+- s: Find this C symbol\n\
+- t: Find assignments to\n"
+-
+
+ typedef struct {
+ char * name;
+
+diff -Naur vim72-orig/src/menu.c vim72/src/menu.c
+--- vim72-orig/src/menu.c 2008-06-21 19:53:43.000000000 +0000
++++ vim72/src/menu.c 2008-08-28 15:22:59.000000000 +0000
+@@ -1120,6 +1120,7 @@
+ parent = menu;
+ menu = menu->children;
+ }
++ vim_free(path_name);
+
+ /* Now we have found the matching menu, and we list the mappings */
+ /* Highlight title */
+diff -Naur vim72-orig/src/pty.c vim72/src/pty.c
+--- vim72-orig/src/pty.c 2008-06-21 18:52:58.000000000 +0000
++++ vim72/src/pty.c 2008-08-28 15:22:53.000000000 +0000
+@@ -270,9 +270,10 @@
+ }
+ #endif
+
+-#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
++#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) &&
!defined(MACOS_X)
+
+-/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
++/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
++ * Same for Mac OS X Leopard. */
+ #define PTY_DONE
+ int
+ OpenPTY(ttyn)
+
+diff -Naur vim72-orig/src/spell.c vim72/src/spell.c
+--- vim72-orig/src/spell.c 2008-07-12 19:20:55.000000000 +0000
++++ vim72/src/spell.c 2008-08-28 15:23:02.000000000 +0000
+@@ -77,7 +77,7 @@
+
+ /*
+ * Do the opposite: based on a maximum end score and a known sound score,
+- * compute the the maximum word score that can be used.
++ * compute the maximum word score that can be used.
+ */
+ #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
+
+@@ -625,7 +625,7 @@
+ /* TRUE if a word appears in the list of banned words. */
+ #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned,
word)))
+
+-/* Number of suggestions kept when cleaning up. we need to keep more than
++/* Number of suggestions kept when cleaning up. We need to keep more than
+ * what is displayed, because when rescore_suggestions() is called the score
+ * may change and wrong suggestions may be removed later. */
+ #define SUG_CLEAN_COUNT(su) ((su)->su_maxcount < 130 ? 150 :
(su)->su_maxcount + 20)
+@@ -5980,7 +5980,7 @@
+ else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
+ MSG(_("Too many compound flags"));
+ else
+- MSG(_("Too many posponed prefixes and/or compound flags"));
++ MSG(_("Too many postponed prefixes and/or compound flags"));
+ }
+
+ if (syllable != NULL)
+
+diff -Naur vim72-orig/src/version.c vim72/src/version.c
+--- vim72-orig/src/version.c 2008-08-09 14:24:52.000000000 +0000
++++ vim72/src/version.c 2008-08-28 15:23:19.000000000 +0000
+@@ -677,6 +677,18 @@
+ static int included_patches[] =
+ { /* Add new patch number below this line */
+ /**/
++ 6,
++/**/
++ 5,
++/**/
++ 4,
++/**/
++ 3,
++/**/
++ 2,
++/**/
++ 1,
++/**/
+ 0
+ };
+
+@@ -786,7 +798,7 @@
+ MSG_PUTS(_("\nRISC OS version"));
+ #endif
+ #ifdef VMS
+- MSG_PUTS("\nOpenVMS version");
++ MSG_PUTS(_("\nOpenVMS version"));
+ # ifdef HAVE_PATHDEF
+ if (*compiled_arch != NUL)
+ {
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
