1 files changed, 4 insertions, 0 deletions

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index ea503ebd120..ca6d99e20b7 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -477,6 +477,10 @@ public final class EmacsOpenActivity extends Activity
                       }
                   }
               }
+            else if (uri.getScheme ().equals ("org-protocol"))
+              /* URL is an org-protocol:// link, which is meant to be
+                 directly relayed to emacsclient.  */
+              fileName = uri.toString ();
 
             if (fileName == null)
               {