1 files changed, 15 insertions, 0 deletions
diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index e8fb24d53d8..f402e25c7fb 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -72,6 +72,7 @@ public final class EmacsOpenActivity extends Activity
   DialogInterface.OnCancelListener
 {
   private static final String TAG = "EmacsOpenActivity";
+  public static String fileToOpen;
 
   private class EmacsClientThread extends Thread
   {
@@ -317,6 +318,20 @@ public final class EmacsOpenActivity extends Activity
     Process process;
     EmacsClientThread thread;
     File file;
+    Intent intent;
+
+    /* If the Emacs service is not running, then start Emacs and make
+       it open this file.  */
+
+    if (EmacsService.SERVICE == null)
+      {
+	fileToOpen = fileName;
+	intent = new Intent (EmacsOpenActivity.this,
+			     EmacsActivity.class);
+	finish ();
+	startActivity (intent);
+	return;
+      }
 
     libDir = EmacsService.getLibraryDirectory (this);
     builder = new ProcessBuilder (libDir + "/libemacsclient.so",