repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 197c40f3d7bf8694dd277fae14140411ecfde134:
path_to: 
revision_to: 

commit 197c40f3d7bf8694dd277fae14140411ecfde134
Author: Emanuele Giaquinta 
Date:   Thu May 13 19:40:20 2021 +0000

    Require C++11

diff --git a/src/Makefile.in b/src/Makefile.in

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -78,13 +78,11 @@ rclock: rclock.o

 #-------------------------------------------------------------------------

-#EXUBERANT_OPTS = -I NOTHROW -I THROW
-
 tags: *.[Ch]
-	ctags $(EXUBERANT_OPTS) *.[Ch]
+	ctags *.[Ch]

 TAGS: *.[Ch]
-	etags $(EXUBERANT_OPTS) *.[Ch]
+	etags *.[Ch]

 allbin: rxvt rxvtd rxvtc rclock

diff --git a/src/command.C b/src/command.C

--- a/src/command.C
+++ b/src/command.C
@@ -2354,7 +2354,7 @@ rxvt_term::cmd_parse ()

 // read the next character
 wchar_t ecb_hot
-rxvt_term::next_char () NOTHROW
+rxvt_term::next_char () noexcept
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
@@ -2390,7 +2390,7 @@ rxvt_term::next_char () NOTHROW

 // read the next octet
 uint32_t ecb_hot
-rxvt_term::next_octet () NOTHROW
+rxvt_term::next_octet () noexcept
 {
   return cmdbuf_ptr < cmdbuf_endp
          ? (unsigned char)*cmdbuf_ptr++
@@ -2400,7 +2400,7 @@ rxvt_term::next_octet () NOTHROW
 static class out_of_input out_of_input;

 wchar_t ecb_hot
-rxvt_term::cmd_getc () THROW ((class out_of_input))
+rxvt_term::cmd_getc ()
 {
   wchar_t c = next_char ();

@@ -2411,7 +2411,7 @@ rxvt_term::cmd_getc () THROW ((class out_of_input))
 }

 uint32_t ecb_hot
-rxvt_term::cmd_get8 () THROW ((class out_of_input))
+rxvt_term::cmd_get8 ()
 {
   uint32_t c = next_octet ();

diff --git a/src/main.C b/src/main.C

--- a/src/main.C
+++ b/src/main.C
@@ -61,7 +61,7 @@ rxvt_t rxvt_current_term;
 static char curlocale[128], savelocale[128];

 bool
-rxvt_set_locale (const char *locale) NOTHROW
+rxvt_set_locale (const char *locale) noexcept
 {
   int size = strlen (locale) + 1;

@@ -77,14 +77,14 @@ rxvt_set_locale (const char *locale) NOTHROW
 }

 void
-rxvt_push_locale (const char *locale) NOTHROW
+rxvt_push_locale (const char *locale) noexcept
 {
   strcpy (savelocale, curlocale);
   rxvt_set_locale (locale);
 }

 void
-rxvt_pop_locale () NOTHROW
+rxvt_pop_locale () noexcept
 {
   rxvt_set_locale (savelocale);
 }
@@ -359,7 +359,7 @@ rxvt_term::destroy_cb (ev::idle &w, int revents)
 }

 void
-rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
+rxvt_term::set_option (uint8_t opt, bool set) noexcept
 {
   if (!opt)
     return;
diff --git a/src/misc.C b/src/misc.C

--- a/src/misc.C
+++ b/src/misc.C
@@ -31,20 +31,12 @@
 // alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6)
 void *
 operator new (size_t s)
-#if !ECB_CPP11
-  throw (std::bad_alloc)
-#endif
 {
   return rxvt_malloc (s);
 }

 void
-operator delete (void *p)
-#if ECB_CPP11
-  noexcept
-#else
-  throw ()
-#endif
+operator delete (void *p) noexcept
 {
   free (p);
 }
@@ -191,7 +183,7 @@ rxvt_utf8towcs (const char *str, int len)
 }

 const char *
-rxvt_basename (const char *str) NOTHROW
+rxvt_basename (const char *str) noexcept
 {
   const char *base = strrchr (str, '/');

@@ -202,7 +194,7 @@ rxvt_basename (const char *str) NOTHROW
  * Print an error message
  */
 void
-rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
+rxvt_vlog (const char *fmt, va_list arg_ptr) noexcept
 {
   char msg[1024];

@@ -215,7 +207,7 @@ rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
 }

 void
-rxvt_log (const char *fmt,...) NOTHROW
+rxvt_log (const char *fmt,...) noexcept
 {
   va_list arg_ptr;

@@ -228,7 +220,7 @@ rxvt_log (const char *fmt,...) NOTHROW
  * Print an error message
  */
 void
-rxvt_warn (const char *fmt,...) NOTHROW
+rxvt_warn (const char *fmt,...) noexcept
 {
   va_list arg_ptr;

@@ -240,7 +232,7 @@ rxvt_warn (const char *fmt,...) NOTHROW
 }

 void
-rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
+rxvt_fatal (const char *fmt,...)
 {
   va_list arg_ptr;

@@ -254,7 +246,7 @@ rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
 }

 void
-rxvt_exit_failure () THROW ((class rxvt_failure_exception))
+rxvt_exit_failure ()
 {
   static class rxvt_failure_exception rxvt_failure_exception;
   throw (rxvt_failure_exception);
@@ -264,7 +256,7 @@ rxvt_exit_failure () THROW ((class rxvt_failure_exception))
  * remove leading/trailing space in place.
  */
 char *
-rxvt_strtrim (char *str) NOTHROW
+rxvt_strtrim (char *str) noexcept
 {
   char *r, *s;

@@ -292,7 +284,7 @@ rxvt_strtrim (char *str) NOTHROW
  * trailing spaces from each entry.  Empty strings are properly returned
  */
 char **
-rxvt_strsplit (char delim, const char *str) NOTHROW
+rxvt_strsplit (char delim, const char *str) noexcept
 {
   int l, n;
   char *s, *t;
diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -137,9 +137,9 @@ class out_of_input { };
  */
 // main.C
 #define SET_LOCALE(locale) rxvt_set_locale (locale)
-extern bool rxvt_set_locale (const char *locale) NOTHROW;
-extern void rxvt_push_locale (const char *locale) NOTHROW;
-extern void rxvt_pop_locale () NOTHROW;
+extern bool rxvt_set_locale (const char *locale) noexcept;
+extern void rxvt_push_locale (const char *locale) noexcept;
+extern void rxvt_pop_locale () noexcept;
 void rxvt_init ();

 // misc.C
@@ -148,24 +148,24 @@ wchar_t *        rxvt_mbstowcs                    (const char *str, int len = -1
 char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);

-const char *     rxvt_basename                    (const char *str) NOTHROW;
-void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) NOTHROW;
-void             rxvt_log                         (const char *fmt,...) NOTHROW;
-void             rxvt_warn                        (const char *fmt,...) NOTHROW;
+const char *     rxvt_basename                    (const char *str) noexcept;
+void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) noexcept;
+void             rxvt_log                         (const char *fmt,...) noexcept;
+void             rxvt_warn                        (const char *fmt,...) noexcept;
 ecb_noreturn ecb_cold
-void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception));
+void             rxvt_fatal                       (const char *fmt, ...);
 ecb_noreturn ecb_cold
-void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception));
+void             rxvt_exit_failure                ();

 void *           rxvt_malloc                      (size_t size);
 void *           rxvt_calloc                      (size_t number, size_t size);
 void *           rxvt_realloc                     (void *ptr, size_t size);

