From 685068e8b985e2f66f2027ca204a1d040a180da7 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Wed, 13 Jul 2005 03:04:03 +0000
Subject: [PATCH] *** empty log message ***

---
 README.FAQ                   | 10 ++--------
 doc/etc/rxvt-unicode.termcap |  2 +-
 doc/rxvt.7.html              | 13 ++-----------
 doc/rxvt.7.man.in            | 14 +++-----------
 doc/rxvt.7.pod               | 10 ++--------
 doc/rxvt.7.txt               | 10 ++--------
 src/command.C                |  4 +++-
 7 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/README.FAQ b/README.FAQ
index a8ef3076..d4d7b5c0 100644
--- a/README.FAQ
+++ b/README.FAQ
@@ -533,14 +533,8 @@ FREQUENTLY ASKED QUESTIONS
            URxvt.color15:      #e1dddd
 
     How can I start rxvtd in a race-free way?
-        Despite it's name, rxvtd is not a real daemon, but more like a
-        server that answers rxvtc's requests, so it doesn't background
-        itself.
-
-        To ensure rxvtd is listening on it's socket, you can use the
-        following method to wait for the startup message before continuing:
-
-          { rxvtd & } | read
+        Try "rxvtd -f -o", which tells rxvtd to open the display, create the
+        listening socket and then fork.
 
     What's with the strange Backspace/Delete key behaviour?
         Assuming that the physical Backspace key corresponds to the
diff --git a/doc/etc/rxvt-unicode.termcap b/doc/etc/rxvt-unicode.termcap
index 4303a20b..bd689e35 100644
--- a/doc/etc/rxvt-unicode.termcap
+++ b/doc/etc/rxvt-unicode.termcap
@@ -1,4 +1,4 @@
-#	Reconstructed via infocmp from file: /etc/terminfo/r/rxvt-unicode
+#	Reconstructed via infocmp from file: /usr/share/terminfo/r/rxvt-unicode
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 rxvt-unicode|rxvt-unicode terminal (X Window System):\
 	:am:bw:eo:km:mi:ms:xn:xo:\
diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html
index d6b3434e..e120ced0 100644
--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -782,17 +782,8 @@ me) as ``pretty girly''.</p>
 <dt><strong><a name="item_how_can_i_start_rxvtd_in_a_race_2dfree_way_3f">How can I start rxvtd in a race-free way?</a></strong><br />
 </dt>
 <dd>
-Despite it's name, rxvtd is not a real daemon, but more like a
-server that answers rxvtc's requests, so it doesn't background
-itself.
-</dd>
-<dd>
-<p>To ensure rxvtd is listening on it's socket, you can use the
-following method to wait for the startup message before continuing:</p>
-</dd>
-<dd>
-<pre>
-  { rxvtd &amp; } | read</pre>
+Try <code>rxvtd -f -o</code>, which tells rxvtd to open the
+display, create the listening socket and then fork.
 </dd>
 <p></p>
 <dt><strong><a name="item_what_27s_with_the_strange_backspace_2fdelete_key_b">What's with the strange Backspace/Delete key behaviour?</a></strong><br />
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index 2181c6f6..2dc9e01c 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -728,16 +728,8 @@ me) as \*(L"pretty girly\*(R".
 .Ve
 .IP "How can I start @@RXVT_NAME@@d in a race-free way?" 4
 .IX Item "How can I start @@RXVT_NAME@@d in a race-free way?"
-Despite it's name, @@RXVT_NAME@@d is not a real daemon, but more like a
-server that answers @@RXVT_NAME@@c's requests, so it doesn't background
-itself.
-.Sp
-To ensure @@RXVT_NAME@@d is listening on it's socket, you can use the
-following method to wait for the startup message before continuing:
-.Sp
-.Vb 1
-\&  { @@RXVT_NAME@@d & } | read
-.Ve
+Try \f(CW\*(C`@@RXVT_NAME@@d \-f \-o\*(C'\fR, which tells @@RXVT_NAME@@d to open the
+display, create the listening socket and then fork.
 .IP "What's with the strange Backspace/Delete key behaviour?" 4
 .IX Item "What's with the strange Backspace/Delete key behaviour?"
 Assuming that the physical Backspace key corresponds to the
diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index bf370990..6fb6d1aa 100644
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -577,14 +577,8 @@ me) as "pretty girly".
 
 =item How can I start @@RXVT_NAME@@d in a race-free way?
 
-Despite it's name, @@RXVT_NAME@@d is not a real daemon, but more like a
-server that answers @@RXVT_NAME@@c's requests, so it doesn't background
-itself.
-
-To ensure @@RXVT_NAME@@d is listening on it's socket, you can use the
-following method to wait for the startup message before continuing:
-
-  { @@RXVT_NAME@@d & } | read
+Try C<@@RXVT_NAME@@d -f -o>, which tells @@RXVT_NAME@@d to open the
+display, create the listening socket and then fork.
 
 =item What's with the strange Backspace/Delete key behaviour?
 
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index 52585826..c493598f 100644
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -554,14 +554,8 @@ FREQUENTLY ASKED QUESTIONS
            URxvt.color15:      #e1dddd
 
     How can I start rxvtd in a race-free way?
-        Despite it's name, rxvtd is not a real daemon, but more like a
-        server that answers rxvtc's requests, so it doesn't background
-        itself.
-
-        To ensure rxvtd is listening on it's socket, you can use the
-        following method to wait for the startup message before continuing:
-
-          { rxvtd & } | read
+        Try "rxvtd -f -o", which tells rxvtd to open the display, create the
+        listening socket and then fork.
 
     What's with the strange Backspace/Delete key behaviour?
         Assuming that the physical Backspace key corresponds to the
diff --git a/src/command.C b/src/command.C
index 60c9f6e3..29c7ff9c 100644
--- a/src/command.C
+++ b/src/command.C
@@ -2659,7 +2659,9 @@ rxvt_term::cmd_parse ()
 
               if (ch == C0_LF || str >= eol)
                 {
-                  nlines++;
+                  if (ch == C0_LF)
+                    nlines++;
+
                   refresh_count++;
 
                   if (!(options & Opt_jumpScroll)
-- 
2.34.1