diff options
| author | Gerd Moellmann | 1999-12-22 16:01:16 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-12-22 16:01:16 +0000 |
| commit | e22ef6eb695025c26286d5a13ad2696efbf7cb85 (patch) | |
| tree | 23ae58e80f66919e6845d8544d43d2bfc66a8d58 | |
| parent | 6d8e8ef35c83407aafddc7130456ee207a91a48b (diff) | |
| download | emacs-e22ef6eb695025c26286d5a13ad2696efbf7cb85.tar.gz emacs-e22ef6eb695025c26286d5a13ad2696efbf7cb85.zip | |
(realize_x_face): Don't use uninitialized local
variable in xassert.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 193684fab36..eab72435508 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 1999-12-22 Gerd Moellmann <gerd@gnu.org> | 1 | 1999-12-22 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xfaces.c (clear_font_table): Don't use uninitialized local | 3 | * xfaces.c (realize_x_face): Don't use uninitialized local |
| 4 | variable in xassert. | 4 | variable in xassert. |
| 5 | 5 | ||
| 6 | 1999-12-22 Kenichi Handa <handa@etl.go.jp> | 6 | 1999-12-22 Kenichi Handa <handa@etl.go.jp> |
diff --git a/src/xfaces.c b/src/xfaces.c index cdb1612f048..dfe8f2e4293 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -778,7 +778,7 @@ clear_font_table (f) | |||
| 778 | Lisp_Object rest, frame; | 778 | Lisp_Object rest, frame; |
| 779 | int i; | 779 | int i; |
| 780 | 780 | ||
| 781 | xassert (FRAME_X_P (c->f)); | 781 | xassert (FRAME_X_P (f)); |
| 782 | 782 | ||
| 783 | used = (char *) alloca (dpyinfo->n_fonts * sizeof *used); | 783 | used = (char *) alloca (dpyinfo->n_fonts * sizeof *used); |
| 784 | bzero (used, dpyinfo->n_fonts * sizeof *used); | 784 | bzero (used, dpyinfo->n_fonts * sizeof *used); |
| @@ -5839,7 +5839,7 @@ realize_x_face (c, attrs, charset) | |||
| 5839 | Lisp_Object unibyte_registry; | 5839 | Lisp_Object unibyte_registry; |
| 5840 | struct gcpro gcpro1; | 5840 | struct gcpro gcpro1; |
| 5841 | 5841 | ||
| 5842 | xassert (FRAME_X_P (f)); | 5842 | xassert (FRAME_X_P (c->f)); |
| 5843 | 5843 | ||
| 5844 | /* If realizing a face for use in unibyte text, get the X registry | 5844 | /* If realizing a face for use in unibyte text, get the X registry |
| 5845 | and encoding to use from Vface_default_registry. */ | 5845 | and encoding to use from Vface_default_registry. */ |