-char *           rxvt_strtrim                     (char *str) NOTHROW;
-char **          rxvt_strsplit                    (char delim, const char *str) NOTHROW;
+char *           rxvt_strtrim                     (char *str) noexcept;
+char **          rxvt_strsplit                    (char delim, const char *str) noexcept;

 static inline void
-rxvt_free_strsplit (char **ptr) NOTHROW
+rxvt_free_strsplit (char **ptr) noexcept
 {
   free (ptr[0]);
   free (ptr);
@@ -1118,14 +1118,14 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
 #if ENABLE_OVERLAY
   overlay_base ov;

-  void scr_swap_overlay () NOTHROW;
-  void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
-  void scr_overlay_off () NOTHROW;
+  void scr_swap_overlay () noexcept;
+  void scr_overlay_new (int x, int y, int w, int h) noexcept;
+  void scr_overlay_off () noexcept;
   void scr_overlay_set (int x, int y,
                         text_t text,
-                        rend_t rend = OVERLAY_RSTYLE) NOTHROW;
-  void scr_overlay_set (int x, int y, const char *s) NOTHROW;
-  void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
+                        rend_t rend = OVERLAY_RSTYLE) noexcept;
+  void scr_overlay_set (int x, int y, const char *s) noexcept;
+  void scr_overlay_set (int x, int y, const wchar_t *s) noexcept;
 #endif

   vector allocated;           // free these memory blocks with free()
@@ -1176,7 +1176,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen

   long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;

-  void vt_select_input () const NOTHROW
+  void vt_select_input () const noexcept
   {
     XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
   }
@@ -1250,7 +1250,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   void im_destroy ();
   void im_cb (); im_watcher im_ev;
   void im_set_size (XRectangle &size);
-  void im_set_position (XPoint &pos) NOTHROW;
+  void im_set_position (XPoint &pos) noexcept;
   void im_set_color (unsigned long &fg, unsigned long &bg);
   void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);

@@ -1264,10 +1264,10 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   void key_press (XKeyEvent &ev);
   void key_release (XKeyEvent &ev);

-  wchar_t next_char () NOTHROW;
-  wchar_t cmd_getc () THROW ((class out_of_input));
-  uint32_t next_octet () NOTHROW;
-  uint32_t cmd_get8 () THROW ((class out_of_input));
+  wchar_t next_char () noexcept;
+  wchar_t cmd_getc ();
+  uint32_t next_octet () noexcept;
+  uint32_t cmd_get8 ();

   void cmd_parse ();
   void mouse_report (XButtonEvent &ev);
@@ -1342,14 +1342,14 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen

   // screen.C

