From mboxrd@z Thu Jan 1 00:00:00 1970 From: Friedrich Delgado Friedrichs Subject: Re: org-infojs-handle-options fails when :infojs-opt is not in exp-list Date: Tue, 23 Dec 2008 12:14:40 +0100 Message-ID: <20081223111440.GA25702@taupan.ath.cx> References: <20081223104736.GA25075@taupan.ath.cx> <20081223105631.GA25285@taupan.ath.cx> Reply-To: friedel@nomaden.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="n8g4imXOkfNTN/H1" Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LF5Dq-0003rB-3g for emacs-orgmode@gnu.org; Tue, 23 Dec 2008 06:14:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LF5Do-0003qA-Lv for emacs-orgmode@gnu.org; Tue, 23 Dec 2008 06:14:45 -0500 Received: from [199.232.76.173] (port=51528 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LF5Do-0003q0-Gx for emacs-orgmode@gnu.org; Tue, 23 Dec 2008 06:14:44 -0500 Received: from dudelab.org ([212.12.33.202]:28515 helo=mail.dudelab.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LF5Dn-0007Ms-AF for emacs-orgmode@gnu.org; Tue, 23 Dec 2008 06:14:44 -0500 Received: from abrasax.taupan.ath.cx (p5B10C798.dip.t-dialin.net [91.16.199.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "Friedrich Delgado Friedrichs", Issuer "User CA" (verified OK)) by mail.dudelab.org (Postfix) with ESMTP id D19DA228148 for ; Tue, 23 Dec 2008 12:13:22 +0100 (CET) Content-Disposition: inline In-Reply-To: <20081223105631.GA25285@taupan.ath.cx> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Found the culprit :) org-jsinfo rocks :) -- Friedrich Delgado Friedrichs --n8g4imXOkfNTN/H1 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-fix-string-match-against-nil-when-no-in-file-options.patch" >From 0fef25f56c837ae9f434449c6f30268e0474f7ab Mon Sep 17 00:00:00 2001 From: Friedrich Delgado Friedrichs Date: Tue, 23 Dec 2008 12:10:42 +0100 Subject: [PATCH] fix string-match against nil when no in-file options are set for jsinfo --- lisp/org-jsinfo.el | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el index 8f2d7e8..19faa9e 100644 --- a/lisp/org-jsinfo.el +++ b/lisp/org-jsinfo.el @@ -140,7 +140,8 @@ Option settings will replace the %MANAGER-OPTIONS cookie." default (cdr (assoc opt org-infojs-options))) (and (symbolp default) (not (memq default '(t nil))) (setq default (plist-get exp-plist default))) - (if (string-match (format " %s:\\(\\S-+\\)" opt) v) + (if (and v + (string-match (format " %s:\\(\\S-+\\)" opt) v)) (setq val (match-string 1 v)) (setq val default)) (cond -- 1.6.0.2.526.g5c283.dirty --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Remember: use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --n8g4imXOkfNTN/H1--