# HG changeset patch
# User Rik <rik@octave.org>
# Date 1396209728 25200
# Node ID c29b00276818f0ae1b6ec43add6da5608d339654
# Parent  8d4d78285c8eb740abde560daf7a2ce5ab4912be# Parent  400f48e9e8cba9dc728c79cb6ec17fe0051f7ac9
maint: Periodic merge of gui-release to default.

diff -r 8d4d78285c8e -r c29b00276818 libgui/qterminal/libqterminal/unix/ExtendedDefaultTranslatorMac.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgui/qterminal/libqterminal/unix/ExtendedDefaultTranslatorMac.h	Sun Mar 30 13:02:08 2014 -0700
@@ -0,0 +1,53 @@
+"keyboard \"Default (XFree 4)\""
+"key Escape : \"\\x1b\""
+"key Tab -Shift : \"\\t\"\n"
+"key Tab +Shift+Ansi : \"\\E[Z\"\n"
+"key Tab +Shift-Ansi : \"\\t\"\n"
+"key Backtab +Ansi : \"\\E[Z\"\n"
+"key Backtab -Ansi : \"\\t\"\n"
+"key Return-Shift-NewLine : \"\\r\"\n"
+"key Return-Shift+NewLine : \"\\r\\n\"\n"
+"key Return+Shift : \"\\EOM\"\n"
+"key Backspace : \"\\x7f\"\n"
+"key Meta +C: \"\\x03\"\n"
+"key Up -Shift+Ansi-AppCuKeys : \"\\E[A\"\n"
+"key Down -Shift+Ansi-AppCuKeys : \"\\E[B\"\n"
+"key Right-Shift+Ansi-AppCuKeys : \"\\E[C\"\n"
+"key Left -Shift+Ansi-AppCuKeys : \"\\E[D\"\n"
+"key Up -Ansi : \"\\E[1;*A\"\n"
+"key Down -Ansi : \"\\E[1;*B\"\n"
+"key Right -Ansi : \"\\E[1;*C\"\n"
+"key Left -Ansi : \"\\E[1;*D\"\n"
+"key Enter+NewLine : \"\\r\\n\"\n"
+"key Enter-NewLine : \"\\r\"\n"
+"key Home -AnyMod -AppCuKeys : \"\\E[H\"\n"
+"key End -AnyMod -AppCuKeys : \"\\E[F\"\n"
+"key Home -AnyMod +AppCuKeys : \"\\EOH\"\n"
+"key End -AnyMod +AppCuKeys : \"\\EOF\"\n"
+"key Home +AnyMod : \"\\E[1;*H\"\n"
+"key End +AnyMod : \"\\E[1;*F\"\n"
+"key Insert -AnyMod : \"\\E[2~\"\n"
+"key Delete -AnyMod : \"\\E[3~\"\n"
+"key Insert +AnyMod : \"\\E[2;*~\"\n"
+"key Delete +AnyMod : \"\\E[3;*~\"\n"
+"key Prior -Shift-AnyMod : \"\\E[5~\"\n"
+"key Next -Shift-AnyMod : \"\\E[6~\"\n"
+"key Prior -Shift+AnyMod : \"\\E[5;*~\"\n"
+"key Next -Shift+AnyMod : \"\\E[6;*~\"\n"
+"key F1 -AnyMod : \"\\EOP\"\n"
+"key F2 -AnyMod : \"\\EOQ\"\n"
+"key F3 -AnyMod : \"\\EOR\"\n"
+"key F4 -AnyMod : \"\\EOS\"\n"
+"key F5 -AnyMod : \"\\EOT\"\n"
+"key F6 -AnyMod : \"\\EOU\"\n"
+"key F7 -AnyMod : \"\\EOV\"\n"
+"key F8 -AnyMod : \"\\EOW\"\n"
+"key F9 -AnyMod : \"\\EOX\"\n"
+"key F10 -AnyMod : \"\\EOY\"\n"
+"key Space +Control : \"\\x00\"\n"
+"key Up +Shift-AppScreen : scrollLineUp\n"
+"key Prior +Shift-AppScreen : scrollPageUp\n"
+"key Down +Shift-AppScreen : scrollLineDown\n"
+"key Next +Shift-AppScreen : scrollPageDown\n"
+"key ScrollLock : scrollLock\n"
+"\0"
diff -r 8d4d78285c8e -r c29b00276818 libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp	Sat Mar 29 11:24:59 2014 -0700
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp	Sun Mar 30 13:02:08 2014 -0700
@@ -35,9 +35,17 @@
 #include <QtCore>
 #include <QtGui>
 
