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 ac7a518be0639db9bb7b84e0b13fed969f0b302b..91d585cbc06784869910e96a8ea6e5bf7a097974 100644 (file)
--- 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 c63009907e81d6eca16a5e679e6ef9ccdc6725e2..dfded5c23fb5a72193c084671da007bd0674578d 100644 (file)
--- 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 aeb5b76f50ff5dca37d60f01076b78e84921c638..d94cc0d98b9503b14c54ab1405802849d4557ee3 100644 (file)
--- 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 89ce0383c665ccffb47f6c01587f2307b10c9f57..620961b59ca46415e50647625aa76feed43ca0b5 100644 (file)
--- 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);