Mercurial > hg > octave-nkf
changeset 17345:91691d74845d
oct-hist.cc: Wrap code lines > 80 characters.
* libinterp/corefcn/oct-hist.cc: Break up simultaneous definition and assigment
of variable so that each half is less than 80 characters.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 28 Aug 2013 14:38:25 -0700 |
parents | 4ddc277e5bdb |
children | 68ff3d60c48a |
files | libinterp/corefcn/oct-hist.cc |
diffstat | 1 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-hist.cc +++ b/libinterp/corefcn/oct-hist.cc @@ -755,12 +755,13 @@ @seealso{history_file, history_size, history_timestamp_format_string, history_save}\n\ @end deftypefn") { + octave_value retval; + std::string old_history_control = command_history::histcontrol (); std::string tmp = old_history_control; - octave_value retval = set_internal_variable (tmp, args, nargout, - "history_control"); + retval = set_internal_variable (tmp, args, nargout, "history_control"); if (tmp != old_history_control) command_history::process_histcontrol (tmp); @@ -778,13 +779,15 @@ @seealso{history_file, history_timestamp_format_string, history_save}\n\ @end deftypefn") { + octave_value retval; + int old_history_size = command_history::size (); int tmp = old_history_size; - octave_value retval = set_internal_variable (tmp, args, nargout, - "history_size", -1, - std::numeric_limits<int>::max ()); + retval = set_internal_variable (tmp, args, nargout, + "history_size", -1, + std::numeric_limits<int>::max ()); if (tmp != old_history_size) command_history::set_size (tmp); @@ -803,12 +806,13 @@ @seealso{history_size, history_save, history_timestamp_format_string}\n\ @end deftypefn") { + octave_value retval; + std::string old_history_file = command_history::file (); std::string tmp = old_history_file; - octave_value retval = set_internal_variable (tmp, args, nargout, - "history_file"); + retval = set_internal_variable (tmp, args, nargout, "history_file"); if (tmp != old_history_file) command_history::set_file (tmp); @@ -853,12 +857,13 @@ @seealso{history_control, history_file, history_size, history_timestamp_format_string}\n\ @end deftypefn") { + octave_value retval; + bool old_history_save = ! command_history::ignoring_entries (); bool tmp = old_history_save; - octave_value retval = set_internal_variable (tmp, args, nargout, - "history_save"); + retval = set_internal_variable (tmp, args, nargout, "history_save"); if (tmp != old_history_save) command_history::ignore_entries (! tmp);