Mercurial > octave
changeset 24597:56f1f60f35fd
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 14 Jan 2018 17:14:54 -0800 |
parents | a81af57f6144 (current diff) 49876d80d110 (diff) |
children | fdfb026486a8 |
files | libinterp/corefcn/input.cc scripts/deprecated/md5sum.m scripts/strings/regexptranslate.m |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/input.cc Sun Jan 14 16:57:20 2018 -0800 +++ b/libinterp/corefcn/input.cc Sun Jan 14 17:14:54 2018 -0800 @@ -1210,7 +1210,7 @@ When executing interactively, Octave displays the primary prompt when it is ready to read a command. -The default value of the primary prompt string is @qcode{"octave:\#> "}. +The default value of the primary prompt string is @qcode{'octave:\#> '}. To change it, use a command like @example
--- a/scripts/strings/regexptranslate.m Sun Jan 14 16:57:20 2018 -0800 +++ b/scripts/strings/regexptranslate.m Sun Jan 14 17:14:54 2018 -0800 @@ -33,7 +33,7 @@ ## @example ## @group ## regexptranslate ("wildcard", "*.m") -## @result{} ".*\.m" +## @result{} '.*\.m' ## @end group ## @end example ## @@ -44,7 +44,7 @@ ## @example ## @group ## regexptranslate ("escape", "12.5") -## @result{} "12\.5" +## @result{} '12\.5' ## @end group ## @end example ##