mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 18:16:27 +00:00
Code Releases Activity

Check argument is a string before calling string-match

Browse source 
* lisp/org-html.el (org-export-as-html): Check string-match argument
(org-html-handle-time-stamps): Check string-match argument

Avoid wrong-type-argument errors during exporting.
This commit is contained in:
Bernt Hansen 2011-09-20 04:20:02 +00:00 committed by Carsten Dominik
parent aefd49b909
commit 106993d310
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lisp/org-html.el
View file

@ -1598,7 +1598,8 @@ lang=\"%s\" xml:lang=\"%s\">
(setq line (org-html-handle-links line opt-plist))
;; TODO items
(if (and (string-match org-todo-line-regexp line)
(if (and org-todo-line-regexp
(string-match org-todo-line-regexp line)
(match-beginning 2))
(setq line
@ -2213,19 +2214,20 @@ for further information."
"Format time stamps in string S, or remove them."
(catch 'exit
(let (r b)
(while (string-match org-maybe-keyword-time-regexp s)
(or b (setq b (substring s 0 (match-beginning 0))))
(setq r (concat
r (substring s 0 (match-beginning 0))
" @<span class=\"timestamp-wrapper\">"
(if (match-end 1)
(format "@<span class=\"timestamp-kwd\">%s @</span>"
(match-string 1 s)))
(format " @<span class=\"timestamp\">%s@</span>"
(substring
(org-translate-time (match-string 3 s)) 1 -1))
"@</span>")
s (substring s (match-end 0))))
(when org-maybe-keyword-time-regexp
(while (string-match org-maybe-keyword-time-regexp s)
(or b (setq b (substring s 0 (match-beginning 0))))
(setq r (concat
r (substring s 0 (match-beginning 0))
" @<span class=\"timestamp-wrapper\">"
(if (match-end 1)
(format "@<span class=\"timestamp-kwd\">%s @</span>"
(match-string 1 s)))
(format " @<span class=\"timestamp\">%s@</span>"
(substring
(org-translate-time (match-string 3 s)) 1 -1))
"@</span>")
s (substring s (match-end 0)))))
;; Line break if line started and ended with time stamp stuff
(if (not r)
s