Mercurial > octave-nkf
changeset 14881:02952657182e
maint: Periodic merge of stable to default
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Thu, 19 Jul 2012 11:48:40 -0400 |
| parents | 54a386f2ac4e (current diff) 9e5df4d6cefa (diff) |
| children | a31a090c1628 f20312fc9046 |
| files | scripts/geometry/voronoi.m src/input.cc |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/geometry/voronoi.m Wed Jul 18 15:37:36 2012 -0400 +++ b/scripts/geometry/voronoi.m Thu Jul 19 11:48:40 2012 -0400 @@ -126,8 +126,8 @@ xbox = [xmin - scale * xdelta; xmin - scale * xdelta; ... xmax + scale * xdelta; xmax + scale * xdelta]; - ybox = [xmin - scale * xdelta; xmax + scale * xdelta; ... - xmax + scale * xdelta; xmin - scale * xdelta]; + ybox = [ymin - scale * ydelta; ymax + scale * ydelta; ... + ymax + scale * ydelta; ymin - scale * ydelta]; [p, c, infi] = __voronoi__ ("voronoi", [[x(:) ; xbox(:)], [y(:); ybox(:)]],
--- a/src/input.cc Wed Jul 18 15:37:36 2012 -0400 +++ b/src/input.cc Thu Jul 19 11:48:40 2012 -0400 @@ -1379,7 +1379,7 @@ This can be useful for coloring the prompt. For example,\n\ \n\ @example\n\ -PS1 (\"\\\\[\\\\033[01;31m\\\\]\\\\s:\\\\#> \\\\[\\\\033[0m\\]\")\n\ +PS1 (\"\\\\[\\\\033[01;31m\\\\]\\\\s:\\\\#> \\\\[\\\\033[0m\\\\]\")\n\ @end example\n\ \n\ @noindent\n\