diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-05-19 10:25:19 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-05-19 10:25:19 +0200 |
| commit | 584b869d380dd34ecd69086d67f4c8ac0b600786 (patch) | |
| tree | 7604fd7b015193d6f22c7b1c57dfd40b287b298b | |
| parent | 595d45128013be45602945986ca4f846e63ae6e8 (diff) | |
| download | org-mode-584b869d380dd34ecd69086d67f4c8ac0b600786.tar.gz | |
org-exp.el: Allow to use #+include with no column.
* org-exp.el (org-export-handle-include-files): Allow to use
#+include with no column.
Thanks to Albert for spotting this.
| -rw-r--r-- | lisp/org-exp.el | 2 | ||||
| -rw-r--r-- | lisp/org-publish.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 9aac321..d09e4e2 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2412,7 +2412,7 @@ TYPE must be a string, any of: (let ((case-fold-search t) params file markup lang start end prefix prefix1 switches all minlevel currentlevel addlevel lines) (goto-char (point-min)) - (while (re-search-forward "^#\\+INCLUDE:?[ \t]+\\(.*\\)" nil t) + (while (re-search-forward "^#\\+include:?[ \t]+\\(.*\\)" nil t) (setq params (read (concat "(" (match-string 1) ")")) prefix (org-get-and-remove-property 'params :prefix) prefix1 (org-get-and-remove-property 'params :prefix1) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index cfd81f0..9ba7159 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -1122,7 +1122,7 @@ so that the file including them will be republished as well." (setq buf (find-file (expand-file-name filename))) (with-current-buffer buf (goto-char (point-min)) - (while (re-search-forward "^#\\+include:[ \t]+\"\\([^\t\n\r\"]*\\)\"[ \t]*.*$" nil t) + (while (re-search-forward "^#\\+include:?[ \t]+\"\\([^\t\n\r\"]*\\)\"[ \t]*.*$" nil t) (let* ((included-file (expand-file-name (match-string 1)))) (add-to-list 'included-files-ctime (org-publish-cache-ctime-of-src included-file) t)))) |