diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-09 09:39:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-09 09:39:28 -0800 |
| commit | 2a8fade06259290024cd7fe98fdeb8fd9709c90f (patch) | |
| tree | d83dab964434a023231667bca61b397eb5d30d53 | |
| parent | 28f1c698135e245c0e09e6c5314b4799aca9378d (diff) | |
| download | emacs-2a8fade06259290024cd7fe98fdeb8fd9709c90f.tar.gz emacs-2a8fade06259290024cd7fe98fdeb8fd9709c90f.tar.bz2 emacs-2a8fade06259290024cd7fe98fdeb8fd9709c90f.zip | |
* xterm.c (x_connection_closed): Tell GCC not to suggest NO_RETURN.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3381fa28aca..13f1715d3ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -18,6 +18,7 @@ (x_error_quitter, xembed_send_message, x_iconify_frame): (my_log_handler): Rename locals to avoid shadowing. (x_delete_glyphs, x_ins_del_lines): Mark with NO_RETURN. + (x_connection_closed): Tell GCC not to suggest NO_RETURN. * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename or move locals to avoid shadowing. diff --git a/src/xterm.c b/src/xterm.c index e218eb95285..abedf3b3bce 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7755,6 +7755,10 @@ For details, see etc/PROBLEMS.\n", unbind_to (idx, Qnil); clear_waiting_for_input (); + + /* Tell GCC not to suggest attribute 'noreturn' for this function. */ + IF_LINT (if (! terminal_list) return; ) + /* Here, we absolutely have to use a non-local exit (e.g. signal, throw, longjmp), because returning from this function would get us back into Xlib's code which will directly call `exit'. */ |