aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Robert2008-07-20 13:38:08 +0000
committerAdrian Robert2008-07-20 13:38:08 +0000
commit704a3a2d1c4e8e6f4a9d8812975ad33e5889c466 (patch)
treebbd9a53e8addd34ae2cb12dc15ab1b9d34f06b2c /src
parente5e2baab2954714d18ec7c97dff30ae631085655 (diff)
downloademacs-704a3a2d1c4e8e6f4a9d8812975ad33e5889c466.tar.gz
emacs-704a3a2d1c4e8e6f4a9d8812975ad33e5889c466.zip
under NS, recognize HSB,AHSB as synonyms for HSV,AHSV in color specifications
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/nsterm.m9
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c2be0659253..e673d5a1ec2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,9 @@
12008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> 12008-07-20 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * nsterm.m (ns_get_color): Recognize HSB,AHSB be synonyms for
4 HSV,AHSV.
5
62008-07-20 Adrian Robert <Adrian.B.Robert@gmail.com>
2 7
3 * Makefile.in (ns_appdir): Fix typo in find command. 8 * Makefile.in (ns_appdir): Fix typo in find command.
4 9
diff --git a/src/nsterm.m b/src/nsterm.m
index a1aeb74bd84..a4485173f27 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1328,7 +1328,8 @@ ns_get_color (const char *name, NSColor **col)
1328 of colors found in the file Emacs.clr. Color formats include: 1328 of colors found in the file Emacs.clr. Color formats include:
1329 - #rrggbb or RGBrrggbb where rr, gg, bb specify red, green and blue in hex 1329 - #rrggbb or RGBrrggbb where rr, gg, bb specify red, green and blue in hex
1330 - ARGBaarrggbb is similar, with aa being the alpha channel (FF = opaque) 1330 - ARGBaarrggbb is similar, with aa being the alpha channel (FF = opaque)
1331 - HSVhhssvv and AHSVaahhssvv are similar for hue, saturation, value 1331 - HSVhhssvv and AHSVaahhssvv (or HSB/AHSB) are similar for hue, saturation,
1332 value;
1332 - CMYKccmmyykk is similar for cyan, magenta, yellow, black. */ 1333 - CMYKccmmyykk is similar for cyan, magenta, yellow, black. */
1333{ 1334{
1334 NSColor * new = nil; 1335 NSColor * new = nil;
@@ -1376,12 +1377,14 @@ ns_get_color (const char *name, NSColor **col)
1376 hex = name + 4; 1377 hex = name + 4;
1377 color_space = argb; 1378 color_space = argb;
1378 } 1379 }
1379 else if (!memcmp (name, "HSV", 3) || !memcmp (name, "hsv", 3)) 1380 else if (!memcmp (name, "HSV", 3) || !memcmp (name, "hsv", 3) ||
1381 !memcmp (name, "HSB", 3) || !memcmp (name, "hsb", 3))
1380 { 1382 {
1381 hex = name + 3; 1383 hex = name + 3;
1382 color_space = hsv; 1384 color_space = hsv;
1383 } 1385 }
1384 else if (!memcmp (name, "AHSV", 4) || !memcmp (name, "ahsv", 4)) 1386 else if (!memcmp (name, "AHSV", 4) || !memcmp (name, "ahsv", 4) ||
1387 !memcmp (name, "AHSB", 4) || !memcmp (name, "ahsb", 4))
1385 { 1388 {
1386 hex = name + 4; 1389 hex = name + 4;
1387 color_space = ahsv; 1390 color_space = ahsv;