From 01f905ede0416eaa3168bcf0694cb427877b8a2d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Nov 2007 13:11:31 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 1 + doc/rxvt.1.html | 17 +++++++++++++++-- doc/rxvt.1.man.in | 17 +++++++++++++++-- doc/rxvt.1.txt | 16 +++++++++++++++- src/version.h | 4 ++-- 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/Changes b/Changes index 15d4bfb8..e2c87381 100644 --- a/Changes +++ b/Changes @@ -17,6 +17,7 @@ WISH: load system-wide config file even if we don't have one WISH: look into XAddConnectionWatch, does anybody need that? DUMB: support tex fonts +8.6 Fri Nov 23 14:10:57 CET 2007 - upgrade libev to disable kqueue on anything but netbsd as it seems to be broken everywhere else w.r.t. ptys. - allow for spurious event notifications, as at least epoll and diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index c64e4c60..5f65dd5c 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -6,7 +6,7 @@ - + @@ -52,7 +52,7 @@

DESCRIPTION

Top

-

rxvt-unicode, version 8.4, is a colour vt102 terminal +

rxvt-unicode, version 8.6, is a colour vt102 terminal emulator intended as an xterm(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability. As a result, rxvt-unicode uses much less swap space -- @@ -486,6 +486,18 @@ info.

will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user; resource hold.

+ +
-xrm string
+
+

Works like the X Toolkit option of the same name, by adding the string +as if it were specified in a resource file. Resource values specified this +way take precedence over all other resource specifications.

+

Note that you need to use the same syntax as in the .Xdefaults file, +e.g. *.background: black. Also note that all rxvt-specific +options can be specified as long-options on the commandline, so use +of -xrm is mostly limited to cases where you want to specify other +resources (e.g. for input methods) or for compatibility with other +programs.

-keysym.sym string
@@ -563,6 +575,7 @@ with later settings overwriting earlier ones:

3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults 4. SCREEN_RESOURCES for the current screen 5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename> + 6. resources specified via -xrm on the commandline

Note that when reading X resources, rxvt recognizes two class diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index bb0af6ca..1cdb0d72 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "@@RXVT_NAME@@ 1" -.TH @@RXVT_NAME@@ 1 "2007-11-19" "8.4" "RXVT-UNICODE" +.TH @@RXVT_NAME@@ 1 "2007-11-23" "8.6" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -519,6 +519,18 @@ Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@ will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user; resource \fBhold\fR. +.IP "\fB\-xrm\fR \fIstring\fR" 4 +.IX Item "-xrm string" +Works like the X Toolkit option of the same name, by adding the \fIstring\fR +as if it were specified in a resource file. Resource values specified this +way take precedence over all other resource specifications. +.Sp +Note that you need to use the \fIsame\fR syntax as in the .Xdefaults file, +e.g. \f(CW\*(C`*.background: black\*(C'\fR. Also note that all @@RXVT_NAME@@\-specific +options can be specified as long-options on the commandline, so use +of \fB\-xrm\fR is mostly limited to cases where you want to specify other +resources (e.g. for input methods) or for compatibility with other +programs. .IP "\fB\-keysym.\fR\fIsym\fR \fIstring\fR" 4 .IX Item "-keysym.sym string" Remap a key symbol. See resource \fBkeysym\fR. @@ -598,12 +610,13 @@ distribution do also load settings from the \fB~/.Xresources\fR file when X starts. @@RXVT_NAME@@ will consult the following files/resources in order, with later settings overwriting earlier ones: .PP -.Vb 5 +.Vb 6 \& 1. system-wide app-defaults file, either locale-dependent OR global \& 2. app-defaults file in $XAPPLRESDIR \& 3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults \& 4. SCREEN_RESOURCES for the current screen \& 5. $XENVIRONMENT file OR $HOME/.Xdefaults- +\& 6. resources specified via -xrm on the commandline .Ve .PP Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two class diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index 07643c72..0f375833 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -6,7 +6,7 @@ SYNOPSIS rxvt [options] [-e command [ args ]] DESCRIPTION - rxvt-unicode, version 8.4, is a colour vt102 terminal emulator intended + rxvt-unicode, version 8.6, is a colour vt102 terminal emulator intended as an *xterm*(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability. As a result, rxvt-unicode uses much less swap space -- a significant @@ -387,6 +387,19 @@ OPTIONS it exits. Instead, it will wait till it is being killed or closed by the user; resource hold. + -xrm *string* + Works like the X Toolkit option of the same name, by adding the + *string* as if it were specified in a resource file. Resource values + specified this way take precedence over all other resource + specifications. + + Note that you need to use the *same* syntax as in the .Xdefaults + file, e.g. "*.background: black". Also note that all rxvt-specific + options can be specified as long-options on the commandline, so use + of -xrm is mostly limited to cases where you want to specify other + resources (e.g. for input methods) or for compatibility with other + programs. + -keysym.*sym* *string* Remap a key symbol. See resource keysym. @@ -462,6 +475,7 @@ RESOURCES (available also as long-options) 3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults 4. SCREEN_RESOURCES for the current screen 5. $XENVIRONMENT file OR $HOME/.Xdefaults- + 6. resources specified via -xrm on the commandline Note that when reading X resources, rxvt recognizes two class names: Rxvt and URxvt. The class name Rxvt allows resources common to both rxvt diff --git a/src/version.h b/src/version.h index baf4030e..83621570 100644 --- a/src/version.h +++ b/src/version.h @@ -1,3 +1,3 @@ // VERSION _must_ be \d.\d+ -#define VERSION "8.5" -#define DATE "2007-11-21" +#define VERSION "8.6" +#define DATE "2007-11-23" -- 2.34.1