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	Sat Mar 09 18:09:54 2013 -0500
+++ b/.hgsubstate	Mon Mar 11 13:59:37 2013 -0400
@@ -1,1 +1,1 @@
-c75939cb6254833830cdbeaf84e666360a34ccf1 gnulib-hg
+cec099cbf54f2d3a49367c03df101f3cf35c20c7 gnulib-hg
--- a/configure.ac	Sat Mar 09 18:09:54 2013 -0500
+++ b/configure.ac	Mon Mar 11 13:59:37 2013 -0400
@@ -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	Sat Mar 09 18:09:54 2013 -0500
+++ b/doc/interpreter/contributors.in	Mon Mar 11 13:59:37 2013 -0400
@@ -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	Sat Mar 09 18:09:54 2013 -0500
+++ b/libgui/Makefile.am	Mon Mar 11 13:59:37 2013 -0400
@@ -90,3 +90,5 @@
 qrc-%.cc: %.qrc
 	@RCC@ -o $@ $<
 
+%.qm: %.ts
+	@LRELEASE@ $<
Binary file libgui/languages/be_BY.qm has changed
Binary file libgui/languages/de_DE.qm has changed
--- a/libgui/languages/en_US.qm	Sat Mar 09 18:09:54 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<¸dÊÍ!¿`¡½Ý
\ No newline at end of file
Binary file libgui/languages/es_ES.qm has changed
Binary file libgui/languages/nl_NL.qm has changed
Binary file libgui/languages/pt_BR.qm has changed
Binary file libgui/languages/ru_RU.qm has changed
Binary file libgui/languages/uk_UA.qm has changed
--- a/libinterp/interpfcn/oct-hist.cc	Sat Mar 09 18:09:54 2013 -0500
+++ b/libinterp/interpfcn/oct-hist.cc	Mon Mar 11 13:59:37 2013 -0400
@@ -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;
--- a/scripts/testfun/module.mk	Sat Mar 09 18:09:54 2013 -0500
+++ b/scripts/testfun/module.mk	Mon Mar 11 13:59:37 2013 -0400
@@ -1,6 +1,7 @@
 FCN_FILE_DIRS += testfun
 
 testfun_FCN_FILES = \
+  testfun/__have_feature__.m \
   testfun/__printf_assert__.m \
   testfun/__prog_output_assert__.m \
   testfun/__run_test_suite__.m \