-  bool option (uint8_t opt) const NOTHROW
+  bool option (uint8_t opt) const noexcept
   {
     return options[opt >> 3] & (1 << (opt & 7));
   }

-  void set_option (uint8_t opt, bool set = true) NOTHROW;
+  void set_option (uint8_t opt, bool set = true) noexcept;

-  int fgcolor_of (rend_t r) const NOTHROW
+  int fgcolor_of (rend_t r) const noexcept
   {
     int base = GET_BASEFG (r);
 #ifndef NO_BRIGHTCOLOR
@@ -1363,7 +1363,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
     return base;
   }

-  int bgcolor_of (rend_t r) const NOTHROW
+  int bgcolor_of (rend_t r) const noexcept
   {
     int base = GET_BASEBG (r);
 #ifndef NO_BRIGHTCOLOR
@@ -1378,90 +1378,90 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   }

   // modifies first argument(!)
-  void tt_paste (char *data, unsigned int len) NOTHROW;
-  void paste (char *data, unsigned int len) NOTHROW;
-  void scr_alloc () NOTHROW;
-  void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
-  void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
-  void scr_kill_char (line_t &l, int col) const NOTHROW;
+  void tt_paste (char *data, unsigned int len) noexcept;
+  void paste (char *data, unsigned int len) noexcept;
+  void scr_alloc () noexcept;
+  void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept;
+  void scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept;
+  void scr_kill_char (line_t &l, int col) const noexcept;
   void scr_set_char_rend (line_t &l, int col, rend_t rend);
-  int scr_scroll_text (int row1, int row2, int count) NOTHROW;
+  int scr_scroll_text (int row1, int row2, int count) noexcept;
   void copy_line (line_t &dst, line_t &src);
   void scr_reset ();
-  void scr_release () NOTHROW;
-  void scr_clear (bool really = false) NOTHROW;
-  void scr_refresh () NOTHROW;
-  bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
-  void scr_erase_screen (int mode) NOTHROW;
+  void scr_release () noexcept;
+  void scr_clear (bool really = false) noexcept;
+  void scr_refresh () noexcept;
+  bool scr_refresh_rend (rend_t mask, rend_t value) noexcept;
+  void scr_erase_screen (int mode) noexcept;
 #if ENABLE_FRILLS
-  void scr_erase_savelines () NOTHROW;
-  void scr_backindex () NOTHROW;
-  void scr_forwardindex () NOTHROW;
+  void scr_erase_savelines () noexcept;
+  void scr_backindex () noexcept;
+  void scr_forwardindex () noexcept;
 #endif
-  void scr_touch (bool refresh) NOTHROW;
-  void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
-  void scr_recolor (bool refresh = true) NOTHROW;
-  void scr_remap_chars () NOTHROW;
-  void scr_remap_chars (line_t &l) NOTHROW;
+  void scr_touch (bool refresh) noexcept;
+  void scr_expose (int x, int y, int width, int height, bool refresh) noexcept;
+  void scr_recolor (bool refresh = true) noexcept;
+  void scr_remap_chars () noexcept;
+  void scr_remap_chars (line_t &l) noexcept;

   enum cursor_mode { SAVE, RESTORE };

   void scr_poweron ();
-  void scr_soft_reset () NOTHROW;
-  void scr_cursor (cursor_mode mode) NOTHROW;
-  void scr_do_wrap () NOTHROW;
-  void scr_swap_screen () NOTHROW;
+  void scr_soft_reset () noexcept;
+  void scr_cursor (cursor_mode mode) noexcept;
+  void scr_do_wrap () noexcept;
+  void scr_swap_screen () noexcept;
   void scr_change_screen (int scrn);
