1 files changed, 9 insertions, 6 deletions

diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 33957ee3269..bb88c2fe1fd 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -349,17 +349,20 @@ returned list."
           ret)
       l)))
 
-(defun org-protocol-flatten (list)
-  "Transform LIST into a flat list.
+(if (fboundp 'flatten-tree)
+    (defalias 'org-protocol-flatten 'flatten-tree)
+  (defun org-protocol-flatten (list)
+    "Transform LIST into a flat list.
 
 Greedy handlers might receive a list like this from emacsclient:
 \((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\"))
 where \"/dir/\" is the absolute path to emacsclients working directory.
 This function transforms it into a flat list."
-  (if (null list) ()
-    (if (listp list)
-        (append (org-protocol-flatten (car list)) (org-protocol-flatten (cdr list)))
-      (list list))))
+    (if (null list) ()
+      (if (listp list)
+          (append (org-protocol-flatten (car list))
+                  (org-protocol-flatten (cdr list)))
+        (list list)))))
 
 (defun org-protocol-parse-parameters (info &optional new-style default-order)
   "Return a property list of parameters from INFO.