Mercurial > hg > octave-nkf
changeset 16250:755b290530b3 classdef
maint: periodic merge of default to classdef
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 11 Mar 2013 13:59:37 -0400 |
| parents | 90dfd98a915a (current diff) b1b01c69967e (diff) |
| children | 6a3c6c921daa |
| files | libgui/languages/be_BY.qm libgui/languages/de_DE.qm libgui/languages/en_US.qm libgui/languages/es_ES.qm libgui/languages/nl_NL.qm libgui/languages/pt_BR.qm libgui/languages/ru_RU.qm libgui/languages/uk_UA.qm |
| diffstat | 14 files changed, 19 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate +++ b/.hgsubstate @@ -1,1 +1,1 @@ -c75939cb6254833830cdbeaf84e666360a34ccf1 gnulib-hg +cec099cbf54f2d3a49367c03df101f3cf35c20c7 gnulib-hg
--- a/configure.ac +++ b/configure.ac @@ -2587,11 +2587,12 @@ AC_CHECK_PROGS(MOC, [moc-qt5 moc-qt4 moc]) AC_CHECK_PROGS(UIC, [uic-qt5 uic-qt4 uic]) AC_CHECK_PROGS(RCC, [rcc]) - if test -n "$MOC" && test -n "$UIC" && test -n "$RCC"; then + AC_CHECK_PROGS(LRELEASE, [lrelease]) + if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then AC_DEFINE(HAVE_QT, 1, - [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, and rcc))]) + [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) else - AC_MSG_WARN([Qt utility programs moc, uic, and rcc not found -- disabling GUI]) + AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI]) build_gui=no fi fi
--- a/doc/interpreter/contributors.in +++ b/doc/interpreter/contributors.in @@ -101,7 +101,6 @@ Ryan Hinton Roman Hodek A. Scottedward Hodel -Júlio Hoffimann Richard Allan Holcombe Tom Holroyd David Hoover
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -90,3 +90,5 @@ qrc-%.cc: %.qrc @RCC@ -o $@ $< +%.qm: %.ts + @LRELEASE@ $<
deleted file mode 100644 index a35ad51bdced45d06f08300f4c0ec4c2af9e8ab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index 8e57ee6fe4548f8e16f7319ea374c252cb7fa9c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 --- a/libgui/languages/en_US.qm +++ /dev/null @@ -1,1 +0,0 @@ -<¸dÊÍ! ¿`¡½Ý \ No newline at end of file
deleted file mode 100644 index f9805860aa6acb5f9432c6b05b899e4ad66f32d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index 227c6c5d0d4da9dba6307beddfec61359f373601..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index 204461ebb4eb0630b0bdc0139df5be07b9be8968..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index e4c60b51c6231f4a48b5812f57dace6d635fc28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index b745f88cebb4bce7ef0709d50d9461a2cebfd0a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
--- a/libinterp/interpfcn/oct-hist.cc +++ b/libinterp/interpfcn/oct-hist.cc @@ -141,7 +141,7 @@ int nargin = args.length (); - // Number of history lines to show + // Number of history lines to show (-1 = all) int limit = -1; for (octave_idx_type i = 0; i < nargin; i++) @@ -155,6 +155,8 @@ else if (arg.is_numeric_type ()) { limit = arg.int_value (); + if (limit < 0) + limit = -limit; continue; } else @@ -210,7 +212,13 @@ int tmp; if (sscanf (option.c_str (), "%d", &tmp) == 1) - limit = tmp; + { + if (tmp > 0) + limit = tmp; + else + limit = -tmp; + } + else { if (option.length () > 0 && option[0] == '-') @@ -223,9 +231,6 @@ } } - if (limit < 0) - limit = -limit; - hlist = command_history::list (limit, numbered_output); int len = hlist.length (); @@ -570,7 +575,7 @@ static void do_run_history (const octave_value_list& args) { - std::string name = mk_tmp_hist_file (args, true, "run_history"); + std::string name = mk_tmp_hist_file (args, false, "run_history"); if (name.empty ()) return;