diff options
| author | Richard M. Stallman | 2015-03-22 03:45:03 -0400 |
|---|---|---|
| committer | Richard Stallman | 2015-03-22 03:45:03 -0400 |
| commit | 1a80be15bb1974d454cf37bcd1bd1be64e2cb488 (patch) | |
| tree | 43e5cb056a2fb7a94b01b41bb237b851e2e9d6c9 | |
| parent | 414e79feeb445dc141b65767dfc3ba8dbb55723c (diff) | |
| download | emacs-1a80be15bb1974d454cf37bcd1bd1be64e2cb488.tar.gz emacs-1a80be15bb1974d454cf37bcd1bd1be64e2cb488.zip | |
Echo area shows when displaying a mime message.
* lisp/mail/rmail.el (rmail-show-message-1): When displaying a mime message,
indicate start and finish in the echo area.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index be3a763ab25..8631295ef6e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2015-03-22 Richard Stallman <rms@gnu.org> | 1 | 2015-03-22 Richard Stallman <rms@gnu.org> |
| 2 | 2 | ||
| 3 | * mail/rmail.el (rmail-show-message-1): When displaying a mime message, | ||
| 4 | indicate start and finish in the echo area. | ||
| 5 | |||
| 3 | * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc. | 6 | * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc. |
| 4 | (browse-url-firefox-arguments) | 7 | (browse-url-firefox-arguments) |
| 5 | (browse-url-firefox-startup-arguments): Doc fix. | 8 | (browse-url-firefox-startup-arguments): Doc fix. |
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 855a4c2d0ff..643b5f947c7 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el | |||
| @@ -2762,7 +2762,8 @@ The current mail message becomes the message displayed." | |||
| 2762 | (let ((mbox-buf rmail-buffer) | 2762 | (let ((mbox-buf rmail-buffer) |
| 2763 | (view-buf rmail-view-buffer) | 2763 | (view-buf rmail-view-buffer) |
| 2764 | blurb beg end body-start coding-system character-coding | 2764 | blurb beg end body-start coding-system character-coding |
| 2765 | is-text-message header-style) | 2765 | is-text-message header-style |
| 2766 | showing-message) | ||
| 2766 | (if (not msg) | 2767 | (if (not msg) |
| 2767 | (setq msg rmail-current-message)) | 2768 | (setq msg rmail-current-message)) |
| 2768 | (unless (setq blurb (rmail-no-mail-p)) | 2769 | (unless (setq blurb (rmail-no-mail-p)) |
| @@ -2788,7 +2789,8 @@ The current mail message becomes the message displayed." | |||
| 2788 | (setq beg (rmail-msgbeg msg) | 2789 | (setq beg (rmail-msgbeg msg) |
| 2789 | end (rmail-msgend msg)) | 2790 | end (rmail-msgend msg)) |
| 2790 | (when (> (- end beg) rmail-show-message-verbose-min) | 2791 | (when (> (- end beg) rmail-show-message-verbose-min) |
| 2791 | (message "Showing message %d" msg)) | 2792 | (setq showing-message t) |
| 2793 | (message "Showing message %d..." msg)) | ||
| 2792 | (narrow-to-region beg end) | 2794 | (narrow-to-region beg end) |
| 2793 | (goto-char beg) | 2795 | (goto-char beg) |
| 2794 | (with-current-buffer rmail-view-buffer | 2796 | (with-current-buffer rmail-view-buffer |
| @@ -2802,6 +2804,8 @@ The current mail message becomes the message displayed." | |||
| 2802 | (re-search-forward "mime-version: 1.0" nil t)) | 2804 | (re-search-forward "mime-version: 1.0" nil t)) |
| 2803 | (let ((rmail-buffer mbox-buf) | 2805 | (let ((rmail-buffer mbox-buf) |
| 2804 | (rmail-view-buffer view-buf)) | 2806 | (rmail-view-buffer view-buf)) |
| 2807 | (setq showing-message t) | ||
| 2808 | (message "Showing message %d..." msg) | ||
| 2805 | (set (make-local-variable 'rmail-mime-decoded) t) | 2809 | (set (make-local-variable 'rmail-mime-decoded) t) |
| 2806 | (funcall rmail-show-mime-function)) | 2810 | (funcall rmail-show-mime-function)) |
| 2807 | (setq body-start (search-forward "\n\n" nil t)) | 2811 | (setq body-start (search-forward "\n\n" nil t)) |
| @@ -2881,8 +2885,8 @@ The current mail message becomes the message displayed." | |||
| 2881 | (rmail-swap-buffers) | 2885 | (rmail-swap-buffers) |
| 2882 | (setq rmail-buffer-swapped t) | 2886 | (setq rmail-buffer-swapped t) |
| 2883 | (run-hooks 'rmail-show-message-hook) | 2887 | (run-hooks 'rmail-show-message-hook) |
| 2884 | (when (> (- end beg) rmail-show-message-verbose-min) | 2888 | (when showing-message |
| 2885 | (message "Showing message %d...done" msg)))) | 2889 | (setq blurb (format "Showing message %d...done" msg))))) |
| 2886 | blurb)) | 2890 | blurb)) |
| 2887 | 2891 | ||
| 2888 | (defun rmail-copy-headers (beg end &optional ignored-headers) | 2892 | (defun rmail-copy-headers (beg end &optional ignored-headers) |