Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C6D31418C36 for ; Sun, 11 Apr 2010 03:29:40 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5EsaqonlhkVi for ; Sun, 11 Apr 2010 03:29:39 -0700 (PDT) Received: from mail-bw0-f210.google.com (mail-bw0-f210.google.com [209.85.218.210]) by olra.theworths.org (Postfix) with ESMTP id DB716418C34 for ; Sun, 11 Apr 2010 03:29:38 -0700 (PDT) Received: by bwz2 with SMTP id 2so3374357bwz.30 for ; Sun, 11 Apr 2010 03:29:37 -0700 (PDT) Received: by 10.204.152.17 with SMTP id e17mr2793021bkw.105.1270981774545; Sun, 11 Apr 2010 03:29:34 -0700 (PDT) Received: from ut.hh.sledj.net (host83-217-165-81.dsl.vispa.com [83.217.165.81]) by mx.google.com with ESMTPS id l1sm27361107bkl.14.2010.04.11.03.29.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 11 Apr 2010 03:29:33 -0700 (PDT) Received: by ut.hh.sledj.net (Postfix, from userid 1000) id 1114B594013; Sun, 11 Apr 2010 11:29:30 +0100 (BST) To: notmuch Subject: pull request From: David Edmondson Date: Sun, 11 Apr 2010 11:29:29 +0100 Message-ID: <87sk722sfq.fsf@ut.hh.sledj.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2010 10:29:40 -0000 Carl, please consider the following (from the 'for-cworth' branch of git://github.com/dme/notmuch.git) for 0.2. I hope to have some more UI changes merged next week. commit 651f8ca16beadd658c412075a585e4ec90e31456 Author: David Edmondson Date: Mon Mar 22 14:50:20 2010 +0000 emacs/notmuch-show.el: Avoid passing unintended format strings to `message' If the text being stashed included %, `message' was unhappy and complained. emacs/notmuch-show.el | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 744c8274e56e38940644d31cc6a1588f989daa43 Author: David Edmondson Date: Wed Mar 24 15:50:11 2010 +0000 emacs/notmuch.el: Enable `hl-line-mode' in `notmuch-search-mode' emacs/notmuch.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 42949084a6dae6997f5872ee9d74da4fc0a89369 Author: David Edmondson Date: Tue Apr 6 08:24:00 2010 +0100 json: Avoid calling strlen(NULL) MIME parts may have no filename, which previously resulted in calling strlen(NULL). json.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 94ba1fa0de79902c94612dad84e32fdcdc8a34dc Author: David Edmondson Date: Sun Apr 11 08:58:43 2010 +0100 emacs: JSON based implementation Re-implement notmuch-show.el using the JSON output format of the notmuch command. Most functionality is retained - HTML display is noticeably missing. emacs/notmuch-lib.el | 11 - emacs/notmuch-show.el | 1620 +++++++++++++++++++++++++------------------------ emacs/notmuch.el | 69 +-- 3 files changed, 837 insertions(+), 863 deletions(-) commit a586736deaf934ac348125499601b00e71d7c841 Author: David Edmondson Date: Mon Mar 22 16:49:16 2010 +0000 emacs: Move body markup to a separate file Move the citation and signature markup for text/plain parts to a new file (notmuch-wash.el) and call it using a hook mechanism rather than directly. emacs/Makefile.local | 3 +- emacs/notmuch-show.el | 131 ++----------------------------------------- emacs/notmuch-wash.el | 150 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 127 deletions(-) commit e4fe7e4274f9669aa8040d34b2df5f6571ff9b61 Author: David Edmondson Date: Thu Apr 1 16:25:20 2010 +0100 emacs: Add more functions to clean up text/plain parts Add: - notmuch-wash-wrap-long-lines: Wrap lines longer than the width of the current window whilst maintaining any citation prefix. - notmuch-wash-tidy-citations: Tidy up citations by: - compress repeated otherwise blank citation lines, - remove otherwise blank citation lines at the head and tail of a citation and remove blank lines between attribution statements and the citation, - notmuch-wash-compress-blanks: Compress repeated blank lines and remove leading and trailing blank lines. Enable all of the functions by default by adding them to `notmuch-show-insert-text/plain-hook'. With the wrapping features for text/plain parts enabled, word wrapping of the buffer leads to an unappealing display of text, so disable it. emacs/Makefile.local | 3 +- emacs/coolj.el | 145 +++++++++++++++++++++++++++++++++++++++++++++++++ emacs/notmuch-show.el | 14 ++++- emacs/notmuch-wash.el | 72 ++++++++++++++++++++++++- 4 files changed, 230 insertions(+), 4 deletions(-) commit 53544b7907b3945b06c10113e7900b59113e405f Author: David Edmondson Date: Tue Mar 23 10:06:00 2010 +0000 emacs/notmuch-show.el: Improved part labelling If a text/plain part is not the first part in a message, add a label in order that a user can see that multiple parts are present. If a part has a 'filename' attribute, include it in any label describing the part. emacs/notmuch-show.el | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) commit 8144f6553b443a916c599d7fbb347c557923e71f Author: David Edmondson Date: Tue Mar 23 11:54:05 2010 +0000 emacs: Use `mm-display-part' when possible For parts that the mm-decode/mm-view functions can inline and we have the content, use `mm-display-part' to insert the part in the buffer. emacs/notmuch-show.el | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) commit bf3da2f2422539f9c099158457b84482b22fbd41 Author: David Edmondson Date: Tue Mar 23 11:54:05 2010 +0000 emacs: Use mailcap.el to guess the type of application/octet-stream parts Use the mailcap functionality to guess a MIME type for attachments of type application/octet-stream and, presuming successful, feed the attachment back into the display code with the determine type. This is mostly useless at the moment, as the JSON output from notmuch does not include the content of application/octet-stream parts, so they cannot be displayed even if the guess is a good one. emacs/notmuch-show.el | 54 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 15 deletions(-) commit c8946454e1f39845db5e9dd90fdfcff55b2a0c86 Author: David Edmondson Date: Thu Apr 1 18:33:46 2010 +0100 emacs: Display all body parts using `notmuch part --part=' Use the `notmuch part' command to access body parts not currently included in the JSON output and display those body parts appropriately. emacs/notmuch-show.el | 82 ++++++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 34 deletions(-) commit 42b98a1402347551b19fa912b574c2c1e45d0ede Author: David Edmondson Date: Thu Mar 25 12:26:49 2010 +0000 emacs/notmuch-wash.el: Add `notmuch-wash-inline-patch' `notmuch-wash-inline-patch' attempts to convert inline patches to fake attachments, in order that diff-mode highlighting can be applied to the patch. It should be added to `notmuch-show-insert-text/plain-hook', usually before `notmuch-wash-markup-citations'. Due to the scope for error in detecting inline patches (and their extent), this function is not enabled by default. emacs/notmuch-wash.el | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) commit ad8deaa17f1753cedd8e0a593376f3bc32e2d000 Author: David Edmondson Date: Sun Mar 28 14:50:46 2010 +0100 emacs/notmuch-show.el: Part headers are real buttons that save the part Convert the part headers into buttons that save the part when activated. Don't attempt to save 'fake' parts generated by `notmuch-wash-inline-patch'. emacs/notmuch-show.el | 56 ++++++++++++++++++++++++++++++++++++------------ emacs/notmuch-wash.el | 2 +- 2 files changed, 43 insertions(+), 15 deletions(-) commit 912c215bf3636945abf50cf35c96691b0e244bf4 (HEAD, github/for-cworth, for-cworth) Author: David Edmondson Date: Mon Mar 29 10:31:58 2010 +0100 emacs/notmuch-show.el: Add `notmuch-show-toggle-all' bound to M-RET `notmuch-show-toggle-all' changes the visibility all of the messages in the current thread. By default it makes all of the messages not visible. With a prefix argument, it makes them all visible. emacs/notmuch-show.el | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) dme. -- David Edmondson, http://dme.org