diff options
| author | David Maus <dmaus@ictsoc.de> | 2011-08-10 18:18:06 +0200 |
|---|---|---|
| committer | David Maus <dmaus@ictsoc.de> | 2011-08-10 18:18:06 +0200 |
| commit | 14b556772be6245e427cc2f5317680dfeb7b4c74 (patch) | |
| tree | 6de6e29a0a70f2834eba17b28443471bb88f55f9 | |
| parent | fc572f5a6bb3547c59fdad6ff7497ef2ecb49900 (diff) | |
| parent | b5b4134d0c5e3014d8717d860a5570ebc5256681 (diff) | |
| download | org-mode-14b556772be6245e427cc2f5317680dfeb7b4c74.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | lisp/org-inlinetask.el | 4 | ||||
| -rw-r--r-- | lisp/org.el | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index 270b99a..c9a612c 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -333,7 +333,9 @@ Either remove headline and meta data, or do special formatting." ;; Remove the task. (goto-char beg) (delete-region beg end) - (when org-inlinetask-export + (when (and org-inlinetask-export + (assq org-export-current-backend + org-inlinetask-export-templates)) ;; Format CONTENT, if appropriate. (setq content (if (not (and content (string-match "\\S-" content))) diff --git a/lisp/org.el b/lisp/org.el index 37155f6..4db12d5 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19460,10 +19460,14 @@ If point is in an inline task, mark that task instead." (save-excursion (re-search-backward "^[ \t]*#\\+begin_\\([a-z]+\\)" nil t)) (setq column - (if (equal (downcase (match-string 1)) "src") - ;; src blocks: let `org-edit-src-exit' handle them - (org-get-indentation) - (org-get-indentation (match-string 0))))) + (cond ((equal (downcase (match-string 1)) "src") + ;; src blocks: let `org-edit-src-exit' handle them + (org-get-indentation)) + ((equal (downcase (match-string 1)) "example") + (max (org-get-indentation) + (org-get-indentation (match-string 0)))) + (t + (org-get-indentation (match-string 0)))))) ;; This line has nothing special, look at the previous relevant ;; line to compute indentation (t |