Mercurial > octave

changeset 23860:3c5a49805dbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get default pager from octave::build_env, not macro (bug #51718) * pager.cc (default_pager): Use octave::build_env::DEFAULT_PAGER, not the obsolete OCTAVE_DEFAULT_PAGER configuration macro.
author John W. Eaton <jwe@octave.org>
date Thu, 10 Aug 2017 09:55:35 -0400
parents 7148b237f94f
children 8f2d51b6235f
files libinterp/corefcn/pager.cc
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/pager.cc	Thu Jul 20 22:59:27 2017 +0200
+++ b/libinterp/corefcn/pager.cc	Thu Aug 10 09:55:35 2017 -0400
@@ -33,6 +33,7 @@
 #include "oct-syscalls.h"
 #include "singleton-cleanup.h"
 
+#include "build-env.h"
 #include "defaults.h"
 #include "defun.h"
 #include "error.h"
@@ -64,10 +65,8 @@
 {
   std::string pager_binary = octave::sys::env::getenv ("PAGER");
 
-#if defined (OCTAVE_DEFAULT_PAGER)
   if (pager_binary.empty ())
-    pager_binary = OCTAVE_DEFAULT_PAGER;
-#endif
+    pager_binary = octave::build_env::DEFAULT_PAGER;
 
   return pager_binary;
 }