*** empty log message ***

diff --git a/doc/rxvtc.1.pod b/doc/rxvtc.1.pod
index f0ead4c368fbf27a3e2c9d379d5f4c80da0138be..871efaf4e6e70a67c21bfef37a42b59040fdda6b 100644 (file)
--- a/doc/rxvtc.1.pod
+++ b/doc/rxvtc.1.pod
@@ -32,9 +32,10 @@ started directly.
 =item B<RXVT_SOCKET>
 
 Both @@RXVT_NAME@@c and @@RXVT_NAME@@d use the environment variable
-F<RXVT_SOCKET> to create a listening socket and to contact
-the @@RXVT_NAME@@d, respectively. If the variable is missing,
-F<<< $HOME/.rxvt-unicode-I<< <nodename> >> >>> is used.
+F<RXVT_SOCKET> to create a listening socket and to contact the
+@@RXVT_NAME@@d, respectively. If the variable is missing,
+F<<< $HOME/.rxvt-unicode-I<< <nodename> >> >>> is used.  The variable must
+specify the absolute path of the socket to create.
 
 =back
 

diff --git a/doc/rxvtd.1.pod b/doc/rxvtd.1.pod
index a66a0996e051b345a8b36c864a668a45a047a063..4d63037e3d3893ba2293b2484ed963906f8e442d 100644 (file)
--- a/doc/rxvtd.1.pod
+++ b/doc/rxvtd.1.pod
@@ -71,10 +71,11 @@ B<@@RXVT_NAME@@d> is killed.
 
 =item B<RXVT_SOCKET>
 
-Both B<@@RXVT_NAME@@c> and B<@@RXVT_NAME@@d> use the environment variable
-F<RXVT_SOCKET> to create a listening socket and to contact
+Both B<@@RXVT_NAME@@c> and B<@@RXVT_NAME@@d> use the environment
+variable F<RXVT_SOCKET> to create a listening socket and to contact
 the @@RXVT_NAME@@d, respectively. If the variable is missing,
-F<<< $HOME/.rxvt-unicode-I<< <nodename> >> >>> is used.
+F<<< $HOME/.rxvt-unicode-I<< <nodename> >> >>> is used. The variable must
+specify the absolute path of the socket to create.
 
 =item B<DISPLAY>
 

diff --git a/reconf b/reconf
index 95f85a74e6d4aaaef91d5c969695251f1b2e3c11..fb5bed9f37cb332fc7d3a024f6d4a46ad9376304 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -5,8 +5,8 @@
 
 # just set some compiler options
 if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then
-   CC=ccache\ gcc-3.4
-   CXX=ccache\ g++-3.4
+   CC=ccache\ gcc-4.0
+   CXX=ccache\ g++-4.0
    export CC CXX
 fi
 

diff --git a/src/keyboard.C b/src/keyboard.C
index 2e58f572c3ac73cbe1305ef0235c94f8594f9f8e..6b84897d9402c30af77a17c4da23a9d184572469 100644 (file)
--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -117,7 +117,7 @@ format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsi
 ////////////////////////////////////////////////////////////////////////////////
 // return: #bits of '1'
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
+# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
 #else
 static int
 bitcount (uint16_t n)

