X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-wash.el;h=1f420b25a05d770556cd19e4e737f522b7e18098;hp=e8134bf77c5002d16b590ad00590c3d915006232;hb=567bcbc294b3aed632d18eb22056840292bdeb1e;hpb=b6862c7eb9bfb00183e568b40d77ea25ade21db2 diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el index e8134bf7..1f420b25 100644 --- a/emacs/notmuch-wash.el +++ b/emacs/notmuch-wash.el @@ -35,6 +35,9 @@ "\\(^[[:space:]]*>.*\n\\)+" "Pattern to match citation lines.") +(defvar notmuch-wash-original-regexp "^\\(--+\s?[oO]riginal [mM]essage\s?--+\\)$" + "Pattern to match a line that separates original message from reply in top-posted message.") + (defvar notmuch-wash-button-signature-hidden-format "[ %d-line signature. Click/Enter to show. ]" "String used to construct button text for hidden signatures. @@ -55,6 +58,16 @@ Can use up to one integer format parameter, i.e. %d") "String used to construct button text for visible citations. Can use up to one integer format parameter, i.e. %d") +(defvar notmuch-wash-button-original-hidden-format + "[ %d-line hidden original message. Click/Enter to show. ]" + "String used to construct button text for hidden citations. +Can use up to one integer format parameter, i.e. %d") + +(defvar notmuch-wash-button-original-visible-format + "[ %d-line original message. Click/Enter to hide. ]" + "String used to construct button text for visible citations. +Can use up to one integer format parameter, i.e. %d") + (defvar notmuch-wash-signature-lines-max 12 "Maximum length of signature that will be hidden by default.") @@ -106,8 +119,13 @@ collapse the remaining lines into a button.") 'help-echo "mouse-1, RET: Show signature" :supertype 'notmuch-wash-button-invisibility-toggle-type) +(define-button-type 'notmuch-wash-button-original-toggle-type + 'help-echo "mouse-1, RET: Show original message" + :supertype 'notmuch-wash-button-invisibility-toggle-type) + (defun notmuch-wash-region-isearch-show (overlay) - (remove-from-invisibility-spec (overlay-get overlay 'invisible))) + (dolist (invis-spec (overlay-get overlay 'invisible)) + (remove-from-invisibility-spec invis-spec))) (defun notmuch-wash-button-label (overlay) (let* ((type (overlay-get overlay 'type)) @@ -118,8 +136,8 @@ collapse the remaining lines into a button.") (lines-count (count-lines (overlay-start overlay) (overlay-end overlay)))) (format label-format lines-count))) -(defun notmuch-wash-region-to-button (beg end type prefix) - "Auxilary function to do the actual making of overlays and buttons +(defun notmuch-wash-region-to-button (msg beg end type prefix) + "Auxiliary function to do the actual making of overlays and buttons BEG and END are buffer locations. TYPE should a string, either \"citation\" or \"signature\". PREFIX is some arbitrary text to @@ -131,12 +149,14 @@ insert before the button, probably for indentation." ;; since the newly created symbol has no plist. (let ((overlay (make-overlay beg end)) + (message-invis-spec (plist-get msg :message-invis-spec)) (invis-spec (make-symbol (concat "notmuch-" type "-region"))) (button-type (intern-soft (concat "notmuch-wash-button-" type "-toggle-type")))) (add-to-invisibility-spec invis-spec) - (overlay-put overlay 'invisible invis-spec) + (overlay-put overlay 'invisible (list invis-spec message-invis-spec)) (overlay-put overlay 'isearch-open-invisible #'notmuch-wash-region-isearch-show) + (overlay-put overlay 'priority 10) (overlay-put overlay 'type type) (goto-char (1+ end)) (save-excursion @@ -147,16 +167,23 @@ insert before the button, probably for indentation." 'overlay overlay :type button-type)))) -(defun notmuch-wash-excerpt-citations (depth) +(defun notmuch-wash-excerpt-citations (msg depth) "Excerpt citations and up to one signature." (goto-char (point-min)) (beginning-of-line) + (if (and (< (point) (point-max)) + (re-search-forward notmuch-wash-original-regexp nil t)) + (let* ((msg-start (match-beginning 0)) + (msg-end (point-max)) + (msg-lines (count-lines msg-start msg-end))) + (notmuch-wash-region-to-button + msg msg-start msg-end "original" "\n"))) (while (and (< (point) (point-max)) (re-search-forward notmuch-wash-citation-regexp nil t)) (let* ((cite-start (match-beginning 0)) (cite-end (match-end 0)) (cite-lines (count-lines cite-start cite-end))) - (overlay-put (make-overlay cite-start cite-end) 'face 'message-cited-text-face) + (overlay-put (make-overlay cite-start cite-end) 'face 'message-cited-text) (when (> cite-lines (+ notmuch-wash-citation-lines-prefix notmuch-wash-citation-lines-suffix 1)) @@ -166,7 +193,7 @@ insert before the button, probably for indentation." (goto-char cite-end) (forward-line (- notmuch-wash-citation-lines-suffix)) (notmuch-wash-region-to-button - hidden-start (point-marker) + msg hidden-start (point-marker) "citation" "\n"))))) (if (and (not (eobp)) (re-search-forward notmuch-wash-signature-regexp nil t)) @@ -178,14 +205,14 @@ insert before the button, probably for indentation." (sig-end-marker (make-marker))) (set-marker sig-start-marker sig-start) (set-marker sig-end-marker (point-max)) - (overlay-put (make-overlay sig-start-marker sig-end-marker) 'face 'message-cited-text-face) + (overlay-put (make-overlay sig-start-marker sig-end-marker) 'face 'message-cited-text) (notmuch-wash-region-to-button - sig-start-marker sig-end-marker + msg sig-start-marker sig-end-marker "signature" "\n")))))) ;; -(defun notmuch-wash-elide-blank-lines (depth) +(defun notmuch-wash-elide-blank-lines (msg depth) "Elide leading, trailing and successive blank lines." ;; Algorithm derived from `article-strip-multiple-blank-lines' in @@ -213,7 +240,7 @@ insert before the button, probably for indentation." ;; -(defun notmuch-wash-tidy-citations (depth) +(defun notmuch-wash-tidy-citations (msg depth) "Improve the display of cited regions of a message. Perform several transformations on the message body: @@ -244,7 +271,7 @@ Perform several transformations on the message body: ;; -(defun notmuch-wash-wrap-long-lines (depth) +(defun notmuch-wash-wrap-long-lines (msg depth) "Wrap any long lines in the message to the width of the window. When doing so, maintaining citation leaders in the wrapped text." @@ -263,7 +290,7 @@ When doing so, maintaining citation leaders in the wrapped text." (defvar diff-file-header-re) ; From `diff-mode.el'. -(defun notmuch-wash-convert-inline-patch-to-part (depth) +(defun notmuch-wash-convert-inline-patch-to-part (msg depth) "Convert an inline patch into a fake 'text/x-diff' attachment. Given that this function guesses whether a buffer includes a @@ -295,4 +322,71 @@ for error." ;; +;; Temporary workaround for Emacs bug #8721 +;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8721 + +(defun notmuch-isearch-range-invisible (beg end) + "Same as `isearch-range-invisible' but with fixed Emacs bug #8721." + (when (/= beg end) + ;; Check that invisibility runs up to END. + (save-excursion + (goto-char beg) + (let (;; can-be-opened keeps track if we can open some overlays. + (can-be-opened (eq search-invisible 'open)) + ;; the list of overlays that could be opened + (crt-overlays nil)) + (when (and can-be-opened isearch-hide-immediately) + (isearch-close-unnecessary-overlays beg end)) + ;; If the following character is currently invisible, + ;; skip all characters with that same `invisible' property value. + ;; Do that over and over. + (while (and (< (point) end) (invisible-p (point))) + (if (invisible-p (get-text-property (point) 'invisible)) + (progn + (goto-char (next-single-property-change (point) 'invisible + nil end)) + ;; if text is hidden by an `invisible' text property + ;; we cannot open it at all. + (setq can-be-opened nil)) + (when can-be-opened + (let ((overlays (overlays-at (point))) + ov-list + o + invis-prop) + (while overlays + (setq o (car overlays) + invis-prop (overlay-get o 'invisible)) + (if (invisible-p invis-prop) + (if (overlay-get o 'isearch-open-invisible) + (setq ov-list (cons o ov-list)) + ;; We found one overlay that cannot be + ;; opened, that means the whole chunk + ;; cannot be opened. + (setq can-be-opened nil))) + (setq overlays (cdr overlays))) + (if can-be-opened + ;; It makes sense to append to the open + ;; overlays list only if we know that this is + ;; t. + (setq crt-overlays (append ov-list crt-overlays))))) + (goto-char (next-overlay-change (point))))) + ;; See if invisibility reaches up thru END. + (if (>= (point) end) + (if (and can-be-opened (consp crt-overlays)) + (progn + (setq isearch-opened-overlays + (append isearch-opened-overlays crt-overlays)) + (mapc 'isearch-open-overlay-temporary crt-overlays) + nil) + (setq isearch-hidden t))))))) + +(defadvice isearch-range-invisible (around notmuch-isearch-range-invisible-advice activate) + "Call `notmuch-isearch-range-invisible' instead of the original +`isearch-range-invisible' when in `notmuch-show-mode' mode." + (if (eq major-mode 'notmuch-show-mode) + (setq ad-return-value (notmuch-isearch-range-invisible beg end)) + ad-do-it)) + +;; + (provide 'notmuch-wash)