# HG changeset patch
# User Rik <rik@octave.org>
# Date 1392524382 28800
# Node ID b2a2f097c5e0e4b62b626851373746641e6d4247
# Parent  0bfa7798c4966150a0db8427149193900c0f4d20# Parent  044bbf569cd34806da67a21d298d7dff79b32dfb
maint: merge gui-release to default.

diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/file-editor-tab.cc
diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/file-editor-tab.h
diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/file-editor.cc
diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/file-editor.h
diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/octave-qscintilla.cc
diff -r 0bfa7798c496 -r b2a2f097c5e0 libgui/src/m-editor/octave-qscintilla.h
diff -r 0bfa7798c496 -r b2a2f097c5e0 libinterp/corefcn/sighandlers.cc
--- a/libinterp/corefcn/sighandlers.cc	Sat Feb 15 20:09:32 2014 -0800
+++ b/libinterp/corefcn/sighandlers.cc	Sat Feb 15 20:19:42 2014 -0800
@@ -139,6 +139,12 @@
       octave_jump_to_enclosing_context_sync ();
     else
       {
+        // 64-bit Windows does not appear to have threadContext.Eip.
+        // Something else must be done here to allow interrupts to
+        // properly work across threads.
+
+#if ! (defined (__MINGW64__) || defined (_WIN64))
+
         CONTEXT threadContext;
 
         SuspendThread (thread);
@@ -147,6 +153,7 @@
         threadContext.Eip = (DWORD) octave_jump_to_enclosing_context_sync;
         SetThreadContext (thread, &threadContext);
         ResumeThread (thread);
+#endif
       }
   }
 
diff -r 0bfa7798c496 -r b2a2f097c5e0 libinterp/parse-tree/lex.ll
--- a/libinterp/parse-tree/lex.ll	Sat Feb 15 20:09:32 2014 -0800
+++ b/libinterp/parse-tree/lex.ll	Sat Feb 15 20:19:42 2014 -0800
@@ -461,7 +461,7 @@
 %}
 
 <COMMAND_START>([\.]|[^#% \t\r\n\.\,\;\"\'\(\[\{\}\]\)]*) {
-    curr_lexer->lexer_debug ("<COMMAND_START>([\.]|[^#% \\t\\r\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]*");
+    curr_lexer->lexer_debug ("<COMMAND_START>([\\.]|[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]*");
 
     curr_lexer->string_text += yytext;
     curr_lexer->current_input_column += yyleng;