diff options
author | David Bremner <bremner@debian.org> | 2012-01-13 20:52:01 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-01-13 20:52:01 -0400 |
commit | 0bbfc5ce8be91b881d9542d86aceec7e6a716e86 (patch) | |
tree | c60f3c371c1be649000e314889d233998654a240 /emacs | |
parent | 38546e4acba5593c6ad8b35712475abc27d3a4fd (diff) | |
parent | ffce9b7c25b9b44ec026b67d96e44cae09c99efe (diff) |
Merge branch 'release'
Conflicts:
notmuch-reply.c
notmuch.1
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/notmuch-show.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 5502efd1..2806879e 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -94,7 +94,7 @@ any given message." :group 'notmuch :type 'boolean) -(defcustom notmuch-indent-messages-width 1 +(defcustom notmuch-show-indent-messages-width 1 "Width of message indentation in threads. Messages are shown indented according to their depth in a thread. @@ -251,7 +251,7 @@ unchanged ADDRESS if parsing fails." "Insert a notmuch style headerline based on HEADERS for a message at DEPTH in the current thread." (let ((start (point))) - (insert (notmuch-show-spaces-n (* notmuch-indent-messages-width depth)) + (insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth)) (notmuch-show-clean-address (plist-get headers :From)) " (" date @@ -746,7 +746,7 @@ current buffer, if possible." (setq content-end (point-marker)) ;; Indent according to the depth in the thread. - (indent-rigidly content-start content-end (* notmuch-indent-messages-width depth)) + (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth)) (setq message-end (point-max-marker)) |