diff options
| author | Paul Eggert | 2011-03-16 14:23:37 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-16 14:23:37 -0700 |
| commit | 5ad03b978fea0a7cfeb8e0b8f78484244642c1c5 (patch) | |
| tree | 89389245d9ea0759e644368420533a83d601b9f2 /src | |
| parent | 3ddb06397195434207cd188506693626b8c57a32 (diff) | |
| download | emacs-5ad03b978fea0a7cfeb8e0b8f78484244642c1c5.tar.gz emacs-5ad03b978fea0a7cfeb8e0b8f78484244642c1c5.zip | |
* font.c (font_sort_entities): Mark var as initialized.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/font.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 210b756e0ee..1f30c599626 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * font.c (font_unparse_fcname): Abort in an "impossible" situation | 3 | * font.c (font_unparse_fcname): Abort in an "impossible" situation |
| 4 | instead of using an uninitialized var. | 4 | instead of using an uninitialized var. |
| 5 | (font_sort_entities): Mark var as initialized. | ||
| 5 | 6 | ||
| 6 | * character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing. | 7 | * character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing. |
| 7 | 8 | ||
diff --git a/src/font.c b/src/font.c index 5df0510b518..9e8b7029c22 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2177,7 +2177,7 @@ font_sort_entities (Lisp_Object list, Lisp_Object prefer, Lisp_Object frame, int | |||
| 2177 | unsigned best_score; | 2177 | unsigned best_score; |
| 2178 | Lisp_Object best_entity; | 2178 | Lisp_Object best_entity; |
| 2179 | struct frame *f = XFRAME (frame); | 2179 | struct frame *f = XFRAME (frame); |
| 2180 | Lisp_Object tail, vec; | 2180 | Lisp_Object tail, vec IF_LINT (= Qnil); |
| 2181 | USE_SAFE_ALLOCA; | 2181 | USE_SAFE_ALLOCA; |
| 2182 | 2182 | ||
| 2183 | for (i = FONT_WEIGHT_INDEX; i <= FONT_AVGWIDTH_INDEX; i++) | 2183 | for (i = FONT_WEIGHT_INDEX; i <= FONT_AVGWIDTH_INDEX; i++) |