"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/builtins/history.cpp" between
fish-3.5.0.tar.xz and fish-3.5.1.tar.xz

About: fish is a smart and user-friendly interactive command line shell.

history.cpp  (fish-3.5.0.tar.xz)	:	history.cpp  (fish-3.5.1.tar.xz)
skipping to change at line 308		skipping to change at line 308
history->clear_session();		history->clear_session();
history->save();		history->save();
break;		break;
}		}
case HIST_MERGE: {		case HIST_MERGE: {
if (check_for_unexpected_hist_args(opts, cmd, args, streams)) {		if (check_for_unexpected_hist_args(opts, cmd, args, streams)) {
status = STATUS_INVALID_ARGS;		status = STATUS_INVALID_ARGS;
break;		break;
}		}
		if (in_private_mode(parser.vars())) {
		streams.err.append_format(
		_(L"%ls: can't merge history in privat
		e mode\n"), cmd);
		status = STATUS_INVALID_ARGS;
		break;
		}
history->incorporate_external_changes();		history->incorporate_external_changes();
break;		break;
}		}
case HIST_SAVE: {		case HIST_SAVE: {
if (check_for_unexpected_hist_args(opts, cmd, args, streams)) {		if (check_for_unexpected_hist_args(opts, cmd, args, streams)) {
status = STATUS_INVALID_ARGS;		status = STATUS_INVALID_ARGS;
break;		break;
}		}
history->save();		history->save();
break;		break;
End of changes. 1 change blocks.
0 lines changed or deleted		7 lines changed or added

---