X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-wash.el;h=67143e5310d35ae87adb2b3e076571e0a154559a;hp=6760f3e743c3a578dbba46758d682292a1a55784;hb=6bd3d8af5431542f352f084b6366e88b98b019a1;hpb=f56b86dffa5e6deb57e99bd16507920d75cf81a4 diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el index 6760f3e7..67143e53 100644 --- a/emacs/notmuch-wash.el +++ b/emacs/notmuch-wash.el @@ -124,7 +124,8 @@ collapse the remaining lines into a button.") :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)) @@ -135,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 @@ -148,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 @@ -164,7 +167,7 @@ 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) @@ -174,7 +177,7 @@ insert before the button, probably for indentation." (msg-end (point-max)) (msg-lines (count-lines msg-start msg-end))) (notmuch-wash-region-to-button - msg-start msg-end "original" "\n"))) + 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)) @@ -190,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)) @@ -204,12 +207,12 @@ insert before the button, probably for indentation." (set-marker sig-end-marker (point-max)) (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 @@ -237,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: @@ -268,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." @@ -287,7 +290,45 @@ 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-subject-to-filename (subject &optional maxlen) + "Convert a mail SUBJECT into a filename. + +The resulting filename is similar to the names generated by \"git +format-patch\", without the leading patch sequence number +\"0001-\" and \".patch\" extension. Any leading \"[PREFIX]\" +style strings are removed prior to conversion. + +Optional argument MAXLEN is the maximum length of the resulting +filename, before trimming any trailing . and - characters." + (let* ((s (replace-regexp-in-string "^ *\\(\\[[^]]*\\] *\\)*" "" subject)) + (s (replace-regexp-in-string "[^A-Za-z0-9._]+" "-" s)) + (s (replace-regexp-in-string "\\.+" "." s)) + (s (if maxlen (substring s 0 (min (length s) maxlen)) s)) + (s (replace-regexp-in-string "[.-]*$" "" s))) + s)) + +(defun notmuch-wash-subject-to-patch-sequence-number (subject) + "Convert a patch mail SUBJECT into a patch sequence number. + +Return the patch sequence number N from the last \"[PATCH N/M]\" +style prefix in SUBJECT, or nil if such a prefix can't be found." + (when (string-match + "^ *\\(\\[[^]]*\\] *\\)*\\[[^]]*?\\([0-9]+\\)/[0-9]+[^]]*\\].*" + subject) + (string-to-number (substring subject (match-beginning 2) (match-end 2))))) + +(defun notmuch-wash-subject-to-patch-filename (subject) + "Convert a patch mail SUBJECT into a filename. + +The resulting filename is similar to the names generated by \"git +format-patch\". If the patch mail was generated and sent using +\"git format-patch/send-email\", this should re-create the +original filename the sender had." + (format "%04d-%s.patch" + (or (notmuch-wash-subject-to-patch-sequence-number subject) 1) + (notmuch-wash-subject-to-filename subject 52))) + +(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,27 +336,96 @@ patch and then guesses the extent of the patch, there is scope for error." (goto-char (point-min)) - (if (re-search-forward diff-file-header-re nil t) - (progn - (beginning-of-line -1) - (let ((patch-start (point)) - (patch-end (point-max)) - part) - (goto-char patch-start) - (if (or - ;; Patch ends with signature. - (re-search-forward notmuch-wash-signature-regexp nil t) - ;; Patch ends with bugtraq comment. - (re-search-forward "^\\*\\*\\* " nil t)) - (setq patch-end (match-beginning 0))) - (save-restriction - (narrow-to-region patch-start patch-end) - (setq part (plist-put part :content-type "text/x-diff")) - (setq part (plist-put part :content (buffer-string))) - (setq part (plist-put part :id -1)) - (setq part (plist-put part :filename "inline patch")) - (delete-region (point-min) (point-max)) - (notmuch-show-insert-bodypart nil part depth)))))) + (when (re-search-forward diff-file-header-re nil t) + (beginning-of-line -1) + (let ((patch-start (point)) + (patch-end (point-max)) + part) + (goto-char patch-start) + (if (or + ;; Patch ends with signature. + (re-search-forward notmuch-wash-signature-regexp nil t) + ;; Patch ends with bugtraq comment. + (re-search-forward "^\\*\\*\\* " nil t)) + (setq patch-end (match-beginning 0))) + (save-restriction + (narrow-to-region patch-start patch-end) + (setq part (plist-put part :content-type "inline-patch-fake-part")) + (setq part (plist-put part :content (buffer-string))) + (setq part (plist-put part :id -1)) + (setq part (plist-put part :filename + (notmuch-wash-subject-to-patch-filename + (plist-get + (plist-get msg :headers) :Subject)))) + (delete-region (point-min) (point-max)) + (notmuch-show-insert-bodypart nil part depth))))) + +;; + +;; 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)) ;;