--- rxvt-unicode/src/rxvt.h	2011/04/07 12:19:41	1.439
+++ rxvt-unicode/src/rxvt.h	2011/05/30 18:39:03	1.443
@@ -129,10 +129,6 @@
 # define EXIT_FAILURE           1       /* exit function failure */
 #endif
 
-#ifndef PATH_MAX
-# define PATH_MAX 16384
-#endif
-
 /****************************************************************************/
 
 // exception thrown on fatal (per-instance) errors
@@ -163,8 +159,8 @@
 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;
-void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
-void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
+void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
+void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) ecb_noreturn;
 
 char           * rxvt_strtrim                     (char *str) NOTHROW;
 char          ** rxvt_strsplit                    (char delim, const char *str) NOTHROW;
@@ -310,33 +306,28 @@
 # define NSCREENS               1
 #endif
 
-/* special (internal) prefix for font commands */
-#define FONT_CMD                '#'
-#define FONT_DN                 "#-"
-#define FONT_UP                 "#+"
-
-/* flags for rxvt_scr_gotorc () */
+/* flags for rxvt_term::scr_gotorc () */
 enum {
   C_RELATIVE = 1,       /* col movement is relative */
   R_RELATIVE = 2,       /* row movement is relative */
   RELATIVE   = C_RELATIVE | R_RELATIVE,
 };
 
-/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
+/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
 enum {
   INSERT = -1,				/* don't change these values */
   DELETE = +1,
   ERASE  = +2,
 };
 
-/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
+/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
 enum page_dirn {
   UP,
   DN,
   NO_DIR,
 };
 
-/* arguments for rxvt_scr_change_screen () */
+/* arguments for rxvt_term::scr_change_screen () */
 enum {
   PRIMARY = 0,
   SECONDARY,
@@ -678,7 +669,7 @@
 // return attributes defining the background, encoding doesn't matter
 // depends on RS_fgShift > RS_bgShift
 #define GET_BGATTR(x)                                      \
-  (expect_false ((x) & RS_RVid)                            \
+  (ecb_unlikely ((x) & RS_RVid)                            \
     ? (((x) & (RS_attrMask & ~RS_RVid))                    \
       | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
     : ((x) & (RS_attrMask | RS_bgMask)))