From 584b869d380dd34ecd69086d67f4c8ac0b600786 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 19 May 2012 10:25:19 +0200 Subject: [PATCH] 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. --- lisp/org-exp.el | 2 +- 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 9aac3213e..d09e4e230 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 cfd81f0fe..9ba715954 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))))