[GRASS-SVN] r62948 - in grass/branches/releasebranch_7_0: . lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 07:10:59 -0800 (Tue, 25 Nov 2014)
New Revision: 62948

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
libgis: report none color also for G_OPT_C_FG
        (merge r62946 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62945
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-25 15:10:23 UTC (rev 62947)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-25 15:10:59 UTC (rev 62948)
@@ -579,7 +579,8 @@
 	Opt->answer = DEFAULT_FG_COLOR;
 	Opt->gisprompt = "old,color,color";
 	Opt->label = _("Color");
-	Opt->description = _("Either a standard color name or R:G:B triplet");
+	Opt->description =
+	    _("Either a standard color name, R:G:B triplet, or \"none\"");
 	break;
     case G_OPT_C_BG:
 	Opt->key = "bgcolor";