From c6c93234fbc4f6105d7a1cc65960bb3acb70767b Mon Sep 17 00:00:00 2001 From: Chen He Date: Sun, 7 Dec 2014 16:29:14 -0500 Subject: [PATCH 01/11] Fix build error in msgs-count.scm mu:run-stats expects the passed-in function to take 3 arguments. The third argument applies to gnuplot only, which is not applicable to the count function in msgs-count.scm. --- guile/scripts/msgs-count.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guile/scripts/msgs-count.scm b/guile/scripts/msgs-count.scm index 407421ef..923e3a58 100755 --- a/guile/scripts/msgs-count.scm +++ b/guile/scripts/msgs-count.scm @@ -26,8 +26,9 @@ exec guile -e main -s $0 $@ (use-modules (mu) (mu script) (mu stats)) -(define (count expr) - "Print the total number of messages matching QUERY." +(define (count expr output) + "Print the total number of messages matching the query EXPR. +OUTPUT is ignored." (display (mu:count expr)) (newline)) From 639db4036eb2a5f5ae100035719deb3edac8c06c Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Mon, 8 Dec 2014 21:27:48 -0800 Subject: [PATCH 02/11] Add a missing keybinding to doc for previous query --- mu4e/mu4e.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index b80e86d6..10e20554 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -837,7 +837,7 @@ S edit last query b search bookmark B edit bookmark before search j jump to maildir -M-left previous query +M-left,\ previous query M-right next query O change sort order From 9162e3e68c69c78a32849e355bf77a9f5b2cdce5 Mon Sep 17 00:00:00 2001 From: djcb Date: Wed, 10 Dec 2014 22:51:13 -0800 Subject: [PATCH 03/11] mu4e: mu4e-headers-find-if-next: move before search when searching for the next match, go the end of the current line; when searching for the previous match, go to the beginning of the current line. --- mu4e/mu4e-headers.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el index 702c7f0d..9fe11586 100644 --- a/mu4e/mu4e-headers.el +++ b/mu4e/mu4e-headers.el @@ -1008,11 +1008,13 @@ message, you can use `mu4e-headers-find-if-next'." (defun mu4e-headers-find-if-next (func &optional backwards) "Like `mu4e-headers-find-if', but do not match the current header. -Move to the next header for which FUNC returns non-`nil', starting -from the current position." +Move to the next or (if BACKWARDS is non-`nil') header for which FUNC +returns non-`nil', starting from the current position." (let ((pos)) (save-excursion - (forward-line (if backwards -1 1)) + (if backwards + (beginning-of-line) + (end-of-line)) (setq pos (mu4e-headers-find-if func backwards))) (when pos (goto-char pos)))) From c5987700e77dbd49bd124b97aa11db6b05c2bafb Mon Sep 17 00:00:00 2001 From: djcb Date: Wed, 10 Dec 2014 22:57:54 -0800 Subject: [PATCH 04/11] mu4e: org: allow customization of linking in headers mode Depending on org-mu4e-link-query-in-headers-mode, we can link to the query or the particular message. --- mu4e/mu4e.texi | 10 ++++++---- mu4e/org-mu4e.el | 18 +++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index 10e20554..c70bdc56 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -2684,10 +2684,12 @@ this expects org-mode 8.x. If you have an older version, you can try: @end lisp @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're -in @ref{Message view}, and a link to a query when you are in @ref{Headers -view}. +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 +@code{org-mu4e-link-query-in-headers-mode} is non-@code{nil}, and to the +particular message otherwise. 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 diff --git a/mu4e/org-mu4e.el b/mu4e/org-mu4e.el index 59d722dd..06363d42 100644 --- a/mu4e/org-mu4e.el +++ b/mu4e/org-mu4e.el @@ -13,7 +13,7 @@ ;; ;; 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 +;; the Free Software Foundation, either version 3 of 1the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -43,7 +43,11 @@ (defgroup org-mu4e nil "Settings for the org-mode related functionality in mu4e." :group 'mu4e - :group 'org) + :group 'org) + +(defvar org-mu4e-link-query-in-headers-mode t + "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")) @@ -66,9 +70,10 @@ Example usage: (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) + (when (member major-mode '(mu4e-headers-mode mu4e-view-mode)) + (if (and (eq major-mode 'mu4e-headers-mode) + org-mu4e-link-query-in-headers-mode) + ;; storing links to queries (let* ((query (mu4e-last-query)) desc link) (org-store-link-props :type "mu4e" :query query) @@ -76,9 +81,8 @@ Example usage: desc (concat "mu4e:query:" query) link desc) (org-add-link-props :link link :description desc) - link)) + link) ;; storing links to messages - ((eq major-mode 'mu4e-view-mode) (let* ((msg (mu4e-message-at-point)) (msgid (or (plist-get msg :message-id) "")) (from (or (plist-get msg :from) '(("none" . "none")))) From 5ab37ab382c1a43db699e1a8f73c648a02a24fa9 Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 13 Dec 2014 09:47:17 -0800 Subject: [PATCH 05/11] mu4e: mu4e~view-compose-contact takes full address when available --- mu4e/mu4e-view.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el index 0b9546c1..0c9cfc34 100644 --- a/mu4e/mu4e-view.el +++ b/mu4e/mu4e-view.el @@ -333,7 +333,7 @@ add text-properties to VAL." (interactive) (unless (get-text-property (or point (point)) 'email) (mu4e-error "No address at point")) - (mu4e~compose-mail (get-text-property (or point (point)) 'email))) + (mu4e~compose-mail (get-text-property (or point (point)) 'long))) (defun mu4e~view-copy-contact (&optional full) "Compose a message for the address at (point)." From ffe25e6786ee0d557ee1db720be7fb5cc5fe9072 Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 20 Dec 2014 14:08:17 -0800 Subject: [PATCH 06/11] Update address for reporting issues Use the github one instead of the (obsolete) google-code one. --- configure.ac | 2 +- man/mu-add.1 | 2 +- man/mu-cfind.1 | 2 +- man/mu-extract.1 | 2 +- man/mu-find.1 | 2 +- man/mu-help.1 | 2 +- man/mu-index.1 | 2 +- man/mu-mkdir.1 | 2 +- man/mu-remove.1 | 2 +- man/mu-script.1 | 2 +- man/mu-verify.1 | 2 +- man/mu-view.1 | 2 +- man/mu.1 | 2 +- man/mug.1 | 2 +- www/index.org | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 9a7d8173..0b90b832 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AC_INIT([mu],[0.9.11],[http://code.google.com/p/mu0/issues/list],[mu]) +AC_INIT([mu],[0.9.11],[https://github.com/djcb/mu/issues],[mu]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([mu/mu.cc]) # libtoolize wants to put some stuff in here; if you have an old diff --git a/man/mu-add.1 b/man/mu-add.1 index b3def667..55cb8bbc 100644 --- a/man/mu-add.1 +++ b/man/mu-add.1 @@ -35,7 +35,7 @@ returned: .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-cfind.1 b/man/mu-cfind.1 index 68e8a6fb..f0b978bf 100644 --- a/man/mu-cfind.1 +++ b/man/mu-cfind.1 @@ -122,7 +122,7 @@ output-file, so emacs/bbdb can handle things correctly, without guessing. .SH BUGS Please report bugs if you find them at -\fBhttp://code.google.com/p/mu0/issues/list\fR. +\fBhttps://github.com/djcb/mu/issues\fR. .SH AUTHOR diff --git a/man/mu-extract.1 b/man/mu-extract.1 index a9777e03..8c024543 100644 --- a/man/mu-extract.1 +++ b/man/mu-extract.1 @@ -89,7 +89,7 @@ To extract an mp3-file, and play it in the default mp3-playing application: .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-find.1 b/man/mu-find.1 index 345befc9..da2c2274 100644 --- a/man/mu-find.1 +++ b/man/mu-find.1 @@ -650,7 +650,7 @@ non-zero return value, for example: .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues If you have specific messages which are not matched correctly, please attach them (appropriately censored if needed). diff --git a/man/mu-help.1 b/man/mu-help.1 index e5589b0c..30532f6a 100644 --- a/man/mu-help.1 +++ b/man/mu-help.1 @@ -16,7 +16,7 @@ commands. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-index.1 b/man/mu-index.1 index e22bfb4d..880681e9 100644 --- a/man/mu-index.1 +++ b/man/mu-index.1 @@ -213,7 +213,7 @@ greater than 0 signals an error. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-mkdir.1 b/man/mu-mkdir.1 index 7223d1dd..fe15ca31 100644 --- a/man/mu-mkdir.1 +++ b/man/mu-mkdir.1 @@ -32,7 +32,7 @@ set the file access mode for the new maildir(s) as in \fBchmod(1)\fR. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-remove.1 b/man/mu-remove.1 index a3a9bfc2..efb6d793 100644 --- a/man/mu-remove.1 +++ b/man/mu-remove.1 @@ -36,7 +36,7 @@ returned: .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-script.1 b/man/mu-script.1 index 03d774a0..3a4706f4 100644 --- a/man/mu-script.1 +++ b/man/mu-script.1 @@ -71,7 +71,7 @@ special comments in the source code: .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-verify.1 b/man/mu-verify.1 index 412dfe0e..df9641f7 100644 --- a/man/mu-verify.1 +++ b/man/mu-verify.1 @@ -67,7 +67,7 @@ and returns some non-zero error code when this is not the case. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu-view.1 b/man/mu-view.1 index bb4d959b..dc6d0687 100644 --- a/man/mu-view.1 +++ b/man/mu-view.1 @@ -40,7 +40,7 @@ from the console. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mu.1 b/man/mu.1 index bf2e0c6c..7f2e348a 100644 --- a/man/mu.1 +++ b/man/mu.1 @@ -226,7 +226,7 @@ exit code | error .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/man/mug.1 b/man/mug.1 index daf3871f..867daa59 100644 --- a/man/mug.1 +++ b/man/mug.1 @@ -27,7 +27,7 @@ database and bookmarks and write its logs. By default, \fI~/.mu\fR is used. .SH BUGS Please report bugs if you find them: -.BR http://code.google.com/p/mu0/issues/list +.BR https://github.com/djcb/mu/issues .SH AUTHOR diff --git a/www/index.org b/www/index.org index 134f993c..83cf8365 100644 --- a/www/index.org +++ b/www/index.org @@ -76,7 +76,7 @@ Some Linux-distributions already provide pre-built mu packages; if there's no packagage for your distribution, or if you want the latest release, you can [[http://code.google.com/p/mu0/downloads/list][download mu source packages]] from Google Code. In case you find a bug, or have - a feature requests, please use the [[http://code.google.com/p/mu0/issues/list][issue tracker]]. + a feature requests, please use the [[https://github.com/djcb/mu/issues][issue tracker]]. If you'd like to work with the mu source code, you can find it [[https://github.com/djcb/mu][in Github]]; also, see the notes on [[https://github.com/djcb/mu/blob/master/HACKING][HACKING]] the mu source code. From a67518681568817efd74158998466b235bafda4f Mon Sep 17 00:00:00 2001 From: Leandro Facchinetti Date: Mon, 29 Dec 2014 11:13:37 -0500 Subject: [PATCH 07/11] Fix mistake in documentation The function is expected to return plain text, not HTML. --- mu4e/mu4e.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index c70bdc56..d9004417 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -1294,7 +1294,7 @@ OS X, there is a program called @t{textutil} as yet another alternative: If @code{mu4e-html2text-command} refers to an elisp function, it is expected to take the current buffer in html as input, and transform it -into html (just like the @code{html2text} function). +into text (just like the @code{html2text} function). For example, emacs 24.4 and later versions include the @code{eww} browser which uses the @code{shr} html renderer; @t{mu4e} includes a From 32a57602e5e63aad9dff1f0c502503ef7c50d7a0 Mon Sep 17 00:00:00 2001 From: Leandro Facchinetti Date: Mon, 29 Dec 2014 15:04:49 -0500 Subject: [PATCH 08/11] Fix configuration placement The code and the prose were misplaced. --- mu4e/mu4e.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index c70bdc56..71a30c4b 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -1664,15 +1664,15 @@ see @ref{Setting the default emacs mail program}. @item Normally, @t{mu4e} @emph{buries} the message buffer after sending; if you want to kill the buffer instead, add something like the following to your configuration: +@lisp +(setq message-kill-buffer-on-exit t) +@end lisp @item If you want to exclude your own e-mail address when ``replying to all'', set @code{mu4e-compose-dont-reply-to-self} to @code{t}. In order for this to work properly you need to properly set the @code{user-mail-address} variable or in the case you use multiple e-mail addresses you need to set the @code{mu4e-user-mail-address-list} variable accordingly. -@lisp -(setq message-kill-buffer-on-exit t) -@end lisp @end itemize @node Searching From 83d9fa1b2ae7408b78550af64f9a243e395457af Mon Sep 17 00:00:00 2001 From: Leandro Facchinetti Date: Mon, 29 Dec 2014 15:35:58 -0500 Subject: [PATCH 09/11] Fix typo in documentation --- mu4e/mu4e.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index c70bdc56..06a116c8 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -2638,7 +2638,7 @@ one of the user's e-mail addresses (as per @code{mu4e-user-mail-address-list}). @node Interaction with other tools @appendix Interaction with other tools -In this chapter, we discuss some ways in ways in which @t{mu4e} can coöperate +In this chapter, we discuss some ways in ways in which @t{mu4e} can cooperate with other tools. @menu From 74213dea966ac5619bd0bd2c2e3d52ec471ce977 Mon Sep 17 00:00:00 2001 From: Leandro Facchinetti Date: Mon, 29 Dec 2014 15:54:26 -0500 Subject: [PATCH 10/11] Change `longlines-mode` for `visual-line-mode` Emacs has line wrapping build in by default using `visual-line-mode`. http://www.emacswiki.org/emacs/LongLines --- mu4e/mu4e.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index c70bdc56..561c4d00 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -1082,9 +1082,9 @@ the built-in fields, you can also create custom fields using addresses by clicking on the name, or pressing @key{M-RET}. @item You can compose a message for the contact at point by either clicking @key{[mouse-2]} or pressing @key{C}. -@item The body text can be line-wrapped using @t{longlines-mode}. @t{mu4e} +@item The body text can be line-wrapped using @t{visual-line-mode}. @t{mu4e} defines @key{w} to toggle between the wrapped and unwrapped state. If you want -to do this automatically when viewing a message, invoke @code{longlines-mode} +to do this automatically when viewing a message, invoke @code{visual-line-mode} in your @code{mu4e-view-mode-hook}. @item You can hide cited parts in messages (the parts starting with ``@t{>}'') using @code{mu4e-view-hide-cited}, bound to @key{h}. If you want to do this @@ -3286,7 +3286,7 @@ by enabling @t{helm-mode} use helm-style completion. @ref{Viewing images inline}. @item @emph{How can I word-wrap long lines in when viewing a message?} You can toggle between wrapped and non-wrapped states using -@key{w}. If you want to do this automatically, invoke @code{longlines-mode} in +@key{w}. If you want to do this automatically, invoke @code{visual-line-mode} in your @code{mu4e-view-mode-hook}. @item @emph{What about hiding cited parts?} Toggle between hiding and showing of cited parts with @key{h}. If you want to hide parts automatically, call From 58e0595188a5d5e04401e5fdbdc2ed7e431d7b00 Mon Sep 17 00:00:00 2001 From: djcb Date: Thu, 1 Jan 2015 21:45:11 +0800 Subject: [PATCH 11/11] mu4e: specify $MU in sauron script --- mu4e/mu4e.texi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index f6ab0d87..8d77fa9f 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -2746,6 +2746,9 @@ when new messages arrive. @verbatim #!/bin/sh +# the mu binary +MU=mu + # put the path to your Inbox folder here CHECKDIR="/home/$LOGNAME/Maildir/Inbox"