+// FIXME: We should not have a special case for Mac here.  Instead, we
+// should be loading .keytab files at run time, and ideally, allowing
+// individual keys to be redefined from some preferences menu.
+
 //and this is default now translator - default.keytab from original Konsole
 const char* KeyboardTranslatorManager::defaultTranslatorText = 
+#if defined (Q_OS_MAC)
+#include "ExtendedDefaultTranslatorMac.h"
+#else
 #include "ExtendedDefaultTranslator.h"
+#endif
 ;
 
 KeyboardTranslatorManager::KeyboardTranslatorManager()
diff -r 8d4d78285c8e -r c29b00276818 libinterp/corefcn/__pchip_deriv__.cc
--- a/libinterp/corefcn/__pchip_deriv__.cc	Sat Mar 29 11:24:59 2014 -0700
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Sun Mar 30 13:02:08 2014 -0700
@@ -95,8 +95,8 @@
 
           for (octave_idx_type i = (rows ? nyr : nyc); i > 0; i--)
             {
-              F77_FUNC (pchim, PCHIM) (nx, xvec.data (),
-                                       yvec, dvec, incfd, &ierr);
+              F77_XFCN (pchim, PCHIM, (nx, xvec.data (),
+                                       yvec, dvec, incfd, &ierr));
 
               yvec += inc;
               dvec += inc;
@@ -142,8 +142,8 @@
 
           for (octave_idx_type i = (rows ? nyr : nyc); i > 0; i--)
             {
-              F77_FUNC (dpchim, DPCHIM) (nx, xvec.data (),
-                                         yvec, dvec, incfd, &ierr);
+              F77_XFCN (dpchim, DPCHIM, (nx, xvec.data (),
+                                         yvec, dvec, incfd, &ierr));
 
               yvec += inc;
               dvec += inc;
diff -r 8d4d78285c8e -r c29b00276818 libinterp/corefcn/input.cc
--- a/libinterp/corefcn/input.cc	Sat Mar 29 11:24:59 2014 -0700
+++ b/libinterp/corefcn/input.cc	Sun Mar 30 13:02:08 2014 -0700
@@ -510,8 +510,7 @@
 
   octave_user_code *caller = octave_call_stack::caller_user_code ();
   std::string nm;
-
-  int curr_debug_line = octave_call_stack::current_line ();
+  int curr_debug_line;
 
   bool have_file = false;
 
@@ -523,9 +522,11 @@
         nm = caller->name ();
       else
         have_file = true;
+
+      curr_debug_line = octave_call_stack::caller_user_code_line ();
     }
   else
-    curr_debug_line = -1;
+    curr_debug_line = octave_call_stack::current_line ();
 
   std::ostringstream buf;
 
diff -r 8d4d78285c8e -r c29b00276818 scripts/help/__makeinfo__.m
--- a/scripts/help/__makeinfo__.m	Sat Mar 29 11:24:59 2014 -0700
+++ b/scripts/help/__makeinfo__.m	Sun Mar 30 13:02:08 2014 -0700
@@ -123,7 +123,7 @@
     if (fid < 0)
       error ("__makeinfo__: could not create temporary file");
     endif
-    fwrite (fid, text);
+    fprintf (fid, "%s", text);
     fclose (fid);
 
     ## Take action depending on output type