diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-11-06 06:07:46 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-11-06 06:07:46 +0000 |
| commit | 5e2327cf928d947328b01c87baa79cdaa18c823b (patch) | |
| tree | 20814f88060de3ef00425d9b3b5a3ce10b4a10c3 /src/font.c | |
| parent | a56eaaef7c9e641ecf6cc1cfb4cd3341e5118690 (diff) | |
| download | emacs-5e2327cf928d947328b01c87baa79cdaa18c823b.tar.gz emacs-5e2327cf928d947328b01c87baa79cdaa18c823b.tar.bz2 emacs-5e2327cf928d947328b01c87baa79cdaa18c823b.zip | |
* process.c (socket_options): Make it const.
(set_socket_option, init_process): Use a const pointer.
* lread.c (intern_c_string): New function.
(defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool)
(defvar_int): Uset it. Make the name const char*.
* lisp.h (defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool)
(defvar_int): Update prototypes.
(DEFUN, EXFUN): Support for prototypes is now required.
(intern_c_string): New prototype.
(struct Lisp_Subr): Make symbol_name constant.
* font.c (struct table_entry): Remove unused member. Make NAMES
constant.
(weight_table, slant_table, width_table): Make constant.
* emacs.c (struct standard_args): Make name and longname constant.
* character.h (DEFSYM): Use intern_c_string.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/font.c b/src/font.c index 6e33b9bec55..dd9b6d374be 100644 --- a/src/font.c +++ b/src/font.c @@ -79,14 +79,13 @@ struct table_entry int numeric; /* The first one is a valid name as a face attribute. The second one (if any) is a typical name in XLFD field. */ - char *names[5]; - Lisp_Object *symbols; + const char *names[5]; }; /* Table of weight numeric values and their names. This table must be sorted by numeric values in ascending order. */ -static struct table_entry weight_table[] = +static const struct table_entry weight_table[] = { { 0, { "thin" }}, { 20, { "ultra-light", "ultralight" }}, @@ -103,7 +102,7 @@ static struct table_entry weight_table[] = /* Table of slant numeric values and their names. This table must be sorted by numeric values in ascending order. */ -static struct table_entry slant_table[] = +static const struct table_entry slant_table[] = { { 0, { "reverse-oblique", "ro" }}, { 10, { "reverse-italic", "ri" }}, @@ -115,7 +114,7 @@ static struct table_entry slant_table[] = /* Table of width numeric values and their names. This table must be sorted by numeric values in ascending order. */ -static struct table_entry width_table[] = +static const struct table_entry width_table[] = { { 50, { "ultra-condensed", "ultracondensed" }}, { 63, { "extra-condensed", "extracondensed" }}, |