diff options
| author | Bastien Guerry <bzg@altern.org> | 2011-01-14 20:08:47 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2011-01-14 20:08:47 +0100 |
| commit | 6ebd09177ee005b0028faf0db9bc4c12a7f1103e (patch) | |
| tree | e662eeac1872662bc42c1040438d0a5ee4fcab1f | |
| parent | 0bb05568452bdd0343ed32358f48ccd3b946983f (diff) | |
| parent | 079c4a026d74d7666ea6df80f0febb37547b90a5 (diff) | |
| download | org-mode-6ebd09177ee005b0028faf0db9bc4c12a7f1103e.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | contrib/lisp/org-mime.el | 13 | ||||
| -rw-r--r-- | doc/org.texi | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el index 83f4597..0c91894 100644 --- a/contrib/lisp/org-mime.el +++ b/contrib/lisp/org-mime.el @@ -55,6 +55,11 @@ ;;; Code: (require 'cl) +(defcustom org-mime-use-property-inheritance nil + "Non-nil means al MAIL_ properties apply also for sublevels." + :group 'org-mime + :type 'boolean) + (defcustom org-mime-default-header "#+OPTIONS: latex:t\n" "Default header to control html export options, and ensure @@ -232,9 +237,9 @@ export that region, otherwise export the entire body." (run-hooks 'org-mime-send-subtree-hook) (let* ((file (buffer-file-name (current-buffer))) (subject (nth 4 (org-heading-components))) - (to (org-entry-get nil "MAIL_TO" org-use-property-inheritance)) - (cc (org-entry-get nil "MAIL_CC" org-use-property-inheritance)) - (bcc (org-entry-get nil "MAIL_BCC" org-use-property-inheritance)) + (to (org-entry-get nil "MAIL_TO" org-mime-use-property-inheritance)) + (cc (org-entry-get nil "MAIL_CC" org-mime-use-property-inheritance)) + (bcc (org-entry-get nil "MAIL_BCC" org-mime-use-property-inheritance)) (body (buffer-substring (save-excursion (goto-char (point-min)) (forward-line 1) @@ -312,6 +317,6 @@ export that region, otherwise export the entire body." MAIL_FMT property of the subtree." (interactive) (org-mime-send-subtree - (or (org-entry-get nil "MAIL_FMT" org-use-property-inheritance) 'org))) + (or (org-entry-get nil "MAIL_FMT" org-use-mime-property-inheritance) 'org))) (provide 'org-mime) diff --git a/doc/org.texi b/doc/org.texi index 4d696ae..a30d5b6 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -13465,15 +13465,17 @@ fixed this problem: (define-key yas/keymap [tab] 'yas/next-field-group))) @end lisp -The latest version of yasnippets doesn't play well with Org mode. If the +The latest version of yasnippet doesn't play well with Org mode. If the above code does not fix the conflict, start by defining the following function: + @lisp (defun yas/org-very-safe-expand () (let ((yas/fallback-behavior 'return-nil)) (yas/expand))) @end lisp Then, tell Org mode what to do with the new function: + @lisp (add-hook 'org-mode-hook (lambda () |