changeset 19142:5bc7d059344d

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Sat, 20 Sep 2014 15:18:25 -0400
parents fbe5a2dd64ae (current diff) 2036e1707987 (diff)
children e90bfaadb489
files libinterp/parse-tree/module.mk m4/acinclude.m4
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Sat Sep 20 10:43:47 2014 -0700
+++ b/.hgsubstate	Sat Sep 20 15:18:25 2014 -0400
@@ -1,1 +1,1 @@
-6d4e36653a40da6604507406f2a97e3e64bf9dbf gnulib-hg
+8728cf80b7d84b0ac401debac5b37217aac0d2e2 gnulib-hg
--- a/libgui/src/m-editor/file-editor.cc	Sat Sep 20 10:43:47 2014 -0700
+++ b/libgui/src/m-editor/file-editor.cc	Sat Sep 20 15:18:25 2014 -0400
@@ -1023,7 +1023,7 @@
     {
       _copy_action->setEnabled (copy_available);
       _cut_action->setEnabled (copy_available);
-      _run_selection_action->setEnabled (copy_available && is_octave_file);
+      _run_selection_action->setEnabled (copy_available);
       _run_action->setEnabled (is_octave_file);
 
       if (!file_name.isEmpty ())
--- a/scripts/startup/inputrc	Sat Sep 20 10:43:47 2014 -0700
+++ b/scripts/startup/inputrc	Sat Sep 20 15:18:25 2014 -0400
@@ -24,3 +24,8 @@
 ## \C-q should still be available for quoted insert.
 
 "\C-v": ""
+
+## In windows, disable audiable bell which is enabled by default
+$if term=cygwin
+   set bell-style none
+$endif