-  void scr_color (unsigned int color, int fgbg) NOTHROW;
-  void scr_rendition (int set, int style) NOTHROW;
-  void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
-  void scr_backspace () NOTHROW;
-  void scr_tab (int count, bool ht = false) NOTHROW;
-  void scr_gotorc (int row, int col, int relative) NOTHROW;
-  void scr_index (enum page_dirn direction) NOTHROW;
-  void scr_erase_line (int mode) NOTHROW;
-  void scr_E () NOTHROW;
-  void scr_insdel_lines (int count, int insdel) NOTHROW;
-  void scr_insdel_chars (int count, int insdel) NOTHROW;
-  void scr_scroll_region (int top, int bot) NOTHROW;
-  void scr_cursor_visible (int mode) NOTHROW;
-  void scr_autowrap (int mode) NOTHROW;
-  void scr_relative_origin (int mode) NOTHROW;
-  void scr_insert_mode (int mode) NOTHROW;
-  void scr_set_tab (int mode) NOTHROW;
-  void scr_rvideo_mode (bool on) NOTHROW;
-  void scr_report_position () NOTHROW;
-  void set_font_style () NOTHROW;
-  void scr_charset_choose (int set) NOTHROW;
-  void scr_charset_set (int set, unsigned int ch) NOTHROW;
-  void scr_move_to (int y, int len) NOTHROW;
-  bool scr_page (int nlines) NOTHROW;
-  bool scr_page (enum page_dirn direction, int nlines) NOTHROW
+  void scr_color (unsigned int color, int fgbg) noexcept;
+  void scr_rendition (int set, int style) noexcept;
+  void scr_add_lines (const wchar_t *str, int len, int minlines = 0) noexcept;
+  void scr_backspace () noexcept;
+  void scr_tab (int count, bool ht = false) noexcept;
+  void scr_gotorc (int row, int col, int relative) noexcept;
+  void scr_index (enum page_dirn direction) noexcept;
+  void scr_erase_line (int mode) noexcept;
+  void scr_E () noexcept;
+  void scr_insdel_lines (int count, int insdel) noexcept;
+  void scr_insdel_chars (int count, int insdel) noexcept;
+  void scr_scroll_region (int top, int bot) noexcept;
+  void scr_cursor_visible (int mode) noexcept;
+  void scr_autowrap (int mode) noexcept;
+  void scr_relative_origin (int mode) noexcept;
+  void scr_insert_mode (int mode) noexcept;
+  void scr_set_tab (int mode) noexcept;
+  void scr_rvideo_mode (bool on) noexcept;
+  void scr_report_position () noexcept;
+  void set_font_style () noexcept;
+  void scr_charset_choose (int set) noexcept;
+  void scr_charset_set (int set, unsigned int ch) noexcept;
+  void scr_move_to (int y, int len) noexcept;
+  bool scr_page (int nlines) noexcept;
+  bool scr_page (enum page_dirn direction, int nlines) noexcept
   {
     return scr_page (direction * nlines);
   }
-  bool scr_changeview (int new_view_start) NOTHROW;
-  void scr_bell () NOTHROW;
-  void scr_printscreen (int fullhist) NOTHROW;
-  void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
-  void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
-  void scr_reverse_selection () NOTHROW;
-  void scr_dump (int fd) NOTHROW;
-
-  void selection_check (int check_more) NOTHROW;
-  void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
-  void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
-  void selection_clear (bool clipboard = false) NOTHROW;
+  bool scr_changeview (int new_view_start) noexcept;
+  void scr_bell () noexcept;
+  void scr_printscreen (int fullhist) noexcept;
+  void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept;
+  void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept;
+  void scr_reverse_selection () noexcept;
+  void scr_dump (int fd) noexcept;
+
+  void selection_check (int check_more) noexcept;
+  void selection_changed () noexcept; /* sets want_refresh, corrects coordinates */
+  void selection_request (Time tm, int selnum = Sel_Primary) noexcept;
+  void selection_clear (bool clipboard = false) noexcept;
   void selection_make (Time tm);
-  bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
-  void selection_start_colrow (int col, int row) NOTHROW;
-  void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
-  void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
-  void selection_remove_trailing_spaces () NOTHROW;
-  void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
-  void selection_click (int clicks, int x, int y) NOTHROW;
-  void selection_extend (int x, int y, int flag) NOTHROW;
-  void selection_rotate (int x, int y) NOTHROW;
+  bool selection_grab (Time tm, bool clipboard = false) noexcept;
+  void selection_start_colrow (int col, int row) noexcept;
+  void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept;
+  void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept;
+  void selection_remove_trailing_spaces () noexcept;
+  void selection_send (const XSelectionRequestEvent &rq) noexcept;
+  void selection_click (int clicks, int x, int y) noexcept;
+  void selection_extend (int x, int y, int flag) noexcept;
+  void selection_rotate (int x, int y) noexcept;

   // xdefaults.C
   void rxvt_usage (int type);
diff --git a/src/rxvtutil.h b/src/rxvtutil.h

--- a/src/rxvtutil.h
+++ b/src/rxvtutil.h
@@ -11,15 +11,6 @@

 #include "emman.h"

-// increases code size unless -fno-enforce-eh-specs
-#if __GNUC__
-# define NOTHROW
-# define THROW(x)
-#else
-# define NOTHROW  throw()
-# define THROW(x) throw x
-#endif
-
 // various utility functions
 template static inline void min_it (T &a, U b) { a = a < (T)b ? a : (T)b; }
 template static inline void max_it (T &a, U b) { a = a > (T)b ? a : (T)b; }
diff --git a/src/screen.C b/src/screen.C

--- a/src/screen.C
+++ b/src/screen.C
@@ -97,7 +97,7 @@ fill_text (text_t *start, text_t value, int len)

 /* Fill part/all of a line with blanks. */
 void
-rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
+rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
 {
   if (!l.valid ())
     {
@@ -124,7 +124,7 @@ rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend
 /* ------------------------------------------------------------------------- */
 /* Fill a full line with blanks - make sure it is allocated first */
 void
-rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
+rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
 {
   scr_blank_line (l, 0, ncol, efs);

@@ -134,7 +134,7 @@ rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW

 // nuke a single wide character at the given column
 void
-rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
+rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
 {
   // find begin
   while (col > 0 && l.t[col] == NOCHAR)
@@ -168,7 +168,7 @@ rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
  * ------------------------------------------------------------------------- */

 void
-rxvt_term::scr_alloc () NOTHROW
+rxvt_term::scr_alloc () noexcept
 {
   int tsize = sizeof (text_t) * ncol;
   int rsize = sizeof (rend_t) * ncol;
@@ -443,7 +443,7 @@ rxvt_term::scr_reset ()
 }

 void ecb_cold
-rxvt_term::scr_release () NOTHROW
+rxvt_term::scr_release () noexcept
 {
   chunk_free (chunk, chunk_size);
   chunk = 0;
@@ -472,7 +472,7 @@ rxvt_term::scr_poweron ()
 }

 void ecb_cold
-rxvt_term::scr_soft_reset () NOTHROW
+rxvt_term::scr_soft_reset () noexcept
 {
   /* only affects modes, nothing drastic such as clearing the screen */
 #if ENABLE_OVERLAY
@@ -496,7 +496,7 @@ rxvt_term::scr_soft_reset () NOTHROW
  * XTERM_SEQ: Restore cursor: ESC 8
  */
 void
-rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
+rxvt_term::scr_cursor (cursor_mode mode) noexcept
 {
   screen_t *s;

@@ -537,7 +537,7 @@ rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
 }

 void
-rxvt_term::scr_swap_screen () NOTHROW
+rxvt_term::scr_swap_screen () noexcept
 {
   if (!option (Opt_secondaryScreen))
     return;
@@ -595,7 +595,7 @@ rxvt_term::scr_change_screen (int scrn)

 // clear WrapNext indicator, solidifying position on next line
 void
-rxvt_term::scr_do_wrap () NOTHROW
+rxvt_term::scr_do_wrap () noexcept
 {
   if (!(screen.flags & Screen_WrapNext))
     return;
@@ -615,7 +615,7 @@ rxvt_term::scr_do_wrap () NOTHROW
  * Change the colour for following text
  */
 void
-rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
+rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
 {
   if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
     color = fgbg;
@@ -631,7 +631,7 @@ rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
  * Change the rendition style for following text
  */
 void
-rxvt_term::scr_rendition (int set, int style) NOTHROW
+rxvt_term::scr_rendition (int set, int style) noexcept
 {
   if (set)
     rstyle |= style;
@@ -648,7 +648,7 @@ rxvt_term::scr_rendition (int set, int style) NOTHROW
  * count negative ==> scroll down
  */
 int ecb_hot
-rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
+rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
 {
   if (count == 0 || (row1 > row2))
     return 0;
@@ -792,7 +792,7 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
  * Add text given in  of length  to screen struct
  */
 void ecb_hot
-rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
+rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
 {
   if (len <= 0)               /* sanity */
     return;
@@ -1048,7 +1048,7 @@ end_of_line:
  * XTERM_SEQ: CTRL-H
  */
 void
-rxvt_term::scr_backspace () NOTHROW
+rxvt_term::scr_backspace () noexcept
 {
   if (screen.cur.col == 0)
     {
@@ -1075,7 +1075,7 @@ rxvt_term::scr_backspace () NOTHROW
  * XTERM_SEQ: CTRL-I
  */
 void
-rxvt_term::scr_tab (int count, bool ht) NOTHROW
+rxvt_term::scr_tab (int count, bool ht) noexcept
 {
   int i, x;

@@ -1152,7 +1152,7 @@ rxvt_term::scr_tab (int count, bool ht) NOTHROW
  */
 #if !ENABLE_MINIMAL
 void ecb_cold
-rxvt_term::scr_backindex () NOTHROW
+rxvt_term::scr_backindex () noexcept
 {
   if (screen.cur.col > 0)
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
@@ -1169,7 +1169,7 @@ rxvt_term::scr_backindex () NOTHROW
  */
 #if !ENABLE_MINIMAL
 void ecb_cold
-rxvt_term::scr_forwardindex () NOTHROW
+rxvt_term::scr_forwardindex () noexcept
 {
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
@@ -1192,7 +1192,7 @@ rxvt_term::scr_forwardindex () NOTHROW
  * Goto Row/Column
  */
 void
-rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
+rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1241,7 +1241,7 @@ rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
  * direction should be UP or DN
  */
 void
-rxvt_term::scr_index (enum page_dirn direction) NOTHROW
+rxvt_term::scr_index (enum page_dirn direction) noexcept
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1267,7 +1267,7 @@ rxvt_term::scr_index (enum page_dirn direction) NOTHROW
  * extension: clear to right unless wrapped: ESC [ 3 K
  */
 void
-rxvt_term::scr_erase_line (int mode) NOTHROW
+rxvt_term::scr_erase_line (int mode) noexcept
 {
   unsigned int col, num;

@@ -1331,7 +1331,7 @@ rxvt_term::scr_erase_line (int mode) NOTHROW
  * XTERM_SEQ: Clear whole screen        : ESC [ 2 J
  */
 void
-rxvt_term::scr_erase_screen (int mode) NOTHROW
+rxvt_term::scr_erase_screen (int mode) noexcept
 {
   int num;
   int32_t row;
@@ -1411,7 +1411,7 @@ rxvt_term::scr_erase_screen (int mode) NOTHROW

 #if !ENABLE_MINIMAL
 void
-rxvt_term::scr_erase_savelines () NOTHROW
+rxvt_term::scr_erase_savelines () noexcept
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1426,7 +1426,7 @@ rxvt_term::scr_erase_savelines () NOTHROW
  * XTERM_SEQ: Screen Alignment Test: ESC # 8
  */
 void ecb_cold
-rxvt_term::scr_E () NOTHROW
+rxvt_term::scr_E () noexcept
 {
   rend_t fs;

@@ -1461,7 +1461,7 @@ rxvt_term::scr_E () NOTHROW
  * Insert/Delete  lines
  */
 void
-rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
+rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
 {
   int end;

@@ -1491,7 +1491,7 @@ rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
  * Insert/Delete  characters from the current position
  */
 void
-rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
+rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1600,7 +1600,7 @@ rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
  * XTERM_SEQ: Set region  -  inclusive: ESC [  ;  r
  */
 void ecb_cold
-rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
+rxvt_term::scr_scroll_region (int top, int bot) noexcept
 {
   max_it (top, 0);
   min_it (bot, nrow - 1);
@@ -1620,7 +1620,7 @@ rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
  * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
  */
 void ecb_cold
-rxvt_term::scr_cursor_visible (int mode) NOTHROW
+rxvt_term::scr_cursor_visible (int mode) noexcept
 {
   want_refresh = 1;

@@ -1637,7 +1637,7 @@ rxvt_term::scr_cursor_visible (int mode) NOTHROW
  * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
  */
 void ecb_cold
-rxvt_term::scr_autowrap (int mode) NOTHROW
+rxvt_term::scr_autowrap (int mode) noexcept
 {
   if (mode)
     screen.flags |= Screen_Autowrap;
@@ -1656,7 +1656,7 @@ rxvt_term::scr_autowrap (int mode) NOTHROW
  * XTERM_SEQ: Set Relative: ESC [ ? 6 l
  */
 void ecb_cold
-rxvt_term::scr_relative_origin (int mode) NOTHROW
+rxvt_term::scr_relative_origin (int mode) noexcept
 {
   if (mode)
     screen.flags |= Screen_Relative;
@@ -1673,7 +1673,7 @@ rxvt_term::scr_relative_origin (int mode) NOTHROW
  * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
  */
 void ecb_cold
-rxvt_term::scr_insert_mode (int mode) NOTHROW
+rxvt_term::scr_insert_mode (int mode) noexcept
 {
   if (mode)
     screen.flags |= Screen_Insert;
@@ -1689,7 +1689,7 @@ rxvt_term::scr_insert_mode (int mode) NOTHROW
  * XTERM_SEQ: Clear all tabs             : ESC [ 3 g
  */
 void ecb_cold
-rxvt_term::scr_set_tab (int mode) NOTHROW
+rxvt_term::scr_set_tab (int mode) noexcept
 {
   if (mode < 0)
     memset (tabs, 0, ncol);
@@ -1704,7 +1704,7 @@ rxvt_term::scr_set_tab (int mode) NOTHROW
  * XTERM_SEQ: Normal video : ESC [ ? 5 l
  */
 void
-rxvt_term::scr_rvideo_mode (bool on) NOTHROW
+rxvt_term::scr_rvideo_mode (bool on) noexcept
 {
   rvideo_mode = on;

@@ -1746,7 +1746,7 @@ rxvt_term::scr_rvideo_mode (bool on) NOTHROW
  * XTERM_SEQ: Report position: ESC [ 6 n
  */
 void ecb_cold
-rxvt_term::scr_report_position () NOTHROW
+rxvt_term::scr_report_position () noexcept
 {
   tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
 }
@@ -1759,7 +1759,7 @@ rxvt_term::scr_report_position () NOTHROW
  * Set font style
  */
 void ecb_cold
-rxvt_term::set_font_style () NOTHROW
+rxvt_term::set_font_style () noexcept
 {
 #if 0
   switch (charsets [screen.charset])
@@ -1791,7 +1791,7 @@ rxvt_term::set_font_style () NOTHROW
  * XTERM_SEQ: Invoke G3 character set: ESC O
  */
 void ecb_cold
-rxvt_term::scr_charset_choose (int set) NOTHROW
+rxvt_term::scr_charset_choose (int set) noexcept
 {
   screen.charset = set;
   set_font_style ();
@@ -1807,7 +1807,7 @@ rxvt_term::scr_charset_choose (int set) NOTHROW
  * See set_font_style for possible values for 
  */
 void
-rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
+rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
 {
   charsets[set] = (unsigned char)ch;
   set_font_style ();
@@ -1822,7 +1822,7 @@ rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
  * refresh matching text.
  */
 bool ecb_cold
-rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
+rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
 {
   bool found = false;

@@ -1851,7 +1851,7 @@ enum {
 };

 void ecb_hot
-rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
+rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
 {
   int i;
   row_col_t rc[RC_COUNT];
@@ -1895,7 +1895,7 @@ rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTH
  * Refresh the entire screen
  */
 void
-rxvt_term::scr_touch (bool refresh) NOTHROW
+rxvt_term::scr_touch (bool refresh) noexcept
 {
   scr_expose (0, 0, vt_width, vt_height, refresh);
 }
@@ -1906,7 +1906,7 @@ rxvt_term::scr_touch (bool refresh) NOTHROW
  * the top of the screen
  */
 void
-rxvt_term::scr_move_to (int y, int len) NOTHROW
+rxvt_term::scr_move_to (int y, int len) noexcept
 {
   // lerp (y, 0, len, top_row, nrow - 1)
   scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
@@ -1918,13 +1918,13 @@ rxvt_term::scr_move_to (int y, int len) NOTHROW
  * direction should be UP or DN
  */
 bool
-rxvt_term::scr_page (int nlines) NOTHROW
+rxvt_term::scr_page (int nlines) noexcept
 {
   return scr_changeview (view_start - nlines);
 }

 bool
-rxvt_term::scr_changeview (int new_view_start) NOTHROW
+rxvt_term::scr_changeview (int new_view_start) noexcept
 {
   clamp_it (new_view_start, top_row, 0);

@@ -1952,7 +1952,7 @@ rxvt_term::bell_cb (ev::timer &w, int revents)

 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_bell () NOTHROW
+rxvt_term::scr_bell () noexcept
 {
 #ifndef NO_BELL

@@ -1984,7 +1984,7 @@ rxvt_term::scr_bell () NOTHROW

 /* ------------------------------------------------------------------------- */
 void ecb_cold
-rxvt_term::scr_printscreen (int fullhist) NOTHROW
+rxvt_term::scr_printscreen (int fullhist) noexcept
 {
 #ifdef PRINTPIPE
   int nrows, row_start;
@@ -2043,7 +2043,7 @@ rxvt_term::scr_printscreen (int fullhist) NOTHROW
  * screen.text/screen.rend contain what the screen will change to.
  */
 void ecb_hot
-rxvt_term::scr_refresh () NOTHROW
+rxvt_term::scr_refresh () noexcept
 {
   int16_t col, row,   /* column/row we're processing               */
           ocrow;      /* old cursor row                            */
@@ -2500,7 +2500,7 @@ rxvt_term::scr_refresh () NOTHROW
 }

 void ecb_cold
-rxvt_term::scr_remap_chars (line_t &l) NOTHROW
+rxvt_term::scr_remap_chars (line_t &l) noexcept
 {
   if (!l.valid ())
     return;
@@ -2512,7 +2512,7 @@ rxvt_term::scr_remap_chars (line_t &l) NOTHROW
 }

 void ecb_cold
-rxvt_term::scr_remap_chars () NOTHROW
+rxvt_term::scr_remap_chars () noexcept
 {
   for (int i = total_rows; i--; )
     scr_remap_chars (row_buf [i]);
@@ -2525,7 +2525,7 @@ rxvt_term::scr_remap_chars () NOTHROW
 }

 void ecb_cold
-rxvt_term::scr_recolor (bool refresh) NOTHROW
+rxvt_term::scr_recolor (bool refresh) noexcept
 {
   bool transparent = false;

@@ -2576,7 +2576,7 @@ rxvt_term::scr_recolor (bool refresh) NOTHROW

 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_clear (bool really) NOTHROW
+rxvt_term::scr_clear (bool really) noexcept
 {
   if (!mapped)
     return;
@@ -2589,7 +2589,7 @@ rxvt_term::scr_clear (bool really) NOTHROW
 }

 void
-rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
+rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
 {
   int view_end = view_start + nrow;
   int row, col;
@@ -2611,7 +2611,7 @@ rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, ren
 }

 void
-rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
+rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
 {
   int view_end = view_start + nrow;
   int row, col;
@@ -2638,7 +2638,7 @@ rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, ren

 /* ------------------------------------------------------------------------- */
 void ecb_hot
-rxvt_term::scr_reverse_selection () NOTHROW
+rxvt_term::scr_reverse_selection () noexcept
 {
   if (selection.op
       && current_screen == selection.screen
@@ -2664,7 +2664,7 @@ rxvt_term::scr_reverse_selection () NOTHROW
  */
 #if 0
 void
-rxvt_term::scr_dump (int fd) NOTHROW
+rxvt_term::scr_dump (int fd) noexcept
 {
   // if this method is needed, it can be implemented by factoring the
   // relevant code in scr_printscreen
@@ -2675,7 +2675,7 @@ rxvt_term::scr_dump (int fd) NOTHROW
  *                           CHARACTER SELECTION                             *
  * ------------------------------------------------------------------------- */
 void
-rxvt_term::selection_check (int check_more) NOTHROW
+rxvt_term::selection_check (int check_more) noexcept
 {
   if (!selection.op)
     return;
@@ -2691,7 +2691,7 @@ rxvt_term::selection_check (int check_more) NOTHROW
 }

 void
-rxvt_term::selection_changed () NOTHROW
+rxvt_term::selection_changed () noexcept
 {
   line_t &r1 = ROW (selection.beg.row);
   while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
@@ -2709,7 +2709,7 @@ rxvt_term::selection_changed () NOTHROW
  * Paste a selection direct to the command fd
  */
 void
-rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
+rxvt_term::tt_paste (char *data, unsigned int len) noexcept
 {
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
@@ -2726,7 +2726,7 @@ rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
 }

 void
-rxvt_term::paste (char *data, unsigned int len) NOTHROW
+rxvt_term::paste (char *data, unsigned int len) noexcept
 {
   if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
     return;
@@ -2742,7 +2742,7 @@ rxvt_term::paste (char *data, unsigned int len) NOTHROW
  * EXT: button 2 release
  */
 void
-rxvt_term::selection_request (Time tm, int selnum) NOTHROW
+rxvt_term::selection_request (Time tm, int selnum) noexcept
 {
   if (!selection_req)
     {
@@ -2757,7 +2757,7 @@ rxvt_term::selection_request (Time tm, int selnum) NOTHROW
  * EXT: SelectionClear
  */
 void
-rxvt_term::selection_clear (bool clipboard) NOTHROW
+rxvt_term::selection_clear (bool clipboard) noexcept
 {
   if (!clipboard)
     {
@@ -2909,7 +2909,7 @@ rxvt_term::selection_make (Time tm)
 }

 bool
-rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
+rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
 {
   Atom sel;

@@ -2953,7 +2953,7 @@ rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
  * EXT: button 1 press
  */
 void ecb_cold
-rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
+rxvt_term::selection_click (int clicks, int x, int y) noexcept
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
@@ -2982,7 +2982,7 @@ rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
  * Mark a selection at the specified col/row
  */
 void ecb_cold
-rxvt_term::selection_start_colrow (int col, int row) NOTHROW
+rxvt_term::selection_start_colrow (int col, int row) noexcept
 {
   want_refresh = 1;

@@ -3019,7 +3019,7 @@ rxvt_term::selection_start_colrow (int col, int row) NOTHROW
 #define DELIMIT_REND(x)        1

 void ecb_cold
-rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
+rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
 {
   int col, row, dirnadd, tcol, trow, w1, w2;
   row_col_t bound;
@@ -3103,7 +3103,7 @@ rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, r
  * flag == 2 ==> button 3 motion
  */
 void ecb_cold
-rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
+rxvt_term::selection_extend (int x, int y, int flag) noexcept
 {
   int col = clamp (Pixel2Col (x), 0, ncol);
   int row = clamp (Pixel2Row (y), 0, nrow - 1);
@@ -3139,7 +3139,7 @@ rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
  * Extend the selection to the specified col/row
  */
 void ecb_cold
-rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
+rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
 {
   row_col_t pos;
   enum {
@@ -3340,7 +3340,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b

 #if !ENABLE_MINIMAL
 void ecb_cold
-rxvt_term::selection_remove_trailing_spaces () NOTHROW
+rxvt_term::selection_remove_trailing_spaces () noexcept
 {
   int32_t end_col, end_row;
   text_t *stp;
@@ -3388,7 +3388,7 @@ rxvt_term::selection_remove_trailing_spaces () NOTHROW
  * EXT: button 3 double click
  */
 void ecb_cold
-rxvt_term::selection_rotate (int x, int y) NOTHROW
+rxvt_term::selection_rotate (int x, int y) noexcept
 {
   selection.clicks = selection.clicks % 3 + 1;
   selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
@@ -3400,7 +3400,7 @@ rxvt_term::selection_rotate (int x, int y) NOTHROW
  * EXT: SelectionRequest
  */
 void ecb_cold
-rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
+rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
 {
   Atom property = rq.property == None ? rq.target : rq.property;
   XSelectionEvent ev;
@@ -3544,7 +3544,7 @@ rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
 /* ------------------------------------------------------------------------- */
 #if USE_XIM
 void ecb_cold
-rxvt_term::im_set_position (XPoint &pos) NOTHROW
+rxvt_term::im_set_position (XPoint &pos) noexcept
 {
   XWindowAttributes xwa;

@@ -3557,7 +3557,7 @@ rxvt_term::im_set_position (XPoint &pos) NOTHROW

 #if ENABLE_OVERLAY
 void
-rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
+rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
 {
   if (nrow < 1 || ncol < 1)
     return;
@@ -3612,7 +3612,7 @@ rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
 }

 void
-rxvt_term::scr_overlay_off () NOTHROW
+rxvt_term::scr_overlay_off () noexcept
 {
   if (!ov.text)
     return;
@@ -3630,7 +3630,7 @@ rxvt_term::scr_overlay_off () NOTHROW
 }

 void
-rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
+rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
 {
   if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
     return;
@@ -3642,14 +3642,14 @@ rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
 }

 void
-rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
+rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
 {
   while (*s)
     scr_overlay_set (x++, y, *s++);
 }

 void
-rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
+rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
 {
   while (*s)
     {
@@ -3665,7 +3665,7 @@ rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
 }

 void
-rxvt_term::scr_swap_overlay () NOTHROW
+rxvt_term::scr_swap_overlay () noexcept
 {
   if (!ov.text)
     return;

-----END OF PAGE-----