diff options
| author | Paul Eggert | 2011-03-16 01:20:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-16 01:20:40 -0700 |
| commit | 89bc529a4c8578046172d80776abcf3fadc0dbe8 (patch) | |
| tree | ae53563123691d78cd03c10ed32c800461432483 /src | |
| parent | e663c700e753d901479798b735c2ad6ac74c07d9 (diff) | |
| download | emacs-89bc529a4c8578046172d80776abcf3fadc0dbe8.tar.gz emacs-89bc529a4c8578046172d80776abcf3fadc0dbe8.zip | |
* font.c (font_parse_fcname): Remove unused vars.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/font.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e9a6d5da5a3..ba1bd03265b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * font.c (font_unparse_xlfd): Don't mix pointers to variables with | 3 | * font.c (font_unparse_xlfd): Don't mix pointers to variables with |
| 4 | pointers to constants. | 4 | pointers to constants. |
| 5 | (font_parse_fcname): Remove unused vars. | ||
| 5 | 6 | ||
| 6 | * fns.c (require_nesting_list, require_unwind): Now static. | 7 | * fns.c (require_nesting_list, require_unwind): Now static. |
| 7 | (Ffillarray): Rename locals to avoid shadowing. | 8 | (Ffillarray): Rename locals to avoid shadowing. |
diff --git a/src/font.c b/src/font.c index 3b2ae9c6620..16812255e87 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1448,12 +1448,10 @@ font_parse_fcname (char *name, Lisp_Object font) | |||
| 1448 | { | 1448 | { |
| 1449 | /* Either a fontconfig-style name with no size and property | 1449 | /* Either a fontconfig-style name with no size and property |
| 1450 | data, or a GTK-style name. */ | 1450 | data, or a GTK-style name. */ |
| 1451 | Lisp_Object prop; | ||
| 1452 | Lisp_Object weight = Qnil, slant = Qnil; | 1451 | Lisp_Object weight = Qnil, slant = Qnil; |
| 1453 | Lisp_Object width = Qnil, size = Qnil; | 1452 | Lisp_Object width = Qnil, size = Qnil; |
| 1454 | char *word_start; | 1453 | char *word_start; |
| 1455 | int word_len; | 1454 | int word_len; |
| 1456 | int size_found = 0; | ||
| 1457 | 1455 | ||
| 1458 | /* Scan backwards from the end, looking for a size. */ | 1456 | /* Scan backwards from the end, looking for a size. */ |
| 1459 | for (p = name + len - 1; p >= name; p--) | 1457 | for (p = name + len - 1; p >= name; p--) |