changeset 22617:51b7d8456ce3 stable

Ensure user inputrc file overrides Octave's default inputrc (bug #49323). * scripts/startup/version-rcfile: After reading Octave's default inputrc, read in user's INPUTRC.
author Rik <rik@octave.org>
date Wed, 12 Oct 2016 18:22:41 -0700
parents 96411a33f570
children 5fdfde2a873d 7adc5bbd840a
files scripts/startup/version-rcfile
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/startup/version-rcfile	Tue Oct 11 19:21:49 2016 -0400
+++ b/scripts/startup/version-rcfile	Wed Oct 12 18:22:41 2016 -0700
@@ -11,6 +11,16 @@
                                   __octave_config_info__ ("startupfiledir"),
                                   filesep, "inputrc"));
 
+## Re-read user's personal inputrc to give precedence over Octave's default.
+inputrc = getenv ("INPUTRC");
+if (isempty (inputrc) && exist ("~/.inputrc", "file"))
+  inputrc = "~/.inputrc";
+endif
+if (! isempty (inputrc))
+  readline_read_init_file (inputrc);
+endif
+clear ("inputrc");
+
 ## Configure LESS pager if present
 if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
   PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');