# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1411240705 14400
# Node ID 5bc7d059344db214bfc5c1d5cd350da394e32c4d
# Parent  fbe5a2dd64aea45301ee8519cce293bd584e4c87# Parent  2036e17079870803c229daf85a5de150fb87a358
maint: Periodic merge of gui-release to default.

diff -r fbe5a2dd64ae -r 5bc7d059344d .hgsubstate
--- 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
diff -r fbe5a2dd64ae -r 5bc7d059344d libgui/src/m-editor/file-editor.cc
--- 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 ())
diff -r fbe5a2dd64ae -r 5bc7d059344d libinterp/parse-tree/module.mk
diff -r fbe5a2dd64ae -r 5bc7d059344d m4/acinclude.m4
diff -r fbe5a2dd64ae -r 5bc7d059344d scripts/startup/inputrc
--- 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