# HG changeset patch
# User wenzelm
# Date 1399385798 -7200
# Node ID 4e9d2eab9cfa7a0a08e5c5673f36c76414bb3694
# Parent  f12f7c6dd83db8ad7ff9c96d8d49865ec99ba3f5
more visual feedback on path_completion, at the risk of file-system access in GUI painting;

diff -r f12f7c6dd83d -r 4e9d2eab9cfa src/Tools/jEdit/src/completion_popup.scala
--- a/src/Tools/jEdit/src/completion_popup.scala	Tue May 06 16:08:07 2014 +0200
+++ b/src/Tools/jEdit/src/completion_popup.scala	Tue May 06 16:16:38 2014 +0200
@@ -132,7 +132,9 @@
                   case Some(Text.Info(_, Completion.No_Completion)) => None
                   case Some(Text.Info(range1, _: Completion.Names)) => Some(range1)
                   case None =>
-                    syntax_completion(Completion.History.empty, false, Some(rendering)).map(_.range)
+                    Completion.Result.merge(Completion.History.empty,
+                      syntax_completion(Completion.History.empty, false, Some(rendering)),
+                      path_completion(rendering)).map(_.range)
                 }
               case _ => None
             }