X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=43debb260610d724a6100d74d7cf983c54ffd149;hb=HEAD;hp=4c0ad74d5043cefcefaa86ab65313660dade6884;hpb=22eebce431269398e1cb4d753bc737e30a35eb26;p=notmuch diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 4c0ad74d..19b51753 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -104,7 +104,7 @@ notmuch-show functions such as Finally, if this variable is set to nil, no header is displayed." - :type '(choice (const :tag "No header" ni) + :type '(choice (const :tag "No header" nil) (const :tag "Subject" t) (string :tag "Format") (function :tag "Function")) @@ -864,7 +864,7 @@ will return nil if the CID is unknown or cannot be retrieved." (unless (icalendar-import-buffer file t) (error "Icalendar import error. %s" "See *icalendar-errors* for more information")) - (set-buffer (get-file-buffer file)) + (set-buffer (find-buffer-visiting file)) (setq result (buffer-substring (point-min) (point-max))) (set-buffer-modified-p nil) (kill-buffer (current-buffer))) @@ -1696,6 +1696,8 @@ All currently available key bindings: (setq notmuch-buffer-refresh-function #'notmuch-show-refresh-view) (setq buffer-read-only t) (setq truncate-lines t) + (when (boundp 'untrusted-content) + (setq untrusted-content t)) (setq imenu-prev-index-position-function #'notmuch-show-imenu-prev-index-position-function) (setq imenu-extract-index-name-function @@ -2686,7 +2688,9 @@ This function is used as a value for `imenu-prev-index-position-function'." (if (bobp) nil - (notmuch-show-previous-message) + (if (eobp) + (notmuch-show-move-to-message-top) + (notmuch-show-goto-message-previous)) t)) (defun notmuch-show-imenu-extract-index-name-function ()