emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Michael Brand <michael.ch.brand@gmail.com>
To: Org Mode <emacs-orgmode@gnu.org>
Cc: Julien Cubizolles <j.cubizolles@free.fr>
Subject: Re: org-pdfview-open doesn't work anymore
Date: Fri, 5 Feb 2016 14:45:46 +0100	[thread overview]
Message-ID: <CALn3zogu6B+Lb7CKU6Nd7ni9-gN4utrWnBt-Wgg83+GQWtieTw@mail.gmail.com> (raw)
In-Reply-To: <CALn3zogTXXjwOJh2tEDgAb9p9zqNAM+oJVjDC3eBG-KuiQqPFg@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

Hi Nicolas

On Fri, Feb 5, 2016 at 9:33 AM, Michael Brand
<michael.ch.brand@gmail.com> wrote:

> Due to lexical binding in org.el there was a change in
> `org-file-apps', see Org News for version 9.0 and e. g. this thread:
> http://thread.gmane.org/gmane.emacs.orgmode/104272
> I think the most convenient would be if `org-open-file' tries to find
> out that `cmd' in this case is a function with only one argument and
> call it with just `file'.

Only after a closer look I saw that the single parameter of
`org-pdfview-open' is not `file' but `link'. It is probably better for
`org-open-file' to not guess in case of `cmd' with a single parameter
whether it is meant to be `file' or `link'. That leads me to suggest
the attached patch to be reviewed that checks the function signature.

Michael

[-- Attachment #2: 0001-org-file-apps-add-migration-hint-for-function-signat.patch --]
[-- Type: text/x-patch, Size: 1797 bytes --]

From 9788cb03d2714cde555fbe2abb55ddd383a885c1 Mon Sep 17 00:00:00 2001
From: Michael Brand <michael.ch.brand@gmail.com>
Date: Fri, 5 Feb 2016 14:44:26 +0100
Subject: [PATCH] `org-file-apps' add migration hint for function signature

* lisp/org.el (org-open-file): Add an error when the function
signature does not match.
---
 lisp/org.el | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 5a6c74e..9ebabf8 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11323,6 +11323,18 @@ If the file does not exist, an error is thrown."
 		  (when (derived-mode-p 'org-mode) (org-reveal)))
 	    (search (org-link-search search))))
      ((functionp cmd)
+      ;; FIXME: Remove this check when most default installations of
+      ;; Emacs have at least Org 9.0.
+      (let ((arglist (help-function-arglist cmd)))
+	(when (or (memq '&optional arglist)
+		  (memq '&rest arglist)
+		  (/= 2 (length arglist)))
+	  (user-error
+	   (format
+	    "%s%s%S"
+	    "Please see Org News for version 9.0 about `org-file-apps', "
+	    "this function signature is wrong: "
+	    cmd))))
       (save-match-data
 	(set-match-data link-match-data)
 	(funcall cmd file link)))
@@ -11333,7 +11345,10 @@ If the file does not exist, an error is thrown."
       ;; `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'"))
+       (format "%s%s%S"
+	       "Please see Org News for version 9.0 about `org-file-apps', "
+	       "this usage is wrong: "
+	       cmd)))
      (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
     (and (derived-mode-p 'org-mode)
 	 (eq old-mode 'org-mode)
-- 
2.1.3.dirty


  parent reply	other threads:[~2016-02-05 13:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-05  5:46 org-pdfview-open doesn't work anymore Julien Cubizolles
2016-02-05  8:33 ` Michael Brand
2016-02-05 13:36   ` Nicolas Goaziou
2016-02-10 12:55     ` Julien Cubizolles
2016-02-05 13:45   ` Michael Brand [this message]
2016-02-05 17:22     ` Nicolas Goaziou
2016-02-05 18:47       ` Michael Brand
2016-02-05 22:43         ` Nicolas Goaziou
2016-02-06  8:08           ` Michael Brand
2016-02-06 16:41             ` Nicolas Goaziou
2016-02-07 10:13               ` Michael Brand
2016-02-07 11:06                 ` Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CALn3zogu6B+Lb7CKU6Nd7ni9-gN4utrWnBt-Wgg83+GQWtieTw@mail.gmail.com \
    --to=michael.ch.brand@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=j.cubizolles@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).