summaryrefslogtreecommitdiff
path: root/lisp/org/org-protocol.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-17 10:19:23 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-17 10:26:15 -0800
commitef144113f3473f39d3df3e96e780c832e0d5420e (patch)
tree4dcdfeb3a0d55a6f891983f9e59b9f5d1b3f5378 /lisp/org/org-protocol.el
parenta5995a326d1dad9bccf1ad7eb96e4e8146f6dcbe (diff)
downloademacs-ef144113f3473f39d3df3e96e780c832e0d5420e.tar.gz
Some more flatten-tree aliases
* lisp/allout.el (allout-flatten): * lisp/progmodes/hideif.el (hif-flatten): Now an obsolete alias for flatten-tree. All callers changed. * lisp/org/org-protocol.el (org-protocol-flatten): Make it an alias for flatten-tree if available. * lisp/progmodes/js.el (js--flatten-list): Remove alias. We shouldn’t need obsolete function aliases for private functions.
Diffstat (limited to 'lisp/org/org-protocol.el')
-rw-r--r--lisp/org/org-protocol.el15
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.