mirror of https://github.com/djcb/mu.git
mu4e: clean up org-handling
Load org support by default, unless mu4e-org-support is set to nil. Turn off speedbar support by default (set mu4e-speedbar-support to t to re-enable it). Move the non-obsolete org stuff to mu4e-org. Rename some things from org-mu4e to mu4e-org. Remove org-old-mu4e.el
This commit is contained in:
Dirk-Jan C. Binnema
parent
9d6f51b769
commit
0bc2e605a4
|
|
@ -34,18 +34,17 @@ dist_lisp_LISP= \
|
||||||
mu4e-mark.el \
|
mu4e-mark.el \
|
||||||
mu4e-message.el \
|
mu4e-message.el \
|
||||||
mu4e-meta.el \
|
mu4e-meta.el \
|
||||||
|
mu4e-org.el \
|
||||||
mu4e-proc.el \
|
mu4e-proc.el \
|
||||||
mu4e-speedbar.el \
|
mu4e-speedbar.el \
|
||||||
mu4e-utils.el \
|
mu4e-utils.el \
|
||||||
mu4e-vars.el \
|
mu4e-vars.el \
|
||||||
mu4e-view.el \
|
mu4e-view.el \
|
||||||
mu4e.el \
|
mu4e.el \
|
||||||
org-mu4e.el \
|
org-mu4e.el
|
||||||
org-old-mu4e.el
|
|
||||||
|
|
||||||
EXTRA_DIST= \
|
EXTRA_DIST= \
|
||||||
mu4e-about.org \
|
mu4e-about.org
|
||||||
org-old-mu4e.el
|
|
||||||
|
|
||||||
CLEANFILES= \
|
CLEANFILES= \
|
||||||
*.elc
|
*.elc
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,8 @@
|
||||||
|
|
||||||
;; Some user-contributed functions for mu4e
|
;; Some user-contributed functions for mu4e
|
||||||
|
|
||||||
|
|
||||||
;; Contributed by sabof
|
;; Contributed by sabof
|
||||||
|
|
||||||
(require 'mu4e)
|
|
||||||
|
|
||||||
(defvar bookmark-make-record-function)
|
(defvar bookmark-make-record-function)
|
||||||
|
|
||||||
(defun mu4e-headers-mark-all-unread-read ()
|
(defun mu4e-headers-mark-all-unread-read ()
|
||||||
|
|
@ -129,7 +127,7 @@ For example for bogofile, use \"/usr/bin/bogofilter -Sn < %s\"")
|
||||||
"Mark message as spam."
|
"Mark message as spam."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let* ((path (shell-quote-argument (mu4e-message-field msg :path)))
|
(let* ((path (shell-quote-argument (mu4e-message-field msg :path)))
|
||||||
(command (format mu4e-register-as-spam-cmd path))) ;; re-register msg as spam
|
(command (format mu4e-register-as-spam-cmd path))) ;; re-register msg as spam
|
||||||
(shell-command command))
|
(shell-command command))
|
||||||
(mu4e-mark-at-point 'delete nil))
|
(mu4e-mark-at-point 'delete nil))
|
||||||
|
|
||||||
|
|
@ -140,7 +138,7 @@ For example for bogofile, use \"/usr/bin/bogofilter -Sn < %s\"")
|
||||||
(command (format mu4e-register-as-ham-cmd path))) ;; re-register msg as ham
|
(command (format mu4e-register-as-ham-cmd path))) ;; re-register msg as ham
|
||||||
(shell-command command))
|
(shell-command command))
|
||||||
(mu4e-mark-at-point 'something nil))
|
(mu4e-mark-at-point 'something nil))
|
||||||
|
|
||||||
;; (add-to-list 'mu4e-view-actions
|
;; (add-to-list 'mu4e-view-actions
|
||||||
;; '("sMark as spam" . mu4e-view-register-msg-as-spam) t)
|
;; '("sMark as spam" . mu4e-view-register-msg-as-spam) t)
|
||||||
;; (add-to-list 'mu4e-view-actions
|
;; (add-to-list 'mu4e-view-actions
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(require 'mu4e)
|
|
||||||
(require 'gnus-icalendar)
|
(require 'gnus-icalendar)
|
||||||
(require 'cl-lib)
|
(require 'cl-lib)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,16 @@ change until after quitting."
|
||||||
:safe 'stringp
|
:safe 'stringp
|
||||||
:group 'mu4e)
|
:group 'mu4e)
|
||||||
|
|
||||||
|
(defcustom mu4e-org-support t
|
||||||
|
"Support org-mode links."
|
||||||
|
:type 'boolean
|
||||||
|
:group 'mu4e)
|
||||||
|
|
||||||
|
(defcustom mu4e-speedbar-support nil
|
||||||
|
"Support having a speedbar to navigate folders/bookmarks."
|
||||||
|
:type 'boolean
|
||||||
|
:group 'mu4e)
|
||||||
|
|
||||||
(defcustom mu4e-get-mail-command "true"
|
(defcustom mu4e-get-mail-command "true"
|
||||||
"Shell command to run to retrieve new mail.
|
"Shell command to run to retrieve new mail.
|
||||||
Common values are \"offlineimap\", \"fetchmail\" or \"mbsync\", but
|
Common values are \"offlineimap\", \"fetchmail\" or \"mbsync\", but
|
||||||
|
|
@ -70,6 +80,8 @@ already retrieved in another way."
|
||||||
:group 'mu4e
|
:group 'mu4e
|
||||||
:safe 'stringp)
|
:safe 'stringp)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defcustom mu4e-index-update-error-warning t
|
(defcustom mu4e-index-update-error-warning t
|
||||||
"Whether to display warnings during the retrieval process.
|
"Whether to display warnings during the retrieval process.
|
||||||
This depends on the `mu4e-get-mail-command' exit code."
|
This depends on the `mu4e-get-mail-command' exit code."
|
||||||
|
|
|
||||||
10
mu4e/mu4e.el
10
mu4e/mu4e.el
|
|
@ -1,6 +1,6 @@
|
||||||
;;; mu4e.el --- part of mu4e, the mu mail user agent -*- lexical-binding: t -*-
|
;;; mu4e.el --- part of mu4e, the mu mail user agent -*- lexical-binding: t -*-
|
||||||
;;
|
;;
|
||||||
;; Copyright (C) 2011-2016 Dirk-Jan C. Binnema
|
;; Copyright (C) 2011-2019 Dirk-Jan C. Binnema
|
||||||
|
|
||||||
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
||||||
;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
||||||
|
|
@ -25,8 +25,7 @@
|
||||||
;;; Commentary:
|
;;; Commentary:
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
(require 'mu4e-vars)
|
||||||
(require 'mu4e-meta) ;; autogenerated file with metadata (version etc.)
|
|
||||||
(require 'mu4e-headers) ;; headers view
|
(require 'mu4e-headers) ;; headers view
|
||||||
(require 'mu4e-view) ;; message view
|
(require 'mu4e-view) ;; message view
|
||||||
(require 'mu4e-main) ;; main screen
|
(require 'mu4e-main) ;; main screen
|
||||||
|
|
@ -34,8 +33,11 @@
|
||||||
(require 'mu4e-proc) ;; communication with backend
|
(require 'mu4e-proc) ;; communication with backend
|
||||||
(require 'mu4e-utils) ;; utility functions
|
(require 'mu4e-utils) ;; utility functions
|
||||||
(require 'mu4e-context) ;; support for contexts
|
(require 'mu4e-context) ;; support for contexts
|
||||||
(require 'mu4e-speedbar) ;; support for speedbar
|
|
||||||
|
|
||||||
|
(when mu4e-speedbar-support
|
||||||
|
(require 'mu4e-speedbar)) ;; support for speedbar
|
||||||
|
(when mu4e-org-support
|
||||||
|
(require 'mu4e-org)) ;; support for org-mode links
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; we can't properly use compose buffers that are revived using
|
;; we can't properly use compose buffers that are revived using
|
||||||
|
|
|
||||||
|
|
@ -3232,34 +3232,27 @@ you can do so by adding the following to your configuration:
|
||||||
@section Org-mode links
|
@section Org-mode links
|
||||||
|
|
||||||
It can be useful to include links to e-mail messages or even search
|
It can be useful to include links to e-mail messages or even search
|
||||||
queries in your org-mode files. @t{mu4e} supports this with the
|
queries in your org-mode files. @t{mu4e} supports this by default,
|
||||||
@t{org-mu4e} module; you can set it up by adding it to your
|
unless you set @t{mu4e-support-org} to @code{nil}.
|
||||||
configuration, which expects org-mode 8.x. or higher@footnote{If you
|
|
||||||
have an older version, you can try using @t{org-old-mu4e} instead}.
|
|
||||||
|
|
||||||
@lisp
|
You can use the normal @t{org-mode} mechanisms to store links:
|
||||||
(require 'org-mu4e)
|
@kbd{M-x org-store-link} stores a link to a particular message when
|
||||||
@end lisp
|
you are in @ref{Message view}. When you are in @ref{Headers view},
|
||||||
|
|
||||||
@noindent
|
|
||||||
After this, you can use the normal @t{org-mode} mechanisms to store
|
|
||||||
links: @kbd{M-x org-store-link} stores a link to a particular message
|
|
||||||
when you are in @ref{Message view}. When you are in @ref{Headers view},
|
|
||||||
@kbd{M-x org-store-link} links to the @emph{query} if
|
@kbd{M-x org-store-link} links to the @emph{query} if
|
||||||
@code{org-mu4e-link-query-in-headers-mode} is non-@code{nil}, and to the
|
@code{mu4e-org-link-query-in-headers-mode} is non-@code{nil}, and to
|
||||||
particular message otherwise (which is the default).
|
the particular message otherwise (which is the default).
|
||||||
|
|
||||||
You can insert this link later with @kbd{M-x org-insert-link}. From
|
You can insert this link later with @kbd{M-x org-insert-link}. From
|
||||||
@t{org-mode}, you can go to the query or message the link points to with
|
@t{org-mode}, you can go to the query or message the link points to with
|
||||||
either @kbd{M-x org-agenda-open-link} in agenda buffers, or @kbd{M-x
|
either @kbd{M-x org-agenda-open-link} in agenda buffers, or @kbd{M-x
|
||||||
org-open-at-point} elsewhere --- both typically bound to @kbd{C-c C-o}.
|
org-open-at-point} elsewhere --- both typically bound to @kbd{C-c C-o}.
|
||||||
|
|
||||||
You can also directly @emph{capture} such links --- for example, to add
|
You can also directly @emph{capture} such links --- for example, to
|
||||||
e-mail messages to your todo-list. For that, @t{org-mu4e} has a function
|
add e-mail messages to your todo-list. For that, @t{org-mu4e} has a
|
||||||
@code{org-mu4e-store-and-capture}. This captures the message-at-point
|
function @code{mu4e-org-store-and-capture}. This captures the
|
||||||
(or header --- see the discussion on
|
message-at-point (or header --- see the discussion on
|
||||||
@code{org-mu4e-link-query-in-headers-mode} above), then calls org-mode's
|
@code{mu4e-org-link-query-in-headers-mode} above), then calls
|
||||||
capture functionality.
|
@t{org-mode}'s capture functionality.
|
||||||
|
|
||||||
You can add some specific capture-template for this: for example, to add
|
You can add some specific capture-template for this: for example, to add
|
||||||
a message to your todo-list, and set a deadline for processing it within
|
a message to your todo-list, and set a deadline for processing it within
|
||||||
|
|
|
||||||
124
mu4e/org-mu4e.el
124
mu4e/org-mu4e.el
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
;; The expect version here is org 8.x
|
;; The expect version here is org 8.x
|
||||||
(require 'org)
|
(require 'org)
|
||||||
|
(require 'mu4e-compose)
|
||||||
|
|
||||||
(declare-function mu4e-last-query "mu4e-headers")
|
(declare-function mu4e-last-query "mu4e-headers")
|
||||||
(declare-function mu4e-message-at-point "mu4e-message")
|
(declare-function mu4e-message-at-point "mu4e-message")
|
||||||
|
|
@ -39,125 +40,7 @@
|
||||||
(declare-function mu4e-message "mu4e-message")
|
(declare-function mu4e-message "mu4e-message")
|
||||||
(declare-function mu4e-compose-mode "mu4e-compose")
|
(declare-function mu4e-compose-mode "mu4e-compose")
|
||||||
|
|
||||||
(defvar org-export-skip-text-before-1st-heading)
|
|
||||||
(defvar org-export-htmlize-output-type)
|
|
||||||
(defvar org-export-preserve-breaks)
|
|
||||||
(defvar org-export-with-LaTeX-fragments)
|
|
||||||
|
|
||||||
(defgroup org-mu4e nil
|
|
||||||
"Settings for the org-mode related functionality in mu4e."
|
|
||||||
:group 'mu4e
|
|
||||||
:group 'org)
|
|
||||||
|
|
||||||
(defvar org-mu4e-link-query-in-headers-mode nil
|
|
||||||
"Prefer linking to the query rather than to the message.
|
|
||||||
If non-nil, `org-store-link' in `mu4e-headers-mode' links to the
|
|
||||||
the current query; otherwise, it links to the message at point.")
|
|
||||||
|
|
||||||
(defcustom org-mu4e-link-desc-func
|
|
||||||
(lambda (msg) (or (plist-get msg :subject) "No subject"))
|
|
||||||
"Function that takes a msg and returns a description.
|
|
||||||
This can be use in org capture templates.
|
|
||||||
|
|
||||||
Example usage:
|
|
||||||
|
|
||||||
(defun my-link-descr (msg)
|
|
||||||
(let ((subject (or (plist-get msg :subject)
|
|
||||||
\"No subject\"))
|
|
||||||
(date (or (format-time-string mu4e-headers-date-format
|
|
||||||
(mu4e-msg-field msg :date))
|
|
||||||
\"No date\")))
|
|
||||||
(concat subject \" \" date)))
|
|
||||||
|
|
||||||
(setq org-mu4e-link-desc-func 'my-link-descr)"
|
|
||||||
:type 'function
|
|
||||||
:group 'org-mu4e)
|
|
||||||
|
|
||||||
(defun org~mu4e-store-link-query ()
|
|
||||||
"Store a link to a mu4e query."
|
|
||||||
(let* ((query (mu4e-last-query))
|
|
||||||
(date (format-time-string (org-time-stamp-format)))
|
|
||||||
;; seems we get an error when there's no date...
|
|
||||||
(link (concat "mu4e:query:" query)))
|
|
||||||
(org-store-link-props
|
|
||||||
:type "mu4e"
|
|
||||||
:query query
|
|
||||||
:date date)
|
|
||||||
(org-add-link-props
|
|
||||||
:link link
|
|
||||||
:description (format "mu4e-query: '%s'" query))
|
|
||||||
link))
|
|
||||||
|
|
||||||
(defun org~mu4e-first-address (msg field)
|
|
||||||
"Get address field FIELD from MSG as a string or nil."
|
|
||||||
(let* ((val (plist-get msg field))
|
|
||||||
(name (when val (car (car val))))
|
|
||||||
(addr (when val (cdr (car val)))))
|
|
||||||
(when val
|
|
||||||
(if name
|
|
||||||
(format "%s <%s>" name addr)
|
|
||||||
(format "%s" addr)))))
|
|
||||||
|
|
||||||
(defun org~mu4e-store-link-message ()
|
|
||||||
"Store a link to a mu4e message."
|
|
||||||
(let* ((msg (mu4e-message-at-point))
|
|
||||||
(msgid (or (plist-get msg :message-id) "<none>"))
|
|
||||||
(date (plist-get msg :date))
|
|
||||||
(date (format-time-string (org-time-stamp-format) date))
|
|
||||||
;; seems we get an error when there's no date...
|
|
||||||
(link (concat "mu4e:msgid:" msgid)))
|
|
||||||
(org-store-link-props
|
|
||||||
:type "mu4e"
|
|
||||||
:message-id msgid
|
|
||||||
:to (org~mu4e-first-address msg :to)
|
|
||||||
:from (org~mu4e-first-address msg :from)
|
|
||||||
:date date
|
|
||||||
:subject (plist-get msg :subject))
|
|
||||||
(org-add-link-props
|
|
||||||
:link link
|
|
||||||
:description (funcall org-mu4e-link-desc-func msg))
|
|
||||||
link))
|
|
||||||
|
|
||||||
(defun org-mu4e-store-link ()
|
|
||||||
"Store a link to a mu4e message or query.
|
|
||||||
It links to the last known query when in `mu4e-headers-mode' with
|
|
||||||
`org-mu4e-link-query-in-headers-mode' set; otherwise it links to
|
|
||||||
a specific message, based on its message-id, so that links stay
|
|
||||||
valid even after moving the message around."
|
|
||||||
(if (and (eq major-mode 'mu4e-headers-mode)
|
|
||||||
org-mu4e-link-query-in-headers-mode)
|
|
||||||
(org~mu4e-store-link-query)
|
|
||||||
(when (mu4e-message-at-point t)
|
|
||||||
(org~mu4e-store-link-message))))
|
|
||||||
|
|
||||||
;; org-add-link-type is obsolete as of org-mode 9.
|
|
||||||
;; Instead we will use the org-link-set-parameters method
|
|
||||||
(if (fboundp 'org-link-set-parameters)
|
|
||||||
(org-link-set-parameters "mu4e"
|
|
||||||
:follow #'org-mu4e-open
|
|
||||||
:store #'org-mu4e-store-link)
|
|
||||||
(org-add-link-type "mu4e" 'org-mu4e-open)
|
|
||||||
(add-hook 'org-store-link-functions 'org-mu4e-store-link))
|
|
||||||
|
|
||||||
(defun org-mu4e-open (link)
|
|
||||||
"Open the org LINK.
|
|
||||||
Open the mu4e message (for links starting with 'msgid:') or run
|
|
||||||
the query (for links starting with 'query:')."
|
|
||||||
(require 'mu4e)
|
|
||||||
(cond
|
|
||||||
((string-match "^msgid:\\(.+\\)" link)
|
|
||||||
(mu4e-view-message-with-message-id (match-string 1 link)))
|
|
||||||
((string-match "^query:\\(.+\\)" link)
|
|
||||||
(mu4e-headers-search (match-string 1 link) current-prefix-arg))
|
|
||||||
(t (mu4e-error "Unrecognized link type '%s'" link))))
|
|
||||||
|
|
||||||
(defun org-mu4e-store-and-capture ()
|
|
||||||
"Store a link to the current message or query.
|
|
||||||
\(depending on `org-mu4e-link-query-in-headers-mode', and capture
|
|
||||||
it with org)."
|
|
||||||
(interactive)
|
|
||||||
(call-interactively 'org-store-link)
|
|
||||||
(org-capture))
|
|
||||||
|
|
||||||
|
|
||||||
;;; editing with org-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;; editing with org-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
@ -167,6 +50,11 @@ it with org)."
|
||||||
;; Homepage: http://orgmode.org/worg/org-contrib/org-mime.php
|
;; Homepage: http://orgmode.org/worg/org-contrib/org-mime.php
|
||||||
;;
|
;;
|
||||||
;; EXPERIMENTAL
|
;; EXPERIMENTAL
|
||||||
|
(defvar org-export-skip-text-before-1st-heading)
|
||||||
|
(defvar org-export-htmlize-output-type)
|
||||||
|
(defvar org-export-preserve-breaks)
|
||||||
|
(defvar org-export-with-LaTeX-fragments)
|
||||||
|
|
||||||
(defun org~mu4e-mime-file (ext path id)
|
(defun org~mu4e-mime-file (ext path id)
|
||||||
"Create a file of type EXT at PATH with ID for an attachment."
|
"Create a file of type EXT at PATH with ID for an attachment."
|
||||||
(format (concat "<#part type=\"%s\" filename=\"%s\" "
|
(format (concat "<#part type=\"%s\" filename=\"%s\" "
|
||||||
|
|
|
||||||
|
|
@ -1,294 +0,0 @@
|
||||||
;;; org-mu4e -- Support for links to mu4e messages/queries from within org-mode, -*- lexical-binding: t -*-
|
|
||||||
;;; and for writing message in org-mode, sending them as rich-text
|
|
||||||
;;
|
|
||||||
;; Copyright (C) 2012-2016 Dirk-Jan C. Binnema
|
|
||||||
|
|
||||||
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
|
||||||
;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
|
||||||
;; Keywords: outlines, hypermedia, calendar, mail
|
|
||||||
;; Version: 0.0
|
|
||||||
|
|
||||||
;; This file is not part of GNU Emacs.
|
|
||||||
;;
|
|
||||||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
||||||
;; it under the terms of the GNU General Public License as published by
|
|
||||||
;; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
;; (at your option) any later version.
|
|
||||||
|
|
||||||
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
||||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
;; GNU General Public License for more details.
|
|
||||||
|
|
||||||
;; You should have received a copy of the GNU General Public License
|
|
||||||
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
;;; Commentary:
|
|
||||||
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
;; This should support org-mode versions 6.x. 7.x
|
|
||||||
|
|
||||||
;; the 'noerror is just to make sure bytecompilations does not break...
|
|
||||||
;; FIXME: find a better solution
|
|
||||||
(require 'org nil 'noerror)
|
|
||||||
(require 'org-exp nil 'noerror)
|
|
||||||
|
|
||||||
(defvar org-export-skip-text-before-1st-heading)
|
|
||||||
(defvar org-export-htmlize-output-type)
|
|
||||||
(defvar org-export-preserve-breaks)
|
|
||||||
(defvar org-export-with-LaTeX-fragments)
|
|
||||||
|
|
||||||
(require 'mu4e)
|
|
||||||
|
|
||||||
(defgroup org-mu4e nil
|
|
||||||
"Settings for the org-mode related functionality in mu4e."
|
|
||||||
:group 'mu4e
|
|
||||||
:group 'org)
|
|
||||||
|
|
||||||
(defcustom org-mu4e-link-desc-func
|
|
||||||
(lambda (msg) (or (plist-get msg :subject) "No subject"))
|
|
||||||
"Function that takes a msg and returns a string for the
|
|
||||||
description part of an org-mode link.
|
|
||||||
|
|
||||||
Example usage:
|
|
||||||
|
|
||||||
(defun my-link-descr (msg)
|
|
||||||
(let ((subject (or (plist-get msg :subject)
|
|
||||||
\"No subject\"))
|
|
||||||
(date (or (format-time-string mu4e-headers-date-format
|
|
||||||
(mu4e-msg-field msg :date))
|
|
||||||
\"No date\")))
|
|
||||||
(concat subject \" \" date)))
|
|
||||||
|
|
||||||
(setq org-mu4e-link-desc-func 'my-link-descr)"
|
|
||||||
:type 'function
|
|
||||||
:group 'org-mu4e)
|
|
||||||
|
|
||||||
(defun org-mu4e-store-link ()
|
|
||||||
"Store a link to a mu4e query or message."
|
|
||||||
(cond
|
|
||||||
;; storing links to queries
|
|
||||||
((eq major-mode 'mu4e-headers-mode)
|
|
||||||
(let* ((query (mu4e-last-query))
|
|
||||||
desc link)
|
|
||||||
(org-store-link-props :type "mu4e" :query query)
|
|
||||||
(setq
|
|
||||||
desc (concat "mu4e:query:" query)
|
|
||||||
link desc)
|
|
||||||
(org-add-link-props :link link :description desc)
|
|
||||||
link))
|
|
||||||
;; storing links to messages
|
|
||||||
((eq major-mode 'mu4e-view-mode)
|
|
||||||
(let* ((msg (mu4e-message-at-point))
|
|
||||||
(msgid (or (plist-get msg :message-id) "<none>"))
|
|
||||||
link)
|
|
||||||
(org-store-link-props :type "mu4e" :link link
|
|
||||||
:message-id msgid)
|
|
||||||
(setq link (concat "mu4e:msgid:" msgid))
|
|
||||||
(org-add-link-props :link link
|
|
||||||
:description (funcall org-mu4e-link-desc-func msg))
|
|
||||||
link))))
|
|
||||||
|
|
||||||
(org-add-link-type "mu4e" 'org-mu4e-open)
|
|
||||||
(add-hook 'org-store-link-functions 'org-mu4e-store-link)
|
|
||||||
|
|
||||||
(defun org-mu4e-open (path)
|
|
||||||
"Open the mu4e message (for paths starting with 'msgid:') or run
|
|
||||||
the query (for paths starting with 'query:')."
|
|
||||||
(require 'mu4e)
|
|
||||||
(cond
|
|
||||||
((string-match "^msgid:\\(.+\\)" path)
|
|
||||||
(mu4e-view-message-with-message-id (match-string 1 path)))
|
|
||||||
((string-match "^query:\\(.+\\)" path)
|
|
||||||
(mu4e-headers-search (match-string 1 path) current-prefix-arg))
|
|
||||||
(t (mu4e-error "mu4e: unrecognized link type '%s'" path))))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;; editing with org-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
;; below, some functions for the org->html conversion
|
|
||||||
;; based on / inspired by Eric Schulte's org-mime.el
|
|
||||||
;; Homepage: http://orgmode.org/worg/org-contrib/org-mime.php
|
|
||||||
;;
|
|
||||||
;; EXPERIMENTAL
|
|
||||||
(defun org~mu4e-mime-file (ext path id)
|
|
||||||
"Create a file for an attachment."
|
|
||||||
(format (concat "<#part type=\"%s\" filename=\"%s\" "
|
|
||||||
"disposition=inline id=\"<%s>\">\n<#/part>\n")
|
|
||||||
ext path id))
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-multipart (plain html &optional images)
|
|
||||||
"Create a multipart/alternative with text/plain and text/html alternatives.
|
|
||||||
If the html portion of the message includes images, wrap the html
|
|
||||||
and images in a multipart/related part."
|
|
||||||
(concat "<#multipart type=alternative><#part type=text/plain>"
|
|
||||||
plain
|
|
||||||
(when images "<#multipart type=related>")
|
|
||||||
"<#part type=text/html>"
|
|
||||||
html
|
|
||||||
images
|
|
||||||
(when images "<#/multipart>\n")
|
|
||||||
"<#/multipart>\n"))
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-replace-images (str current-file)
|
|
||||||
"Replace images in html files with cid links."
|
|
||||||
(let (html-images)
|
|
||||||
(cons
|
|
||||||
(replace-regexp-in-string ;; replace images in html
|
|
||||||
"src=\"\\([^\"]+\\)\""
|
|
||||||
(lambda (text)
|
|
||||||
(format
|
|
||||||
"src=\"cid:%s\""
|
|
||||||
(let* ((url (and (string-match "src=\"\\([^\"]+\\)\"" text)
|
|
||||||
(match-string 1 text)))
|
|
||||||
(path (expand-file-name
|
|
||||||
url (file-name-directory current-file)))
|
|
||||||
(ext (file-name-extension path))
|
|
||||||
(id (replace-regexp-in-string "[\/\\\\]" "_" path)))
|
|
||||||
(cl-pushnew (org~mu4e-mime-file
|
|
||||||
(concat "image/" ext) path id)
|
|
||||||
html-images
|
|
||||||
:test 'equal)
|
|
||||||
id)))
|
|
||||||
str)
|
|
||||||
html-images)))
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-convert-to-html ()
|
|
||||||
"Convert the current body to html."
|
|
||||||
(unless (fboundp 'org-export-string)
|
|
||||||
(mu4e-error "require function 'org-export-string not found."))
|
|
||||||
(unless (executable-find "dvipng")
|
|
||||||
(mu4e-error "Required program dvipng not found"))
|
|
||||||
(let* ((begin
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (point-min))
|
|
||||||
(search-forward mail-header-separator)))
|
|
||||||
(end (point-max))
|
|
||||||
(raw-body (buffer-substring begin end))
|
|
||||||
(tmp-file (make-temp-name (expand-file-name "mail"
|
|
||||||
temporary-file-directory)))
|
|
||||||
(body (org-export-string raw-body 'org
|
|
||||||
(file-name-directory tmp-file)))
|
|
||||||
;; because we probably don't want to skip part of our mail
|
|
||||||
(org-export-skip-text-before-1st-heading nil)
|
|
||||||
;; because we probably don't want to export a huge style file
|
|
||||||
(org-export-htmlize-output-type 'inline-css)
|
|
||||||
;; makes the replies with ">"s look nicer
|
|
||||||
(org-export-preserve-breaks t)
|
|
||||||
;; dvipng for inline latex because MathJax doesn't work in mail
|
|
||||||
(org-export-with-LaTeX-fragments 'dvipng)
|
|
||||||
;; to hold attachments for inline html images
|
|
||||||
(html-and-images
|
|
||||||
(org~mu4e-mime-replace-images
|
|
||||||
(org-export-string raw-body 'html
|
|
||||||
(file-name-directory tmp-file))
|
|
||||||
tmp-file))
|
|
||||||
(html-images (cdr html-and-images))
|
|
||||||
(html (car html-and-images)))
|
|
||||||
(delete-region begin end)
|
|
||||||
(save-excursion
|
|
||||||
(goto-char begin)
|
|
||||||
(newline)
|
|
||||||
(insert (org~mu4e-mime-multipart
|
|
||||||
body html (mapconcat 'identity html-images "\n"))))))
|
|
||||||
|
|
||||||
;; next some functions to make the org/mu4e-compose-mode switch as smooth as
|
|
||||||
;; possible.
|
|
||||||
(defun org~mu4e-mime-decorate-headers ()
|
|
||||||
"Make the headers visually distinctive (org-mode)."
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (point-min))
|
|
||||||
(let* ((eoh (when (search-forward mail-header-separator)
|
|
||||||
(match-end 0)))
|
|
||||||
(olay (make-overlay (point-min) eoh)))
|
|
||||||
(when olay
|
|
||||||
(overlay-put olay 'face 'font-lock-comment-face)))))
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-undecorate-headers ()
|
|
||||||
"Don't make the headers visually distinctive.
|
|
||||||
\(well, mu4e-compose-mode will take care of that)."
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (point-min))
|
|
||||||
(let* ((eoh (when (search-forward mail-header-separator)
|
|
||||||
(match-end 0))))
|
|
||||||
(remove-overlays (point-min) eoh))))
|
|
||||||
|
|
||||||
(defvar org-mu4e-convert-to-html nil
|
|
||||||
"Whether to do automatic org-mode => html conversion when sending messages.")
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-convert-to-html-maybe ()
|
|
||||||
"Convert to html if `org-mu4e-convert-to-html' is non-nil.
|
|
||||||
This function is called when sending a message (from
|
|
||||||
`message-send-hook') and, if non-nil, will send the message as
|
|
||||||
the rich-text version of the what is assumed to be an org-mode
|
|
||||||
body."
|
|
||||||
(when org-mu4e-convert-to-html
|
|
||||||
(mu4e-message "Converting to html")
|
|
||||||
(org~mu4e-mime-convert-to-html)))
|
|
||||||
|
|
||||||
(defun org~mu4e-mime-switch-headers-or-body ()
|
|
||||||
"Switch the buffer to either mu4e-compose-mode (when in headers)
|
|
||||||
or org-mode (when in the body)."
|
|
||||||
(interactive)
|
|
||||||
(let* ((sepapoint
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (point-min))
|
|
||||||
(search-forward-regexp mail-header-separator nil t))))
|
|
||||||
;; only do stuff when the sepapoint exist; note that after sending the
|
|
||||||
;; message, this function maybe called on a message with the sepapoint
|
|
||||||
;; stripped. This is why we don't use `message-point-in-header'.
|
|
||||||
(when sepapoint
|
|
||||||
(cond
|
|
||||||
;; we're in the body, but in mu4e-compose-mode?
|
|
||||||
;; if so, switch to org-mode
|
|
||||||
((and (> (point) sepapoint) (eq major-mode 'mu4e-compose-mode))
|
|
||||||
(org-mode)
|
|
||||||
(add-hook 'before-save-hook
|
|
||||||
(lambda ()
|
|
||||||
(mu4e-error "Switch to mu4e-compose-mode (M-m) before saving."))
|
|
||||||
nil t)
|
|
||||||
(org~mu4e-mime-decorate-headers)
|
|
||||||
(local-set-key (kbd "M-m")
|
|
||||||
(lambda (keyseq)
|
|
||||||
(interactive "kEnter mu4e-compose-mode key sequence: ")
|
|
||||||
(let ((func (lookup-key mu4e-compose-mode-map keyseq)))
|
|
||||||
(if func (funcall func) (insert keyseq))))))
|
|
||||||
;; we're in the headers, but in org-mode?
|
|
||||||
;; if so, switch to mu4e-compose-mode
|
|
||||||
((and (<= (point) sepapoint) (eq major-mode 'org-mode))
|
|
||||||
(org~mu4e-mime-undecorate-headers)
|
|
||||||
(mu4e-compose-mode)
|
|
||||||
(add-hook 'message-send-hook 'org~mu4e-mime-convert-to-html-maybe nil t)))
|
|
||||||
;; and add the hook
|
|
||||||
(add-hook 'post-command-hook 'org~mu4e-mime-switch-headers-or-body t t))))
|
|
||||||
|
|
||||||
|
|
||||||
(defun org-mu4e-compose-org-mode ()
|
|
||||||
"Pseudo-Minor mode for mu4e-compose-mode, to edit the message
|
|
||||||
body using org-mode."
|
|
||||||
(interactive)
|
|
||||||
(unless (member major-mode '(org-mode mu4e-compose-mode))
|
|
||||||
(mu4e-error "Need org-mode or mu4e-compose-mode"))
|
|
||||||
;; we can check if we're already in org-mu4e-compose-mode by checking if the
|
|
||||||
;; post-command-hook is set; hackish...but a buffer-local variable does not
|
|
||||||
;; seem to survive buffer switching
|
|
||||||
(if (not (member 'org~mu4e-mime-switch-headers-or-body post-command-hook))
|
|
||||||
(progn
|
|
||||||
(org~mu4e-mime-switch-headers-or-body)
|
|
||||||
(mu4e-message
|
|
||||||
(concat
|
|
||||||
"org-mu4e-compose-org-mode enabled; "
|
|
||||||
"press M-m before issuing message-mode commands")))
|
|
||||||
(progn ;; otherwise, remove crap
|
|
||||||
(remove-hook 'post-command-hook 'org~mu4e-mime-switch-headers-or-body t)
|
|
||||||
(org~mu4e-mime-undecorate-headers) ;; shut off org-mode stuff
|
|
||||||
(mu4e-compose-mode)
|
|
||||||
(message "org-mu4e-compose-org-mode disabled"))))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
(provide 'org-mu4e)
|
|
||||||
|
|
||||||
;;; org-mu4e.el ends here
|
|
||||||
Loading…
Reference in New Issue