debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Allow the indentation of content to be toggled.

Browse source 
Very deeply indented content is sometimes difficult to
read (particular for something like patches). Allow the indentation of
the content to be toggled with '<'.

Indentation of the header lines is not affected, so it remains
possible to see the structure of the thread.
This commit is contained in:
David Edmondson 2012-02-08 08:02:14 +00:00 committed by David Bremner
parent 44a544ede0
commit c205e8ffae
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
emacs/notmuch-show.el
View file

@ -146,6 +146,10 @@ indentation."
(make-variable-buffer-local 'notmuch-show-elide-non-matching-messages) (make-variable-buffer-local 'notmuch-show-elide-non-matching-messages)
(put 'notmuch-show-elide-non-matching-messages 'permanent-local t) (put 'notmuch-show-elide-non-matching-messages 'permanent-local t)
(defvar notmuch-show-indent-content t)
(make-variable-buffer-local 'notmuch-show-indent-content)
(put 'notmuch-show-indent-content 'permanent-local t)
(defmacro with-current-notmuch-show-message (&rest body) (defmacro with-current-notmuch-show-message (&rest body)
"Evaluate body with current buffer set to the text of current message" "Evaluate body with current buffer set to the text of current message"
`(save-excursion `(save-excursion
@ -256,10 +260,12 @@ operation on the contents of the current buffer."
(all (buffer-substring (notmuch-show-message-top) (all (buffer-substring (notmuch-show-message-top)
(notmuch-show-message-bottom))) (notmuch-show-message-bottom)))
(props (notmuch-show-get-message-properties))) (props (notmuch-show-get-message-properties))
(indenting notmuch-show-indent-content))
(with-temp-buffer (with-temp-buffer
(insert all) (insert all)
(indent-rigidly (point-min) (point-max) (- depth)) (if indenting
(indent-rigidly (point-min) (point-max) (- depth)))
;; Remove the original header. ;; Remove the original header.
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "^$" (point-max) nil) (re-search-forward "^$" (point-max) nil)
@ -900,7 +906,8 @@ current buffer, if possible."
(setq body-start (point-marker)) (setq body-start (point-marker))
;; A blank line between the headers and the body. ;; A blank line between the headers and the body.
(insert "\n") (insert "\n")
(notmuch-show-insert-body msg (plist-get msg :body) depth) (notmuch-show-insert-body msg (plist-get msg :body)
(if notmuch-show-indent-content depth 0))
;; Ensure that the body ends with a newline. ;; Ensure that the body ends with a newline.
(unless (bolp) (unless (bolp)
(insert "\n")) (insert "\n"))
@ -908,7 +915,8 @@ current buffer, if possible."
(setq content-end (point-marker)) (setq content-end (point-marker))
;; Indent according to the depth in the thread. ;; Indent according to the depth in the thread.
(indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth)) (if notmuch-show-indent-content
(indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth)))
(setq message-end (point-max-marker)) (setq message-end (point-max-marker))
@ -955,6 +963,15 @@ current buffer, if possible."
"Showing all messages.")) "Showing all messages."))
(notmuch-show-refresh-view)) (notmuch-show-refresh-view))
(defun notmuch-show-toggle-thread-indentation ()
"Toggle the indentation of threads."
(interactive)
(setq notmuch-show-indent-content (not notmuch-show-indent-content))
(message (if notmuch-show-indent-content
"Content is indented."
"Content is not indented."))
(notmuch-show-refresh-view))
(defun notmuch-show-insert-tree (tree depth) (defun notmuch-show-insert-tree (tree depth)
"Insert the message tree TREE at depth DEPTH in the current thread." "Insert the message tree TREE at depth DEPTH in the current thread."
(let ((msg (car tree)) (let ((msg (car tree))
@ -1119,6 +1136,7 @@ Refreshes the current view, observing changes in cryptographic preferences."
(define-key map "#" 'notmuch-show-print-message) (define-key map "#" 'notmuch-show-print-message)
(define-key map "!" 'notmuch-show-toggle-elide-non-matching) (define-key map "!" 'notmuch-show-toggle-elide-non-matching)
(define-key map "$" 'notmuch-show-toggle-process-crypto) (define-key map "$" 'notmuch-show-toggle-process-crypto)
(define-key map "<" 'notmuch-show-toggle-thread-indentation)
map) map)
"Keymap for \"notmuch show\" buffers.") "Keymap for \"notmuch show\" buffers.")
(fset 'notmuch-show-mode-map notmuch-show-mode-map) (fset 'notmuch-show-mode-map notmuch-show-mode-map)