org-mode/lisp
Carsten Dominik 41bd25b724 Bugfix: Protect string-match against nil string.
Friedrich Delgado Friedrichs writes:

A while ago I had this problem:
org-infojs-handle-options: Wrong type argument: stringp, nil

I wonder if my patch ever reached the mailing list, or if it
was overlooked because it was too close to christmas:

Friedrich Delgado Friedrichs schrieb:
From 0fef25f56c837ae9f434449c6f30268e0474f7ab Mon Sep 17 00:00:00 2001
From: Friedrich Delgado Friedrichs <delgado@dfn-cert.de>
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
2009-01-08 15:35:32 +01:00
..
ChangeLog Bugfix: Protect string-match against nil string. 2009-01-08 15:35:32 +01:00
ChangeLog.01 Split ChangeLog file into parts. 2008-05-08 08:16:38 +02:00
org-agenda.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-archive.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-attach.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-bbdb.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-bibtex.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-clock.el Maintenance: Rename some ill-named functions. 2009-01-08 11:19:37 +01:00
org-colview-xemacs.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-colview.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-compat.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-exp.el Export: Fix bugs with LaTeX export. 2009-01-08 14:25:26 +01:00
org-export-latex.el Export: Fix bugs with LaTeX export. 2009-01-08 14:25:26 +01:00
org-faces.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-footnote.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-gnus.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-id.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-info.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-irc.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-jsinfo.el Bugfix: Protect string-match against nil string. 2009-01-08 15:35:32 +01:00
org-list.el Editing: Automatic empty lines before new entries. 2009-01-08 09:30:55 +01:00
org-mac-message.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-macs.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-mew.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-mhe.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-mouse.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-plot.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-publish.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-remember.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-rmail.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-table.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-timer.el Maintenance: Define a variable. 2009-01-08 11:20:06 +01:00
org-vm.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-w3m.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org-wl.el Push version number to 6.17trans 2009-01-07 13:27:02 +01:00
org.el Maintenance: Rename some ill-named functions. 2009-01-08 11:19:37 +01:00