Merge branch 'master' of github.com:djcb/mu

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

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)
+(define (count expr output)
-  "Print the total number of messages matching QUERY."
+  "Print the total number of messages matching the query EXPR.
+OUTPUT is ignored."
   (display (mu:count expr))
   (newline))
 

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
 

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
 

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
 

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).
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
+Move to the next or (if BACKWARDS is non-`nil') header for which FUNC
-from the current position."
+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))))
 

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)."

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
+After this, you can use the normal @t{org-mode} mechanisms to store
-@kbd{M-x org-store-link} stores a link to a particular message when you're
+links: @kbd{M-x org-store-link} stores a link to a particular message
-in @ref{Message view}, and a link to a query when you are in @ref{Headers
+when you are in @ref{Message view}. When you are in @ref{Headers view},
-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
@@ -2744,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"
 
@@ -3284,7 +3289,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

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,
@@ -45,6 +45,10 @@
   :group 'mu4e
   :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"))
   "Function that takes a msg and returns a string for the
@@ -66,9 +70,10 @@ Example usage:
 
 (defun org-mu4e-store-link ()
   "Store a link to a mu4e query or message."
-  (cond
+  (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
-    ((eq major-mode 'mu4e-headers-mode)
       (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) "<none>"))
              (from  (or (plist-get msg :from) '(("none" . "none"))))

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.