ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`org-file-apps' add migration hint for function signature 

* lisp/org.el (org-open-file): Add a user error for when the function
signature does not match.
This commit is contained in:
Michael Brand 2016-02-07 12:36:03 +01:00
parent 24dacbd833
commit 96f1bd89e0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/org.el
View File

@ -11325,15 +11325,22 @@ If the file does not exist, an error is thrown."
((functionp cmd)
(save-match-data
(set-match-data link-match-data)
(funcall cmd file link)))
(condition-case nil
(funcall cmd file link)
;; FIXME: Remove this check when most default installations
;; of Emacs have at least Org 9.0.
((debug wrong-number-of-arguments wrong-type-argument
invalid-function)
(user-error "Please see Org News for version 9.0 about \
`org-file-apps'--Lisp error: %S" cmd)))))
((consp cmd)
;; FIXME: Remove this check when most default installations of
;; Emacs have at least Org 9.0.
;; Heads-up instead of silently fall back to
;; `org-link-frame-setup' for an old usage of `org-file-apps'
;; with sexp instead of a function for `cmd'.
(user-error
"Please see Org News for version 9.0 about `org-file-apps'"))
(user-error "Please see Org News for version 9.0 about \
`org-file-apps'--Error: Deprecated usage of %S" cmd))
(t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
(and (derived-mode-p 'org-mode)
(eq old-mode 'org-mode)