--- rxvt-unicode/src/rxvt.h	2003/12/17 09:00:35	1.12
+++ rxvt-unicode/src/rxvt.h	2003/12/18 02:07:12	1.15
@@ -1,5 +1,5 @@
 /*
- * $Id: rxvt.h,v 1.12 2003/12/17 09:00:35 pcg Exp $
+ * $Id: rxvt.h,v 1.15 2003/12/18 02:07:12 pcg Exp $
  */
 
 #ifndef _RXVT_H_                /* include once only */
@@ -483,9 +483,6 @@
 #if (MENUBAR_MAX)
   Rs_menu,
 #endif
-#ifndef NO_BOLDFONT
-  Rs_boldFont,
-#endif
 #ifdef GREEK_SUPPORT
   Rs_greek_keyboard,
   Rs_greektoggle_key,
@@ -554,6 +551,7 @@
   Rs_cursorBlink,
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
+  Rs_imLocale,
   NUM_RESOURCES
 };
 
@@ -771,8 +769,8 @@
 # define rxvt_get_fontwidest(font)      ((font)->max_bounds.width)
 #endif
 
-#define rxvt_Gr_ButtonPress(x,y)        rxvt_Gr_ButtonReport (r, 'P',(x),(y))
-#define rxvt_Gr_ButtonRelease(x,y)      rxvt_Gr_ButtonReport (r, 'R',(x),(y))
+#define rxvt_Gr_ButtonPress(x,y)        rxvt_Gr_ButtonReport (R, 'P',(x),(y))
+#define rxvt_Gr_ButtonRelease(x,y)      rxvt_Gr_ButtonReport (R, 'R',(x),(y))
 
 #ifdef UTMP_SUPPORT
 # if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)