[SCM] Vim packaging branch, master, updated. debian/7.2.000-3-14-ga98cef7

[James Vega]

The following commit has been merged in the master branch:
commit 525cb06c81300ac52946819e3cf88bed51c74aee
Author: Bram Moolenaar <Bram at moolenaar.net>
Date:   Mon Sep 1 13:38:48 2008 -0400

    [7.2.004] Cscope help message is not translated
    
    Patch 7.2.004
    Problem:    Cscope help message is not translated.
    Solution:   Put it in _(). (Dominique Pelle)

diff --git a/src/if_cscope.c b/src/if_cscope.c
index 600fcb0..4dff116 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -74,7 +74,7 @@ static cscmd_T	    cs_cmds[] =
     { "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 @@ cs_help(eap)
 	(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 --git a/src/if_cscope.h b/src/if_cscope.h
index 99d472b..89b69f7 100644
--- a/src/if_cscope.h
+++ b/src/if_cscope.h
@@ -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 --git a/src/version.c b/src/version.c
index ef68174..5ee09c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4,
+/**/
     3,
 /**/
     2,

-- 
Vim packaging