Mercurial > octave-nkf
annotate libinterp/interpfcn/oct-hist.cc @ 16685:5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
* libinterp/interpfcn/oct-hist.cc (do_history): Added usgage of default history file name if name not provided.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 18 May 2013 19:11:18 -0400 |
parents | 5982d469f79b |
children | f4d18d3f7fd7 |
rev | line source |
---|---|
1 | 1 /* |
2 | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13951
diff
changeset
|
3 Copyright (C) 1993-2012 John W. Eaton |
1 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
1 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
1 | 20 |
2939 | 21 */ |
22 | |
23 /* | |
24 | |
1 | 25 The functions listed below were adapted from similar functions from |
26 GNU Bash, the Bourne Again SHell, copyright (C) 1987, 1989, 1991 Free | |
27 Software Foundation, Inc. | |
28 | |
29 do_history edit_history_readline | |
30 do_edit_history edit_history_add_hist | |
31 | |
32 */ | |
33 | |
240 | 34 #ifdef HAVE_CONFIG_H |
1192 | 35 #include <config.h> |
1 | 36 #endif |
37 | |
1343 | 38 #include <cstdlib> |
39 #include <cstring> | |
40 | |
1750 | 41 #include <string> |
42 | |
3503 | 43 #include <fstream> |
1350 | 44 |
1 | 45 #include <sys/types.h> |
46 #include <unistd.h> | |
1350 | 47 |
1799 | 48 #include "cmd-hist.h" |
1802 | 49 #include "file-ops.h" |
3016 | 50 #include "lo-mappers.h" |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
51 #include "octave-link.h" |
2926 | 52 #include "oct-env.h" |
5305 | 53 #include "oct-time.h" |
1755 | 54 #include "str-vec.h" |
55 | |
2492 | 56 #include <defaults.h> |
1352 | 57 #include "defun.h" |
1 | 58 #include "error.h" |
3016 | 59 #include "gripes.h" |
1 | 60 #include "input.h" |
1742 | 61 #include "oct-hist.h" |
1750 | 62 #include "oct-obj.h" |
1352 | 63 #include "pager.h" |
3018 | 64 #include "parse.h" |
1352 | 65 #include "sighandlers.h" |
1690 | 66 #include "sysdep.h" |
1750 | 67 #include "toplev.h" |
1352 | 68 #include "unwind-prot.h" |
69 #include "utils.h" | |
2205 | 70 #include "variables.h" |
1 | 71 |
3018 | 72 // TRUE means input is coming from temporary history file. |
73 bool input_from_tmp_history_file = false; | |
168 | 74 |
5305 | 75 static std::string |
1 | 76 default_history_file (void) |
77 { | |
3523 | 78 std::string file; |
1 | 79 |
3523 | 80 std::string env_file = octave_env::getenv ("OCTAVE_HISTFILE"); |
1755 | 81 |
2926 | 82 if (! env_file.empty ()) |
6141 | 83 file = env_file; |
1 | 84 |
1755 | 85 if (file.empty ()) |
7272 | 86 file = file_ops::concat (octave_env::get_home_directory (), |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
87 ".octave_hist"); |
1 | 88 |
89 return file; | |
90 } | |
91 | |
5305 | 92 static int |
93 default_history_size (void) | |
94 { | |
16025
a78c1e445cfc
Change default history size to 1000.
Rik <rik@octave.org>
parents:
16022
diff
changeset
|
95 int size = 1000; |
5305 | 96 |
97 std::string env_size = octave_env::getenv ("OCTAVE_HISTSIZE"); | |
98 | |
99 if (! env_size.empty ()) | |
100 { | |
101 int val; | |
102 | |
103 if (sscanf (env_size.c_str (), "%d", &val) == 1) | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
104 size = val > 0 ? val : 0; |
5305 | 105 } |
106 | |
107 return size; | |
108 } | |
109 | |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
110 static std::string |
5305 | 111 default_history_timestamp_format (void) |
112 { | |
113 return | |
114 std::string ("# Octave " OCTAVE_VERSION ", %a %b %d %H:%M:%S %Y %Z <") | |
115 + octave_env::get_user_name () | |
116 + std::string ("@") | |
117 + octave_env::get_host_name () | |
118 + std::string (">"); | |
119 } | |
120 | |
5794 | 121 // The format of the timestamp marker written to the history file when |
122 // Octave exits. | |
123 static std::string Vhistory_timestamp_format_string | |
124 = default_history_timestamp_format (); | |
125 | |
581 | 126 // Display, save, or load history. Stolen and modified from bash. |
127 // | |
128 // Arg of -w FILENAME means write file, arg of -r FILENAME | |
129 // means read file, arg of -q means don't number lines. Arg of N | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
130 // means only display that many items. |
581 | 131 |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
132 static string_vector |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
133 do_history (const octave_value_list& args, int nargout) |
1 | 134 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
135 bool numbered_output = nargout == 0; |
1 | 136 |
12990
07dc4839c05f
properly save and restore command history file name in history command (bug #32524)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
137 unwind_protect frame; |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
138 |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
139 string_vector hlist; |
12990
07dc4839c05f
properly save and restore command history file name in history command (bug #32524)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
140 |
07dc4839c05f
properly save and restore command history file name in history command (bug #32524)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
141 frame.add_fcn (command_history::set_file, command_history::file ()); |
07dc4839c05f
properly save and restore command history file name in history command (bug #32524)
John W. Eaton <jwe@octave.org>
parents:
12989
diff
changeset
|
142 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
143 int nargin = args.length (); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
144 |
16242
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
145 // Number of history lines to show (-1 = all) |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
146 int limit = -1; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
147 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
148 for (octave_idx_type i = 0; i < nargin; i++) |
1 | 149 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
150 octave_value arg = args(i); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
151 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
152 std::string option; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
153 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
154 if (arg.is_string ()) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
155 option = arg.string_value (); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
156 else if (arg.is_numeric_type ()) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
157 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
158 limit = arg.int_value (); |
16242
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
159 if (limit < 0) |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
160 limit = -limit; |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
161 continue; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
162 } |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
163 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
164 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
165 gripe_wrong_type_arg ("history", arg); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
166 return hlist; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
167 } |
2435 | 168 |
169 if (option == "-r" || option == "-w" || option == "-a" | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
170 || option == "-n") |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
171 { |
16685
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
172 if (i < nargin - 1) |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
173 { |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
174 if (args(i+1).is_string ()) |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
175 command_history::set_file (args(++i).string_value ()); |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
176 else |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
177 { |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
178 error ("history: expecting file name for %s option", |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
179 option.c_str ()); |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
180 return hlist; |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
181 } |
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
182 } |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
183 else |
16685
5c5c46a81ad5
Added default name usage for history -r,-w option (Bug #38986)
John Donoghue <john.donoghue@ieee.org>
parents:
16431
diff
changeset
|
184 command_history::set_file ( default_history_file ()); |
1 | 185 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
186 if (option == "-a") |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
187 // Append 'new' lines to file. |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
188 command_history::append (); |
2435 | 189 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
190 else if (option == "-w") |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
191 // Write entire history. |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
192 command_history::write (); |
777 | 193 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
194 else if (option == "-r") |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
195 { |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
196 // Read entire file. |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
197 command_history::read (); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
198 octave_link::set_history (command_history::list ()); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
199 } |
777 | 200 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
201 else if (option == "-n") |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
202 { |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
203 // Read 'new' history from file. |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
204 command_history::read_range (); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
205 octave_link::set_history (command_history::list ()); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
206 } |
777 | 207 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
208 else |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
209 panic_impossible (); |
2435 | 210 |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
211 return hlist; |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
212 } |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
213 else if (option == "-c") |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
214 { |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
215 command_history::clear (); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
216 octave_link::clear_history (); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
217 } |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
218 else if (option == "-q") |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
219 numbered_output = false; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
220 else if (option == "--") |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
221 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
222 i++; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
223 break; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
224 } |
1 | 225 else |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
226 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
227 // The last argument found in the command list that looks like |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
228 // an integer will be used |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
229 int tmp; |
1 | 230 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
231 if (sscanf (option.c_str (), "%d", &tmp) == 1) |
16242
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
232 { |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
233 if (tmp > 0) |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
234 limit = tmp; |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
235 else |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
236 limit = -tmp; |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
237 } |
2a81ce01c383
Fix history() so that it shows all commands when called with no arguments.
Rik <rik@octave.org>
parents:
16196
diff
changeset
|
238 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
239 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
240 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
241 if (option.length () > 0 && option[0] == '-') |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
242 error ("history: unrecognized option '%s'", option.c_str ()); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
243 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
244 error ("history: bad non-numeric arg '%s'", option.c_str ()); |
1799 | 245 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
246 return hlist; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
247 } |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
248 } |
15817
dbb7896f15c7
Fix argument passing to history() command
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15814
diff
changeset
|
249 } |
1 | 250 |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
251 hlist = command_history::list (limit, numbered_output); |
1 | 252 |
1799 | 253 int len = hlist.length (); |
254 | |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
255 if (nargout == 0) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
256 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
257 for (octave_idx_type i = 0; i < len; i++) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
258 octave_stdout << hlist[i] << "\n"; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
259 } |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
260 |
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
261 return hlist; |
1 | 262 } |
263 | |
581 | 264 // Read the edited history lines from STREAM and return them |
265 // one at a time. This can read unlimited length lines. The | |
2434 | 266 // caller should free the storage. |
581 | 267 |
1 | 268 static char * |
3551 | 269 edit_history_readline (std::fstream& stream) |
1 | 270 { |
271 char c; | |
272 int line_len = 128; | |
273 int lindex = 0; | |
274 char *line = new char [line_len]; | |
275 line[0] = '\0'; | |
276 | |
277 while (stream.get (c)) | |
278 { | |
279 if (lindex + 2 >= line_len) | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
280 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
281 char *tmp_line = new char [line_len += 128]; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
282 strcpy (tmp_line, line); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
283 delete [] line; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
284 line = tmp_line; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
285 } |
1 | 286 |
287 if (c == '\n') | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
288 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
289 line[lindex++] = '\n'; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
290 line[lindex++] = '\0'; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
291 return line; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
292 } |
1 | 293 else |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
294 line[lindex++] = c; |
1 | 295 } |
296 | |
297 if (! lindex) | |
298 { | |
299 delete [] line; | |
529 | 300 return 0; |
1 | 301 } |
302 | |
303 if (lindex + 2 >= line_len) | |
304 { | |
305 char *tmp_line = new char [lindex+3]; | |
306 strcpy (tmp_line, line); | |
307 delete [] line; | |
308 line = tmp_line; | |
309 } | |
310 | |
1358 | 311 // Finish with newline if none in file. |
1 | 312 |
313 line[lindex++] = '\n'; | |
314 line[lindex++] = '\0'; | |
315 return line; | |
316 } | |
317 | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
318 // Use 'command' to replace the last entry in the history list, which, |
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
319 // by this time, is 'run_history blah...'. The intent is that the |
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
320 // new command becomes the history entry, and that 'fc' should never |
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
321 // appear in the history list. This way you can do 'run_history' to |
581 | 322 // your heart's content. |
323 | |
16196
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
324 // FIXME: Don't delete this block of code until memory |
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
325 // leak in edit_history has been plugged and |
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
326 // it is clear that this code can be removed. |
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
327 // See additional FIXME in do_edit_history. |
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
328 /* |
64 | 329 static void |
3523 | 330 edit_history_repl_hist (const std::string& command) |
64 | 331 { |
1799 | 332 if (! command.empty ()) |
333 { | |
2926 | 334 string_vector hlist = command_history::list (); |
64 | 335 |
1799 | 336 int len = hlist.length (); |
64 | 337 |
1799 | 338 if (len > 0) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
339 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
340 int i = len - 1; |
64 | 341 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
342 std::string histent = command_history::get_entry (i); |
64 | 343 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
344 if (! histent.empty ()) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
345 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
346 std::string cmd = command; |
64 | 347 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
348 int cmd_len = cmd.length (); |
64 | 349 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
350 if (cmd[cmd_len - 1] == '\n') |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
351 cmd.resize (cmd_len - 1); |
64 | 352 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
353 if (! cmd.empty ()) |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
354 command_history::replace_entry (i, cmd); |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
355 } |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
356 } |
64 | 357 } |
358 } | |
16196
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
359 */ |
64 | 360 |
1 | 361 static void |
3523 | 362 edit_history_add_hist (const std::string& line) |
1 | 363 { |
1799 | 364 if (! line.empty ()) |
1 | 365 { |
3523 | 366 std::string tmp = line; |
1 | 367 |
1799 | 368 int len = tmp.length (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
369 |
1799 | 370 if (len > 0 && tmp[len-1] == '\n') |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
371 tmp.resize (len - 1); |
1799 | 372 |
373 if (! tmp.empty ()) | |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
374 { |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
375 command_history::add (tmp); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
376 octave_link::append_history (tmp); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
377 } |
1 | 378 } |
379 } | |
380 | |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
381 static bool |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
382 get_int_arg (const octave_value& arg, int& val) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
383 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
384 bool ok = true; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
385 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
386 if (arg.is_string ()) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
387 { |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
388 std::string tmp = arg.string_value (); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
389 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
390 ok = sscanf (tmp.c_str (), "%d", &val) == 1; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
391 } |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
392 else if (arg.is_numeric_type ()) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
393 val = arg.int_value (); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
394 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
395 ok = false; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
396 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
397 return ok; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
398 } |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
399 |
3536 | 400 static std::string |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
401 mk_tmp_hist_file (const octave_value_list& args, |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
402 bool insert_curr, const char *warn_for) |
1 | 403 { |
3523 | 404 std::string retval; |
1 | 405 |
2926 | 406 string_vector hlist = command_history::list (); |
1 | 407 |
16022
d8f216d241cf
Fix off-by-1 error in run_history when called with no arguments.
Rik <rik@octave.org>
parents:
16016
diff
changeset
|
408 int hist_count = hlist.length () - 1; // switch to zero-based indexing |
1 | 409 |
1358 | 410 // The current command line is already part of the history list by |
16051
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
411 // the time we get to this point. Delete the cmd from the list when |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
412 // executing 'edit_history' so that it doesn't show up in the history |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
413 // but the actual commands performed will. |
1 | 414 |
64 | 415 if (! insert_curr) |
2926 | 416 command_history::remove (hist_count); |
1799 | 417 |
16022
d8f216d241cf
Fix off-by-1 error in run_history when called with no arguments.
Rik <rik@octave.org>
parents:
16016
diff
changeset
|
418 hist_count--; // skip last entry in history list |
1 | 419 |
1358 | 420 // If no numbers have been specified, the default is to edit the |
421 // last command in the history list. | |
1 | 422 |
16022
d8f216d241cf
Fix off-by-1 error in run_history when called with no arguments.
Rik <rik@octave.org>
parents:
16016
diff
changeset
|
423 int hist_beg = hist_count; |
1 | 424 int hist_end = hist_count; |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
425 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
426 bool reverse = false; |
1 | 427 |
1358 | 428 // Process options. |
1 | 429 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
430 int nargin = args.length (); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
431 |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
432 bool usage_error = false; |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
433 if (nargin == 2) |
1 | 434 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
435 if (get_int_arg (args(0), hist_beg) |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
436 && get_int_arg (args(1), hist_end)) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
437 { |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
438 if (hist_beg < 0) |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
439 hist_beg += (hist_count + 1); |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
440 else |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
441 hist_beg--; |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
442 if (hist_end < 0) |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
443 hist_end += (hist_count + 1); |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
444 else |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
445 hist_end--; |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
446 } |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
447 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
448 usage_error = true; |
1 | 449 } |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
450 else if (nargin == 1) |
1 | 451 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
452 if (get_int_arg (args(0), hist_beg)) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
453 { |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
454 if (hist_beg < 0) |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
455 hist_beg += (hist_count + 1); |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
456 else |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
457 hist_beg--; |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
458 hist_end = hist_beg; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
459 } |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
460 else |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
461 usage_error = true; |
1 | 462 } |
463 | |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
464 if (usage_error) |
1 | 465 { |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
466 usage ("%s [first] [last]", warn_for); |
1799 | 467 return retval; |
1 | 468 } |
469 | |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
470 if (hist_beg > hist_count || hist_end > hist_count) |
1 | 471 { |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
472 error ("%s: history specification out of range", warn_for); |
1799 | 473 return retval; |
1 | 474 } |
475 | |
476 if (hist_end < hist_beg) | |
477 { | |
16022
d8f216d241cf
Fix off-by-1 error in run_history when called with no arguments.
Rik <rik@octave.org>
parents:
16016
diff
changeset
|
478 std::swap (hist_end, hist_beg); |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
479 reverse = true; |
1 | 480 } |
481 | |
10197
4d433bd2d4dc
attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
482 std::string name = octave_tempnam ("", "oct-"); |
1 | 483 |
3551 | 484 std::fstream file (name.c_str (), std::ios::out); |
64 | 485 |
1 | 486 if (! file) |
487 { | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
488 error ("%s: couldn't open temporary file '%s'", warn_for, |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
489 name.c_str ()); |
1799 | 490 return retval; |
1 | 491 } |
492 | |
493 if (reverse) | |
494 { | |
495 for (int i = hist_end; i >= hist_beg; i--) | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
496 file << hlist[i] << "\n"; |
1 | 497 } |
498 else | |
499 { | |
500 for (int i = hist_beg; i <= hist_end; i++) | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
501 file << hlist[i] << "\n"; |
1 | 502 } |
503 | |
504 file.close (); | |
505 | |
1755 | 506 return name; |
64 | 507 } |
508 | |
10411 | 509 static void |
510 unlink_cleanup (const char *file) | |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
511 { |
10411 | 512 gnulib::unlink (file); |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
513 } |
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
514 |
1755 | 515 static void |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
516 do_edit_history (const octave_value_list& args) |
64 | 517 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
518 std::string name = mk_tmp_hist_file (args, false, "edit_history"); |
64 | 519 |
1755 | 520 if (name.empty ()) |
64 | 521 return; |
522 | |
1358 | 523 // Call up our favorite editor on the file of commands. |
1 | 524 |
5794 | 525 std::string cmd = VEDITOR; |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
526 cmd.append (" \"" + name + "\""); |
1 | 527 |
1358 | 528 // Ignore interrupts while we are off editing commands. Should we |
529 // maybe avoid using system()? | |
1 | 530 |
2705 | 531 volatile octave_interrupt_handler old_interrupt_handler |
2554 | 532 = octave_ignore_interrupts (); |
1443 | 533 |
15990
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
534 int status = system (cmd.c_str ()); |
1443 | 535 |
2554 | 536 octave_set_interrupt_handler (old_interrupt_handler); |
1 | 537 |
15990
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
538 // Check if text edition was successfull. Abort the operation |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
539 // in case of failure. |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
540 if (status != EXIT_SUCCESS) |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
541 { |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
542 error ("edit_history: text editor command failed"); |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
543 return; |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
544 } |
696e82182eba
Check if history edition was successful, abort operation on failure.
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
15823
diff
changeset
|
545 |
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7272
diff
changeset
|
546 // Write the commands to the history file since source_file |
1358 | 547 // disables command line history while it executes. |
1 | 548 |
3551 | 549 std::fstream file (name.c_str (), std::ios::in); |
1 | 550 |
551 char *line; | |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
552 //int first = 1; |
529 | 553 while ((line = edit_history_readline (file)) != 0) |
1 | 554 { |
1358 | 555 // Skip blank lines. |
1 | 556 |
557 if (line[0] == '\n') | |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
558 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
559 delete [] line; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
560 continue; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10197
diff
changeset
|
561 } |
1 | 562 |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
563 // FIXME: Don't delete this block of code until memory |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
564 // leak in edit_history has been plugged and |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
565 // it is clear that this code can be removed. |
16196
5bcae3970d9d
oct-hist.cc: Stop unused function declaration warning.
Rik <rik@octave.org>
parents:
16189
diff
changeset
|
566 // Command 'edit history' has already been removed in mk_tmp_hist_file () |
16051
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
567 //if (first) |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
568 // { |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
569 // first = 0; |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
570 // edit_history_repl_hist (line); |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
571 // } |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
572 //else |
3a06aa956d96
Fix off-by-1 error in history list when running 'edit_history'.
Rik <rik@octave.org>
parents:
16025
diff
changeset
|
573 edit_history_add_hist (line); |
16016 | 574 |
575 delete [] line; | |
1 | 576 } |
577 | |
578 file.close (); | |
579 | |
1358 | 580 // Turn on command echo, so the output from this will make better |
581 // sense. | |
1 | 582 |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
583 unwind_protect frame; |
3018 | 584 |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
585 frame.add_fcn (unlink_cleanup, name.c_str ()); |
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
586 frame.protect_var (Vecho_executing_commands); |
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
587 frame.protect_var (input_from_tmp_history_file); |
3018 | 588 |
2205 | 589 Vecho_executing_commands = ECHO_CMD_LINE; |
3018 | 590 input_from_tmp_history_file = true; |
1 | 591 |
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7272
diff
changeset
|
592 source_file (name); |
1 | 593 } |
594 | |
1755 | 595 static void |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
596 do_run_history (const octave_value_list& args) |
64 | 597 { |
16243
428da5debfe4
maint: Remove commented out lines from history fix in changeset 2a81ce01c383.
Rik <rik@octave.org>
parents:
16242
diff
changeset
|
598 std::string name = mk_tmp_hist_file (args, false, "run_history"); |
64 | 599 |
1755 | 600 if (name.empty ()) |
64 | 601 return; |
602 | |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
603 // Turn on command echo so the output from this will make better sense. |
64 | 604 |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
605 unwind_protect frame; |
3018 | 606 |
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
607 frame.add_fcn (unlink_cleanup, name.c_str ()); |
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
608 frame.protect_var (Vecho_executing_commands); |
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9377
diff
changeset
|
609 frame.protect_var (input_from_tmp_history_file); |
3018 | 610 |
2205 | 611 Vecho_executing_commands = ECHO_CMD_LINE; |
3018 | 612 input_from_tmp_history_file = true; |
64 | 613 |
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7272
diff
changeset
|
614 source_file (name); |
64 | 615 } |
616 | |
5305 | 617 void |
8273
2c1ba965b486
skip reading history file with --no-history option
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
618 initialize_history (bool read_history_file) |
5794 | 619 { |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
620 command_history::initialize (read_history_file, |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
621 default_history_file (), |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
622 default_history_size (), |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
623 octave_env::getenv ("OCTAVE_HISTCONTROL")); |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
624 |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
625 octave_link::set_history (command_history::list ()); |
5794 | 626 } |
627 | |
628 void | |
5305 | 629 octave_history_write_timestamp (void) |
630 { | |
631 octave_localtime now; | |
632 | |
633 std::string timestamp = now.strftime (Vhistory_timestamp_format_string); | |
634 | |
635 if (! timestamp.empty ()) | |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
636 { |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
637 command_history::add (timestamp); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
638 octave_link::append_history (timestamp); |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
639 } |
5305 | 640 } |
641 | |
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8286
diff
changeset
|
642 DEFUN (edit_history, args, , |
3332 | 643 "-*- texinfo -*-\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
644 @deftypefn {Command} {} edit_history\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
645 @deftypefnx {Command} {} edit_history @var{cmd_number}\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
646 @deftypefnx {Command} {} edit_history @var{first} @var{last}\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
647 Edit the history list using the editor named by the variable\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
648 @w{@env{EDITOR}}.\n\ |
3332 | 649 \n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
650 The commands to be edited are first copied to a temporary file. When you\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
651 exit the editor, Octave executes the commands that remain in the file. It\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
652 is often more convenient to use @code{edit_history} to define functions\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
653 rather than attempting to enter them directly on the command line.\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
654 The block of commands is executed as soon as you exit the editor.\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
655 To avoid executing any commands, simply delete all the lines from the buffer\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
656 before leaving the editor.\n\ |
3332 | 657 \n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
658 When invoked with no arguments, edit the previously executed command;\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
659 With one argument, edit the specified command @var{cmd_number};\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
660 With two arguments, edit the list of commands between @var{first} and\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
661 @var{last}. Command number specifiers may also be negative where -1\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
662 refers to the most recently executed command.\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
663 The following are equivalent and edit the most recently executed command.\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
664 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
665 @example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
666 @group\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
667 edit_history\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
668 edit_history -1\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
669 @end group\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
670 @end example\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
671 \n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
672 When using ranges, specifying a larger number for the first command than the\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
673 last command reverses the list of commands before they are placed in the\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
674 buffer to be edited.\n\ |
9035
57649dcecb55
Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
675 @seealso{run_history}\n\ |
11547 | 676 @end deftypefn") |
529 | 677 { |
2086 | 678 octave_value_list retval; |
529 | 679 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
680 do_edit_history (args); |
529 | 681 |
682 return retval; | |
683 } | |
684 | |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
685 DEFUN (history, args, nargout, |
3332 | 686 "-*- texinfo -*-\n\ |
16052 | 687 @deftypefn {Command} {} history\n\ |
688 @deftypefnx {Command} {} history @var{opt1} @dots{}\n\ | |
689 @deftypefnx {Built-in Function} {@var{h} =} history ()\n\ | |
690 @deftypefnx {Built-in Function} {@var{h} =} history (@var{opt1}, @dots{})\n\ | |
3332 | 691 If invoked with no arguments, @code{history} displays a list of commands\n\ |
692 that you have executed. Valid options are:\n\ | |
693 \n\ | |
694 @table @code\n\ | |
16052 | 695 @item @var{n}\n\ |
696 @itemx -@var{n}\n\ | |
697 Display only the most recent @var{n} lines of history.\n\ | |
698 \n\ | |
16431
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
699 @item -c\n\ |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
700 Clear the history list.\n\ |
5982d469f79b
use signal for setting, appending to, and clearing history widget
John W. Eaton <jwe@octave.org>
parents:
16243
diff
changeset
|
701 \n\ |
16052 | 702 @item -q\n\ |
703 Don't number the displayed lines of history. This is useful for cutting\n\ | |
704 and pasting commands using the X Window System.\n\ | |
529 | 705 \n\ |
3332 | 706 @item -r @var{file}\n\ |
12642
f96b9b9f141b
doc: Periodic grammarcheck and spellcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
707 Read the file @var{file}, appending its contents to the current\n\ |
11405
51b6193e90bb
Documentation fixes
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11368
diff
changeset
|
708 history list. If the name is omitted, use the default history file\n\ |
3332 | 709 (normally @file{~/.octave_hist}).\n\ |
710 \n\ | |
16052 | 711 @item -w @var{file}\n\ |
712 Write the current history to the file @var{file}. If the name is\n\ | |
713 omitted, use the default history file (normally @file{~/.octave_hist}).\n\ | |
3332 | 714 @end table\n\ |
715 \n\ | |
716 For example, to display the five most recent commands that you have\n\ | |
717 typed without displaying line numbers, use the command\n\ | |
718 @kbd{history -q 5}.\n\ | |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
719 \n\ |
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
720 If invoked with a single output argument, the history will be saved to that\n\ |
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
721 argument as a cell string and will not be output to screen.\n\ |
11547 | 722 @end deftypefn") |
529 | 723 { |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
724 octave_value retval; |
529 | 725 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
726 string_vector hlist = do_history (args, nargout); |
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
727 |
15814
1eee8d8c59fd
Return history as a cell string when called with an output argument (bug #37947)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15467
diff
changeset
|
728 if (nargout > 0) |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
729 retval = Cell (hlist); |
529 | 730 |
731 return retval; | |
732 } | |
733 | |
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8286
diff
changeset
|
734 DEFUN (run_history, args, , |
3332 | 735 "-*- texinfo -*-\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
736 @deftypefn {Command} {} run_history\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
737 @deftypefnx {Command} {} run_history @var{cmd_number}\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
738 @deftypefnx {Command} {} run_history @var{first} @var{last}\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
739 Run commands from the history list.\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
740 \n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
741 When invoked with no arguments, run the previously executed command;\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
742 With one argument, run the specified command @var{cmd_number};\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
743 With two arguments, run the list of commands between @var{first} and\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
744 @var{last}. Command number specifiers may also be negative where -1\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
745 refers to the most recently executed command.\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
746 For example, the command\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
747 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
748 @example\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
749 @group\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
750 run_history\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
751 OR\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
752 run_history -1\n\ |
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
753 @end group\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
754 @end example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
755 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
756 @noindent\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
757 executes the most recent command again.\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
758 The command\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
759 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
760 @example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
761 run_history 13 169\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
762 @end example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
763 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
764 @noindent\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
765 executes commands 13 through 169.\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
766 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
767 Specifying a larger number for the first command than the last command\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
768 reverses the list of commands before executing them.\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
769 For example:\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
770 \n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
771 @example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
772 @group\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
773 disp (1)\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
774 disp (2)\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
775 run_history -1 -2\n\ |
16189
2825897a0c27
doc: Fix docstrings for edit_history, run_history to match true behavior.
Rik <rik@octave.org>
parents:
16188
diff
changeset
|
776 @result{}\n\ |
16188
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
777 2\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
778 1\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
779 @end group\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
780 @end example\n\ |
8366bc871d45
Allow negative numbers to be used in specifying edit_history commands.
Rik <rik@octave.org>
parents:
16052
diff
changeset
|
781 \n\ |
9035
57649dcecb55
Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
782 @seealso{edit_history}\n\ |
11547 | 783 @end deftypefn") |
529 | 784 { |
2086 | 785 octave_value_list retval; |
529 | 786 |
15823
bc7a130bbdfb
allow history commands to take numeric arguments
John W. Eaton <jwe@octave.org>
parents:
15817
diff
changeset
|
787 do_run_history (args); |
529 | 788 |
789 return retval; | |
790 } | |
791 | |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
792 DEFUN (history_control, args, nargout, |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
793 "-*- texinfo -*-\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
794 @deftypefn {Built-in Function} {@var{val} =} history_control ()\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
795 @deftypefnx {Built-in Function} {@var{old_val} =} history_control (@var{new_val})\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
796 Query or set the internal variable that specifies how commands are saved\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
797 to the history list. The default value is an empty character string,\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
798 but may be overridden by the environment variable\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
799 @w{@env{OCTAVE_HISTCONTROL}}.\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
800 \n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
801 The value of @code{history_control} is a colon-separated list of values\n\ |
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11547
diff
changeset
|
802 controlling how commands are saved on the history list. If the list\n\ |
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11547
diff
changeset
|
803 of values includes @code{ignorespace}, lines which begin with a space\n\ |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
804 character are not saved in the history list. A value of @code{ignoredups}\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
805 causes lines matching the previous history entry to not be saved.\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
806 A value of @code{ignoreboth} is shorthand for @code{ignorespace} and\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
807 @code{ignoredups}. A value of @code{erasedups} causes all previous lines\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
808 matching the current line to be removed from the history list before that\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
809 line is saved. Any value not in the above list is ignored. If\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
810 @code{history_control} is the empty string, all commands are saved on\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
811 the history list, subject to the value of @code{saving_history}.\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
812 @seealso{history_file, history_size, history_timestamp_format_string, saving_history}\n\ |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
813 @end deftypefn") |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
814 { |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
815 std::string old_history_control = command_history::histcontrol (); |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
816 |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
817 std::string tmp = old_history_control; |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
818 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
819 octave_value retval = set_internal_variable (tmp, args, nargout, |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
820 "history_control"); |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
821 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
822 if (tmp != old_history_control) |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
823 command_history::process_histcontrol (tmp); |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
824 |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
825 return retval; |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
826 } |
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
827 |
5794 | 828 DEFUN (history_size, args, nargout, |
829 "-*- texinfo -*-\n\ | |
10840 | 830 @deftypefn {Built-in Function} {@var{val} =} history_size ()\n\ |
5794 | 831 @deftypefnx {Built-in Function} {@var{old_val} =} history_size (@var{new_val})\n\ |
832 Query or set the internal variable that specifies how many entries\n\ | |
16025
a78c1e445cfc
Change default history size to 1000.
Rik <rik@octave.org>
parents:
16022
diff
changeset
|
833 to store in the history file. The default value is @code{1000},\n\ |
10840 | 834 but may be overridden by the environment variable @w{@env{OCTAVE_HISTSIZE}}.\n\ |
8286
6f2d95255911
fix @seealso references to point to existing anchors
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8273
diff
changeset
|
835 @seealso{history_file, history_timestamp_format_string, saving_history}\n\ |
5794 | 836 @end deftypefn") |
3016 | 837 { |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
838 int old_history_size = command_history::size (); |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
839 |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
840 int tmp = old_history_size; |
5800 | 841 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
842 octave_value retval = set_internal_variable (tmp, args, nargout, |
15215
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
843 "history_size", -1, |
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
844 std::numeric_limits<int>::max ()); |
5800 | 845 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
846 if (tmp != old_history_size) |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
847 command_history::set_size (tmp); |
5800 | 848 |
849 return retval; | |
3016 | 850 } |
851 | |
5794 | 852 DEFUN (history_file, args, nargout, |
853 "-*- texinfo -*-\n\ | |
10840 | 854 @deftypefn {Built-in Function} {@var{val} =} history_file ()\n\ |
5794 | 855 @deftypefnx {Built-in Function} {@var{old_val} =} history_file (@var{new_val})\n\ |
856 Query or set the internal variable that specifies the name of the\n\ | |
857 file used to store command history. The default value is\n\ | |
9134
a3739e27b017
Update section 2.4 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents:
9035
diff
changeset
|
858 @file{~/.octave_hist}, but may be overridden by the environment\n\ |
10840 | 859 variable @w{@env{OCTAVE_HISTFILE}}.\n\ |
5794 | 860 @seealso{history_size, saving_history, history_timestamp_format_string}\n\ |
861 @end deftypefn") | |
5305 | 862 { |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
863 std::string old_history_file = command_history::file (); |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
864 |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
865 std::string tmp = old_history_file; |
5305 | 866 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
867 octave_value retval = set_internal_variable (tmp, args, nargout, |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
868 "history_file"); |
5305 | 869 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
870 if (tmp != old_history_file) |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
871 command_history::set_file (tmp); |
5305 | 872 |
5800 | 873 return retval; |
3016 | 874 } |
875 | |
5794 | 876 DEFUN (history_timestamp_format_string, args, nargout, |
877 "-*- texinfo -*-\n\ | |
10840 | 878 @deftypefn {Built-in Function} {@var{val} =} history_timestamp_format_string ()\n\ |
5794 | 879 @deftypefnx {Built-in Function} {@var{old_val} =} history_timestamp_format_string (@var{new_val})\n\ |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
880 @deftypefnx {Built-in Function} {} history_timestamp_format_string (@var{new_val}, \"local\")\n\ |
6653 | 881 Query or set the internal variable that specifies the format string\n\ |
5794 | 882 for the comment line that is written to the history file when Octave\n\ |
883 exits. The format string is passed to @code{strftime}. The default\n\ | |
884 value is\n\ | |
5305 | 885 \n\ |
886 @example\n\ | |
887 \"# Octave VERSION, %a %b %d %H:%M:%S %Y %Z <USER@@HOST>\"\n\ | |
888 @end example\n\ | |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
889 \n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
890 When called from inside a function with the \"local\" option, the variable is\n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
891 changed locally for the function and any subroutines it calls. The original\n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
892 variable value is restored when exiting the function.\n\ |
5794 | 893 @seealso{strftime, history_file, history_size, saving_history}\n\ |
894 @end deftypefn") | |
895 { | |
896 return SET_INTERNAL_VARIABLE (history_timestamp_format_string); | |
897 } | |
5305 | 898 |
5794 | 899 DEFUN (saving_history, args, nargout, |
900 "-*- texinfo -*-\n\ | |
10840 | 901 @deftypefn {Built-in Function} {@var{val} =} saving_history ()\n\ |
5794 | 902 @deftypefnx {Built-in Function} {@var{old_val} =} saving_history (@var{new_val})\n\ |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
903 @deftypefnx {Built-in Function} {} saving_history (@var{new_val}, \"local\")\n\ |
5794 | 904 Query or set the internal variable that controls whether commands entered\n\ |
905 on the command line are saved in the history file.\n\ | |
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
906 \n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
907 When called from inside a function with the \"local\" option, the variable is\n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
908 changed locally for the function and any subroutines it calls. The original\n\ |
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
12990
diff
changeset
|
909 variable value is restored when exiting the function.\n\ |
11486
a1deab9a6e71
bash-like history control
Pascal Dupuis <Pascal.Dupuis@worldonline.be> and John W. Eaton <jwe@octave.org>
parents:
11405
diff
changeset
|
910 @seealso{history_control, history_file, history_size, history_timestamp_format_string}\n\ |
5794 | 911 @end deftypefn") |
912 { | |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
913 bool old_saving_history = ! command_history::ignoring_entries (); |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
914 |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
915 bool tmp = old_saving_history; |
5794 | 916 |
12989
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
917 octave_value retval = set_internal_variable (tmp, args, nargout, |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
918 "saving_history"); |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
919 |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
920 if (tmp != old_saving_history) |
00235a6446da
eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents:
12642
diff
changeset
|
921 command_history::ignore_entries (! tmp); |
5794 | 922 |
923 return retval; | |
3016 | 924 } |