From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Richard Subject: Re: org-element-context doesn't parse consistently link with spaces Date: Wed, 05 Mar 2014 17:27:50 +0100 Message-ID: <87siqwwqyh.fsf@yahoo.fr> References: <87wqgabb08.fsf@tanger.home> <87ha7clqz3.fsf@gmail.com> <87r46gahs2.fsf@tanger.home> <877g88lpwp.fsf@gmail.com> <87mwh4ag4y.fsf@tanger.home> <8738iwlo3c.fsf@gmail.com> <87ob1kpvm0.fsf@bzg.ath.cx> <87eh2gaf06.fsf@tanger.home> <87bnxkpu31.fsf@bzg.ath.cx> <871tygy7mx.fsf@yahoo.fr> <87k3c8lji8.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLEfb-0006Cd-8R for emacs-orgmode@gnu.org; Wed, 05 Mar 2014 11:27:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLEfW-0006mo-6C for emacs-orgmode@gnu.org; Wed, 05 Mar 2014 11:27:47 -0500 In-Reply-To: <87k3c8lji8.fsf@bzg.ath.cx> (Bastien's message of "Wed, 05 Mar 2014 17:04:15 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Bastien Cc: Daimrod , Nicolas Richard , emacs-orgmode@gnu.org Bastien writes: > Hi Nicolas, > > Nicolas Richard writes: > >> OTOH, I find it a bad idea that some arguments are ignored in >> non-interactive uses, it'd be better to have a function which fully >> obeys its arguments, and has an interactive spec which sets the >> argument. If you're interested I can do that. > > Of course I'm interested, thanks in advance! Could you review this ? thanks. From: Nicolas Richard Date: Wed, 5 Mar 2014 17:25:45 +0100 Subject: [PATCH] lisp/org.el (org-version): obey all arguments in non-interactive uses. --- lisp/org.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5c1b61e..11184cc 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -297,12 +297,11 @@ identifier." ;;;###autoload (defun org-version (&optional here full message) - "Show the org-mode version in the echo area. -With prefix argument HERE (this is ignored in non-interactive -uses), insert it at point. -When FULL is non-nil, use a verbose version string. -When MESSAGE is non-nil, display a message with the version." - (interactive "P") + "Show the org-mode version. +Interactively, or when MESSAGE is non-nil, show it in echo area. +With prefix argument, or when HERE is non-nil, insert it at point. +In non-interactive uses, a reduced version string is output unless FULL is given." + (interactive (list current-prefix-arg t (not current-prefix-arg))) (let* ((org-dir (ignore-errors (org-find-library-dir "org"))) (save-load-suffixes (when (boundp 'load-suffixes) load-suffixes)) (load-suffixes (list ".el")) @@ -322,12 +321,12 @@ When MESSAGE is non-nil, display a message with the version." (concat "mixed installation! " org-install-dir " and " org-dir)) "org-loaddefs.el can not be found!"))) (version1 (if full version org-version))) - (if (org-called-interactively-p 'interactive) - (if here - (insert version) - (message version)) - (if message (message version1)) - version1))) + (when here (insert version1)) + (when message (message "%s" version1)) + version1)) + + + (defconst org-version (org-version)) -- 1.8.3.2