From: root <root>
Date: Fri, 13 Jan 2006 07:03:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9a57adca89ef9537edfd2afb49e612ff60c4923a;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/fdpass.C b/src/fdpass.C
index 99cd3d8b..69cb0ad0 100644
--- a/src/fdpass.C
+++ b/src/fdpass.C
@@ -20,7 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
+#include "../config.h"
+#include "rxvt.h"
 
 #if ENABLE_FRILLS && HAVE_UNIX_FDPASS
 
diff --git a/src/fdpass.h b/src/fdpass.h
index 6b02c570..2c3c3905 100644
--- a/src/fdpass.h
+++ b/src/fdpass.h
@@ -20,7 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
+#include "../config.h"
+#include "rxvt.h"
 
 #if ENABLE_FRILLS && HAVE_UNIX_FDPASS
 
diff --git a/src/logging.C b/src/logging.C
index ca280b4e..6950f647 100644
--- a/src/logging.C
+++ b/src/logging.C
@@ -39,9 +39,10 @@
  *	rxvt_update_wtmp ();
  *----------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
-#include "rxvt.h"		/* NECESSARY */
+#include "../config.h"
+#include "rxvt.h"
 #include "logging.h"
+
 #ifdef UTMP_SUPPORT
 
 #if HAVE_STRUCT_UTMP
diff --git a/src/rxvt.h b/src/rxvt.h
index 37392ad0..4faded65 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -5,6 +5,21 @@
 
 #include "feature.h"
 
+#if defined (ISO_14755) || defined (ENABLE_PERL)
+# define ENABLE_OVERLAY 1
+#endif
+
+#if ENABLE_PERL
+# define ENABLE_FRILLS 1
+# define ENABLE_COMBINING 1
+#endif
+
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+# define ENABLE_EWMH   1
+# define CURSOR_BLINK  1
+#endif
+
 #include <limits.h>
 
 #include <X11/cursorfont.h>
@@ -23,20 +38,6 @@
 
 #include "rxvtperl.h"
 
-#if defined (ISO_14755) || defined (ENABLE_PERL)
-# define ENABLE_OVERLAY 1
-#endif
-
-#if ENABLE_PERL
-# define ENABLE_FRILLS
-#endif
-
-#if ENABLE_FRILLS
-# define ENABLE_XEMBED 1
-# define ENABLE_EWMH   1
-# define CURSOR_BLINK  1
-#endif
-
 /*
  *****************************************************************************
  * SYSTEM HACKS
diff --git a/src/urxvt.pm b/src/urxvt.pm
index e8f046c0..054f9029 100644
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -122,12 +122,12 @@ For example, the following will transform selections of the form
 C<filename:number>, often seen in compiler messages, into C<vi +$filename
 $word>:
 
-   URxvt.selection-autotransform.0: s/^(\\S+):(\\d+):?$/vi +$2 \\Q$1\\E\\x0d/
+   URxvt.selection-autotransform.0: s/^([^:[:space:]]+):(\\d+):?$/vi +$2 \\Q$1\\E\\x0d/
 
 And this example matches the same,but replaces it with vi-commands you can
 paste directly into your (vi :) editor:
 
-   URxvt.selection-autotransform.0: s/^(S+):(d+):?$/\\x1b:e \\Q$1\\E\\x0d:$2\\x0d/
+   URxvt.selection-autotransform.0: s/^([^:[:space:]]+(\\d+):?$/\\x1b:e \\Q$1\\E\\x0d:$2\\x0d/
 
 Of course, this can be modified to suit your needs and your editor :)