From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 26 Jan 2005 03:48:01 +0000 (+0000)
Subject: Patched the previous patch.  Everything should be OK now both in the case
X-Git-Tag: v0.4.0~188
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ae02832bc0e093c2d21fe2534d9f90677803dd;p=pspp-builds.git

Patched the previous patch.  Everything should be OK now both in the case
where PAGER is set and where it is not.
---

diff --git a/doc/configuring.texi b/doc/configuring.texi
index ac7a518b..91d585cb 100644
--- a/doc/configuring.texi
+++ b/doc/configuring.texi
@@ -1643,6 +1643,7 @@ No default path.
 
 @item STAT_PAGER
 @itemx PAGER
+@cindex pager
 
 When PSPP invokes an external pager, it uses the first of these that
 is defined.  There is a default pager only if the person who compiled
diff --git a/doc/utilities.texi b/doc/utilities.texi
index c6300990..dfded5c2 100644
--- a/doc/utilities.texi
+++ b/doc/utilities.texi
@@ -498,9 +498,16 @@ subcommands are
 @itemx MORE
 @itemx PAGER 
 @itemx WIDTH
-Currently not used.
 @end table
 
+@cindex headers
+@cindex length
+@cindex listing
+@cindex more
+@cindex pager 
+@cindex width
+
+
 Logging subcommands affect logging of commands executed to external
 files.  These subcommands are
 
diff --git a/src/ChangeLog b/src/ChangeLog
index aeb5b76f..d94cc0d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 26 11:44:11 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+	* set.q: Affixed a fix to the previous fix such that we'll be OK now
+	whether or not PAGER is set.
+
 Wed Jan 26 09:25:54 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
 	* set.q: Copied the string produced by getenv("PAGER") thus avoiding
diff --git a/src/set.q b/src/set.q
index 89ce0383..620961b5 100644
--- a/src/set.q
+++ b/src/set.q
@@ -1106,8 +1106,16 @@ init_settings(void)
   {
     const char *pager = getenv ("STAT_PAGER");
 
-    if (!pager)  
-    	set_pager = xstrdup (getenv ("PAGER") );
+    if (!pager) 
+      {
+	const char *p = getenv ("PAGER");
+	
+	if ( p != NULL ) 
+	  set_pager = xstrdup (p);
+	else
+	  set_pager = 0;
+      }
+    
 
     if (pager)  
       set_pager = xstrdup (pager);