From c7e1a64af99b3294eedd02b6ae4aff92eacc645c Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Thu, 2 Feb 2012 11:23:46 +0000 Subject: [PATCH] [PATCH v6 1/8] emacs: Rework crypto switch toggle. --- 44/ef085a796ec05f9e7a6a6a93387fb415ca00a7 | 321 ++++++++++++++++++++++ 1 file changed, 321 insertions(+) create mode 100644 44/ef085a796ec05f9e7a6a6a93387fb415ca00a7 diff --git a/44/ef085a796ec05f9e7a6a6a93387fb415ca00a7 b/44/ef085a796ec05f9e7a6a6a93387fb415ca00a7 new file mode 100644 index 000000000..c42382f66 --- /dev/null +++ b/44/ef085a796ec05f9e7a6a6a93387fb415ca00a7 @@ -0,0 +1,321 @@ +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 C628E431FBF + for ; Thu, 2 Feb 2012 03:24:02 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +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 juLtUXFMUmtQ for ; + Thu, 2 Feb 2012 03:24:00 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 8AE7B431FAE + for ; Thu, 2 Feb 2012 03:24:00 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so1799272wib.26 + for ; Thu, 02 Feb 2012 03:23:58 -0800 (PST) +Received: by 10.180.24.7 with SMTP id q7mr3860255wif.14.1328181838916; + Thu, 02 Feb 2012 03:23:58 -0800 (PST) +Received: from hotblack-desiato.hh.sledj.net + (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) + by mx.google.com with ESMTPS id x7sm25951099wif.10.2012.02.02.03.23.56 + (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 02 Feb 2012 03:23:56 -0800 (PST) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 9E0FEA04A4; Thu, 2 Feb 2012 11:23:54 +0000 (GMT) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v6 1/8] emacs: Rework crypto switch toggle. +Date: Thu, 2 Feb 2012 11:23:46 +0000 +Message-Id: <1328181833-14988-2-git-send-email-dme@dme.org> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1328181833-14988-1-git-send-email-dme@dme.org> +References: <1327486729-18052-1-git-send-email-dme@dme.org> + <1328181833-14988-1-git-send-email-dme@dme.org> +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: Thu, 02 Feb 2012 11:24:03 -0000 + +Re-work the existing crypto switch toggle to be based on a persistant +buffer-local variable. + +To allow this, modify `notmuch-show-refresh-view' to erase and re-draw +in the current buffer rather than killing the current buffer and +creating a new one. (This will also allow more per-buffer behaviour in +future patches.) + +Add a binding ('$') to toggle crypto processing of the current buffer +and remove the prefix argument approach that achieves a similar +result. +--- + emacs/notmuch-show.el | 126 ++++++++++++++++++++++++------------------------ + emacs/notmuch.el | 7 +-- + 2 files changed, 66 insertions(+), 67 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index de9421e..b6329d2 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -125,6 +125,22 @@ indentation." + (const :tag "View interactively" + notmuch-show-interactively-view-part))) + ++(defvar notmuch-show-thread-id nil) ++(make-variable-buffer-local 'notmuch-show-thread-id) ++(put 'notmuch-show-thread-id 'permanent-local t) ++ ++(defvar notmuch-show-parent-buffer nil) ++(make-variable-buffer-local 'notmuch-show-parent-buffer) ++(put 'notmuch-show-parent-buffer 'permanent-local t) ++ ++(defvar notmuch-show-query-context nil) ++(make-variable-buffer-local 'notmuch-show-query-context) ++(put 'notmuch-show-query-context 'permanent-local t) ++ ++(defvar notmuch-show-process-crypto nil) ++(make-variable-buffer-local 'notmuch-show-process-crypto) ++(put 'notmuch-show-process-crypto 'permanent-local t) ++ + (defmacro with-current-notmuch-show-message (&rest body) + "Evaluate body with current buffer set to the text of current message" + `(save-excursion +@@ -411,14 +427,11 @@ message at DEPTH in the current thread." + + (defmacro notmuch-with-temp-part-buffer (message-id nth &rest body) + (declare (indent 2)) +- (let ((process-crypto (make-symbol "process-crypto"))) +- `(let ((,process-crypto notmuch-show-process-crypto)) +- (with-temp-buffer +- (setq notmuch-show-process-crypto ,process-crypto) +- ;; Always acquires the part via `notmuch part', even if it is +- ;; available in the JSON output. +- (insert (notmuch-show-get-bodypart-internal ,message-id ,nth)) +- ,@body)))) ++ `(with-temp-buffer ++ ;; Always acquires the part via `notmuch part', even if it is ++ ;; available in the JSON output. ++ (insert (notmuch-show-get-bodypart-internal ,message-id ,nth)) ++ ,@body)) + + (defun notmuch-show-save-part (message-id nth &optional filename content-type) + (notmuch-with-temp-part-buffer message-id nth +@@ -600,7 +613,7 @@ current buffer, if possible." + (sigstatus (car (plist-get part :sigstatus)))) + (notmuch-crypto-insert-sigstatus-button sigstatus from)) + ;; if we're not adding sigstatus, tell the user how they can get it +- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))) ++ (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))) + + (let ((inner-parts (plist-get part :content)) + (start (point))) +@@ -626,7 +639,7 @@ current buffer, if possible." + (sigstatus (car (plist-get part :sigstatus)))) + (notmuch-crypto-insert-sigstatus-button sigstatus from)))) + ;; if we're not adding encstatus, tell the user how they can get it +- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))) ++ (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))) + + (let ((inner-parts (plist-get part :content)) + (start (point))) +@@ -753,8 +766,6 @@ current buffer, if possible." + + ;; Helper for parts which are generally not included in the default + ;; JSON output. +-;; Uses the buffer-local variable notmuch-show-process-crypto to +-;; determine if parts should be decrypted first. + (defun notmuch-show-get-bodypart-internal (message-id part-number) + (let ((args '("show" "--format=raw")) + (part-arg (format "--part=%s" part-number))) +@@ -908,6 +919,15 @@ current buffer, if possible." + ;; criteria. + (notmuch-show-message-visible msg (plist-get msg :match)))) + ++(defun notmuch-show-toggle-process-crypto () ++ "Toggle the processing of cryptographic MIME parts." ++ (interactive) ++ (setq notmuch-show-process-crypto (not notmuch-show-process-crypto)) ++ (message (if notmuch-show-process-crypto ++ "Processing cryptographic MIME parts." ++ "Not processing cryptographic MIME parts.")) ++ (notmuch-show-refresh-view)) ++ + (defun notmuch-show-insert-tree (tree depth) + "Insert the message tree TREE at depth DEPTH in the current thread." + (let ((msg (car tree)) +@@ -923,15 +943,6 @@ current buffer, if possible." + "Insert the forest of threads FOREST." + (mapc (lambda (thread) (notmuch-show-insert-thread thread 0)) forest)) + +-(defvar notmuch-show-thread-id nil) +-(make-variable-buffer-local 'notmuch-show-thread-id) +-(defvar notmuch-show-parent-buffer nil) +-(make-variable-buffer-local 'notmuch-show-parent-buffer) +-(defvar notmuch-show-query-context nil) +-(make-variable-buffer-local 'notmuch-show-query-context) +-(defvar notmuch-show-buffer-name nil) +-(make-variable-buffer-local 'notmuch-show-buffer-name) +- + (defun notmuch-show-buttonise-links (start end) + "Buttonise URLs and mail addresses between START and END. + +@@ -951,7 +962,7 @@ a corresponding notmuch search." + 'face goto-address-mail-face)))) + + ;;;###autoload +-(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name crypto-switch) ++(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name) + "Run \"notmuch show\" with the given thread ID and display results. + + The optional PARENT-BUFFER is the notmuch-search buffer from +@@ -966,46 +977,41 @@ non-nil. + The optional BUFFER-NAME provides the name of the buffer in + which the message thread is shown. If it is nil (which occurs + when the command is called interactively) the argument to the +-function is used. +- +-The optional CRYPTO-SWITCH toggles the value of the +-notmuch-crypto-process-mime customization variable for this show +-buffer." ++function is used." + (interactive "sNotmuch show: ") +- (let* ((process-crypto (if crypto-switch +- (not notmuch-crypto-process-mime) +- notmuch-crypto-process-mime))) +- (notmuch-show-worker thread-id parent-buffer query-context buffer-name process-crypto))) +- +-(defun notmuch-show-worker (thread-id parent-buffer query-context buffer-name process-crypto) +- (let* ((buffer-name (generate-new-buffer-name +- (or buffer-name +- (concat "*notmuch-" thread-id "*")))) +- (buffer (get-buffer-create buffer-name)) +- (inhibit-read-only t)) +- (switch-to-buffer buffer) ++ (let ((buffer-name (generate-new-buffer-name ++ (or buffer-name ++ (concat "*notmuch-" thread-id "*"))))) ++ (switch-to-buffer (get-buffer-create buffer-name)) ++ ;; Set the default value for `notmuch-show-process-crypto' in this ++ ;; buffer. ++ (setq notmuch-show-process-crypto notmuch-crypto-process-mime) ++ ++ (setq notmuch-show-thread-id thread-id ++ notmuch-show-parent-buffer parent-buffer ++ notmuch-show-query-context query-context) ++ (notmuch-show-worker))) ++ ++(defun notmuch-show-worker () ++ (let ((inhibit-read-only t)) ++ + (notmuch-show-mode) + ;; Don't track undo information for this buffer + (set 'buffer-undo-list t) + +- (setq notmuch-show-thread-id thread-id) +- (setq notmuch-show-parent-buffer parent-buffer) +- (setq notmuch-show-query-context query-context) +- (setq notmuch-show-buffer-name buffer-name) +- (setq notmuch-show-process-crypto process-crypto) +- + (erase-buffer) + (goto-char (point-min)) + (save-excursion +- (let* ((basic-args (list thread-id)) +- (args (if query-context +- (append (list "\'") basic-args (list "and (" query-context ")\'")) ++ (let* ((basic-args (list notmuch-show-thread-id)) ++ (args (if notmuch-show-query-context ++ (append (list "\'") basic-args ++ (list "and (" notmuch-show-query-context ")\'")) + (append (list "\'") basic-args (list "\'"))))) + (notmuch-show-insert-forest (notmuch-query-get-threads args)) + ;; If the query context reduced the results to nothing, run + ;; the basic query. + (when (and (eq (buffer-size) 0) +- query-context) ++ notmuch-show-query-context) + (notmuch-show-insert-forest + (notmuch-query-get-threads basic-args)))) + +@@ -1022,21 +1028,14 @@ buffer." + + (notmuch-show-mark-read))) + +-(defun notmuch-show-refresh-view (&optional crypto-switch) +- "Refresh the current view (with crypto switch if prefix given). ++(defun notmuch-show-refresh-view () ++ "Refresh the current view. + +-Kills the current buffer and reruns notmuch show with the same +-thread id. If a prefix is given, crypto processing is toggled." +- (interactive "P") +- (let ((thread-id notmuch-show-thread-id) +- (parent-buffer notmuch-show-parent-buffer) +- (query-context notmuch-show-query-context) +- (buffer-name notmuch-show-buffer-name) +- (process-crypto (if crypto-switch +- (not notmuch-show-process-crypto) +- notmuch-show-process-crypto))) +- (notmuch-kill-this-buffer) +- (notmuch-show-worker thread-id parent-buffer query-context buffer-name process-crypto))) ++Refreshes the current view, observing changes in cryptographic preferences." ++ (interactive) ++ (let ((inhibit-read-only t)) ++ (erase-buffer)) ++ (notmuch-show-worker)) + + (defvar notmuch-show-stash-map + (let ((map (make-sparse-keymap))) +@@ -1087,6 +1086,7 @@ thread id. If a prefix is given, crypto processing is toggled." + (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all) + (define-key map (kbd "RET") 'notmuch-show-toggle-message) + (define-key map "#" 'notmuch-show-print-message) ++ (define-key map "$" 'notmuch-show-toggle-process-crypto) + map) + "Keymap for \"notmuch show\" buffers.") + (fset 'notmuch-show-mode-map notmuch-show-mode-map) +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 72f78ed..9d8bebd 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -463,9 +463,9 @@ Complete list of currently available key bindings: + "Return a list of authors for the current region" + (notmuch-search-properties-in-region 'notmuch-search-subject beg end)) + +-(defun notmuch-search-show-thread (&optional crypto-switch) ++(defun notmuch-search-show-thread () + "Display the currently selected thread." +- (interactive "P") ++ (interactive) + (let ((thread-id (notmuch-search-find-thread-id)) + (subject (notmuch-search-find-subject))) + (if (> (length thread-id) 0) +@@ -479,8 +479,7 @@ Complete list of currently available key bindings: + (concat "*" + (truncate-string-to-width subject 32 nil nil t) + "*") +- 32 nil nil t)) +- crypto-switch) ++ 32 nil nil t))) + (message "End of search results.")))) + + (defun notmuch-search-reply-to-thread (&optional prompt-for-sender) +-- +1.7.8.3 + -- 2.26.2