diff options
| author | Paul Eggert | 2011-01-16 19:05:08 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-16 19:05:08 -0800 |
| commit | 97be3ce36c97d85b5f243cc1e1a14985164a9bf3 (patch) | |
| tree | 2199274d28e88e575fab37c055d49931b1929daf | |
| parent | 9fba3563f1c43c485cea79521d48024202b10203 (diff) | |
| download | emacs-97be3ce36c97d85b5f243cc1e1a14985164a9bf3.tar.gz emacs-97be3ce36c97d85b5f243cc1e1a14985164a9bf3.zip | |
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Previously it was marked by preceding it with "return;", but
Sun cc complains about this.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fontset.c | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cfaaf4c9087..698c5bd4cd7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * fontset.c (free_realized_fontset): Mark unreachable code with if (0). | ||
| 4 | Previously it was marked by preceding it with "return;", but | ||
| 5 | Sun cc complains about this. | ||
| 6 | |||
| 3 | * coding.c (decode_coding_emacs_mule): Remove unreachable code. | 7 | * coding.c (decode_coding_emacs_mule): Remove unreachable code. |
| 4 | This is a typo left over from 2009-03-06T07:51:52Z!handa@m17n.org, | 8 | This is a typo left over from 2009-03-06T07:51:52Z!handa@m17n.org, |
| 5 | which fixed Bug#2370. Caught by Sun cc. | 9 | which fixed Bug#2370. Caught by Sun cc. |
diff --git a/src/fontset.c b/src/fontset.c index c38b01d4725..8d58f4cee9a 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -849,12 +849,12 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) | |||
| 849 | { | 849 | { |
| 850 | Lisp_Object tail; | 850 | Lisp_Object tail; |
| 851 | 851 | ||
| 852 | return; | 852 | if (0) |
| 853 | for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail)) | 853 | for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail)) |
| 854 | { | 854 | { |
| 855 | xassert (FONT_OBJECT_P (XCAR (tail))); | 855 | xassert (FONT_OBJECT_P (XCAR (tail))); |
| 856 | font_close_object (f, XCAR (tail)); | 856 | font_close_object (f, XCAR (tail)); |
| 857 | } | 857 | } |
| 858 | } | 858 | } |
| 859 | 859 | ||
| 860 | /* Free fontset of FACE defined on frame F. Called from | 860 | /* Free fontset of FACE defined on frame F. Called from |
| @@ -2263,4 +2263,3 @@ at the vertical center of lines. */); | |||
| 2263 | defsubr (&Sfontset_list_all); | 2263 | defsubr (&Sfontset_list_all); |
| 2264 | #endif | 2264 | #endif |
| 2265 | } | 2265 | } |
| 2266 | |||