ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2008-02-11 11:15:31 +01:00
parent 9292050d09 d6e4079615
commit b39a2ba572
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.el
View File

@ -24851,6 +24851,7 @@ the body tags themselves."
(org-infile-export-plist))) (org-infile-export-plist)))
(style (plist-get opt-plist :style)) (style (plist-get opt-plist :style))
(html-extension (plist-get opt-plist :html-extension))
(link-validate (plist-get opt-plist :link-validation-function)) (link-validate (plist-get opt-plist :link-validation-function))
valid thetoc have-headings first-heading-pos valid thetoc have-headings first-heading-pos
(odd org-odd-levels-only) (odd org-odd-levels-only)
@ -24876,7 +24877,7 @@ the body tags themselves."
(org-entry-get (region-beginning) (org-entry-get (region-beginning)
"EXPORT_FILE_NAME" t)) "EXPORT_FILE_NAME" t))
(file-name-nondirectory buffer-file-name))) (file-name-nondirectory buffer-file-name)))
"." org-export-html-extension) "." html-extension)
(file-name-as-directory (file-name-as-directory
(org-export-directory :html opt-plist))))) (org-export-directory :html opt-plist)))))
(current-dir (if buffer-file-name (current-dir (if buffer-file-name
@ -25232,7 +25233,7 @@ lang=\"%s\" xml:lang=\"%s\">
(string-match "\\.org$" thefile)) (string-match "\\.org$" thefile))
(setq thefile (concat (substring thefile 0 (setq thefile (concat (substring thefile 0
(match-beginning 0)) (match-beginning 0))
"." org-export-html-extension)) "." html-extension))
(if (and search (if (and search
;; make sure this is can be used as target search ;; make sure this is can be used as target search
(not (string-match "^[0-9]*$" search)) (not (string-match "^[0-9]*$" search))