diff --git a/src/main.C b/src/main.C
index 0e2ef6bb6dfe41cb81e48cecdda54e92fe2a0991..6d1af2842df587d2667bf6860e17534afaeaf53d 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -849,7 +849,7 @@ rxvt_term::tt_winch ()
 
 /*----------------------------------------------------------------------*/
 /* set_fonts () - load and set the various fonts
-/*
+ *
  * init = 1   - initialize
  *
  * fontname == FONT_UP  - switch to bigger font
@@ -1553,7 +1553,7 @@ foundpet:
 void
 rxvt_term::im_cb ()
 {
-  int i, found, had_im;
+  int i;
   const char *p;
   char **s;
   char buf[IMBUFSIZ];

diff --git a/src/rxvtc.C b/src/rxvtc.C
index f4db4d1b27681963f60280db7b780f5cc3c6cdb2..ff9dbd0ed15ef0a52faf2e7cb8d0f46c709d98e2 100644 (file)
--- a/src/rxvtc.C
+++ b/src/rxvtc.C
@@ -86,8 +86,8 @@ main (int argc, const char *const *argv)
 
   c.send ("CWD"), c.send (cwd);
 
-  for (char **var = environ; *environ; environ++)
-    c.send ("ENV"), c.send (*environ);
+  for (char **var = environ; *var; var++)
+    c.send ("ENV"), c.send (*var);
 
   const char *base = strrchr (argv[0], '/');
   base = base ? base + 1 : argv[0];

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index c449943ba47f8c5885a892c70f4755d2112c1c19..52d334d4ee97f7056d040191ab186e4b5d237de2 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -1314,7 +1314,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
 /////////////////////////////////////////////////////////////////////////////
 
 rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r), fontdesc (0)
+: fontdesc (0), r (r)
 {
   clear ();
 }

diff --git a/src/rxvtfont.h b/src/rxvtfont.h
index 82ee176a57e5b7dc06c9df6fe43a97668296f100..8b8ef86d80209bae26a7ce3c7c72b0d4b4964757 100644 (file)
--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -40,11 +40,11 @@ struct rxvt_fontprop {
 
 struct rxvt_drawable {
   rxvt_display *display;
-  Drawable drawable;
 #if XFT
   XftDraw *xftdrawable;
   operator XftDraw *();
 #endif
+  Drawable drawable;
 
   rxvt_drawable (rxvt_display *display, Drawable drawable)
   : display(display),

diff --git a/src/rxvtutil.h b/src/rxvtutil.h
index 42ea3b65fcc42c86b0a133d0b23d4828656aef8b..e4f89bb759b21d2fe5006a268c8585e9dd539759 100644 (file)
--- a/src/rxvtutil.h
+++ b/src/rxvtutil.h
@@ -15,9 +15,9 @@ public:
 } byteorder;
 
 template<typename T, typename U>
-static inline T min (T a, U b) { return a < b ? a : (T)b; }
+static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
 template<typename T, typename U>
-static inline T max (T a, U b) { return a > b ? a : (T)b; }
+static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
 template<typename T>
 static inline void swap (T& a, T& b) { T t=a; a=b; b=t; }
 

diff --git a/src/screen.C b/src/screen.C
index c80f47be6e2e098d23bdfc3d5c9f8ce42c8c1825..877a4a44848b3d1fe536b761830ea89845825c70 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -443,7 +443,6 @@ void
 rxvt_term::scr_release ()
 {
   unsigned int total_rows;
-  int i;
 
   total_rows = TermWin.nrow + TermWin.saveLines;
 
@@ -780,7 +779,7 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
   unsigned char checksel;
   unicode_t c;
-  int i, row, last_col;
+  int row, last_col;
   text_t *stp;
   rend_t *srp;
   const unicode_t *strend = str + len;
@@ -2163,9 +2162,6 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
   scr_swap_overlay ();
 #endif
 
-  rend_t *drp, *srp;  /* drawn-rend-pointer, screen-rend-pointer   */
-  text_t *dtp, *stp;  /* drawn-text-pointer, screen-text-pointer   */
-
 #ifndef NO_SLOW_LINK_SUPPORT
   /*
    * D: CopyArea pass - very useful for slower links

diff --git a/src/xdefaults.C b/src/xdefaults.C
index ec3cf416d2d9f15f7b6243124690b17dc3d6c2e0..ab0e76d20e7e5346758fce38df160158507b2341 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -909,7 +909,6 @@ rxvt_term::extract_resources ()
   int entry;
 
 #  ifdef XrmEnumOneLevel
-  int i;
   char *displayResource, *xe;
   XrmName name_prefix[3];
   XrmClass class_prefix[3];