make color_to_short() actually return a short

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2921 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/src/proto.h b/src/proto.h
index 8bee99c1993b596ee58e1a6314948d32dabd4f0e..fa6a309a429883e19a4dd50251800efbfdedb562 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -429,7 +429,7 @@ void rcfile_error(const char *msg, ...);
 char *parse_next_word(char *ptr);
 char *parse_argument(char *ptr);
 #ifdef ENABLE_COLOR
-int color_to_short(const char *colorname, bool *bright);
+short color_to_short(const char *colorname, bool *bright);
 char *parse_next_regex(char *ptr);
 bool nregcomp(regex_t *preg, const char *regex, int eflags);
 void parse_syntax(char *ptr);

diff --git a/src/rcfile.c b/src/rcfile.c
index eb39876716ab074984c5e8ae5ea0db51774a4b18..96e6f0807f1290ce710a5facd687cfd80155db5f 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -180,7 +180,7 @@ char *parse_argument(char *ptr)
 }
 
 #ifdef ENABLE_COLOR
-int color_to_short(const char *colorname, bool *bright)
+short color_to_short(const char *colorname, bool *bright)
 {
     short mcolor = -1;