← Back to branch summary

~reddyuday/vm/message

« back to all changes in this revision

Viewing changes to lisp/vm-mime.el

  • Committer: Uday S Reddy
  • Date: 2012-01-03 16:49:23 UTC
  • Revision ID: u.s.reddy@cs.bham.ac.uk-20120103164923-bop0mgk7bh53morm
https://launchpad.net/bugs/771199
Uniformly added buffer-name to minibuffer messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lisp/vm-mime.el
2825
2825
            ;; do clean up
2826
2826
            (goto-char end)
2827
2827
            (delete-char -1)
2828
 
            (vm-inform 6 "Inlining text/html by %s... done."
2829
 
                     vm-mime-text/html-handler)
 
2828
            (vm-emit-mime-decoding-message
 
2829
             "Inlining text/html by %s... done." vm-mime-text/html-handler)
2830
2830
            t)
2831
2831
        (error (vm-set-mm-layout-display-error
2832
2832
                layout
2833
2833
                (format "Inline text/html by %s display failed: %s"
2834
2834
                        vm-mime-text/html-handler
2835
2835
                        (error-message-string error-data)))
2836
 
               (vm-warn 0 2 "%s" (vm-mm-layout-display-error layout))
 
2836
               (vm-warn 0 2 "%s: %s" 
 
2837
                        (buffer-name) (vm-mm-layout-display-error layout))
2837
2838
               nil))
2838
2839
    ;; no handler
2839
 
    (vm-warn 0 2 "No handler available for internal display of text/html")
 
2840
    (vm-warn 0 2 "%s: No handler available for internal display of text/html"
 
2841
             (buffer-name))
2840
2842
    nil))
2841
2843
  
2842
2844
 
2854
2856
        (progn
2855
2857
          (vm-set-mm-layout-display-error
2856
2858
           layout (concat "Undisplayable charset: " charset))
2857
 
          (vm-warn 0 2 "%s" (vm-mm-layout-display-error layout))
 
2859
          (vm-warn 0 2 "%s: %s" (buffer-name vm-mail-buffer) 
 
2860
                   (vm-mm-layout-display-error layout))
2858
2861
          nil)
2859
2862
      (vm-mime-insert-mime-body layout)
2860
2863
      (unless (bolp) (insert "\n"))
2894
2897
        (enriched-decode start end)
2895
2898
      (error (vm-set-mm-layout-display-error
2896
2899
              layout (format "enriched-decode signaled %s" errdata))
2897
 
             (vm-warn 0 2 "%s" (vm-mm-layout-display-error layout))
 
2900
             (vm-warn 0 2 "%s: %s" (buffer-name vm-mail-buffer)
 
2901
                      (vm-mm-layout-display-error layout))
2898
2902
             nil ))
2899
2903
    (vm-energize-urls-in-message-region start end)
2900
2904
    (goto-char end)
3833
3837
                 (vm-image-too-small
3834
3838
                  (setq do-strips nil))
3835
3839
                 (error
3836
 
                  (vm-warn 0 0 "Failed making image strips: %s" error-data)
 
3840
                  (vm-warn 0 0 "%s: Failed making image strips: %s" 
 
3841
                           (buffer-name vm-mail-buffer) error-data)
3837
3842
                  ;; fallback to the non-strips way
3838
3843
                  (setq do-strips nil)))))
3839
3844
        (cond ((not do-strips)
3954
3959
                 (vm-image-too-small
3955
3960
                  (setq do-strips nil))
3956
3961
                 (error
3957
 
                  (vm-warn 0 0 "Failed making image strips: %s" error-data)
 
3962
                  (vm-warn 0 0 "%s: Failed making image strips: %s" 
 
3963
                           (buffer-name vm-mail-buffer) error-data)
3958
3964
                  ;; fallback to the non-strips way
3959
3965
                  (setq do-strips nil)))))
3960
3966
        (cond ((not do-strips)
4032
4038
;;                  (setq dims (condition-case error-data
4033
4039
;;                                 (vm-get-image-dimensions origfile)
4034
4040
;;                               (error
4035
 
;;                                (vm-warn 0 0 "Failed getting image dimensions: %s"
4036
 
;;                                         error-data)
 
4041
;;                                (vm-warn 0 0 "%s: Failed getting image dimensions: %s"
 
4042
;;                                         (buffer-name vm-mail-buffer) error-data)
4037
4043
;;                                (throw 'done nil)))
4038
4044
;;                        width (nth 0 dims)
4039
4045
;;                        height (nth 1 dims)
4141
4147
;;                                                             overlay-list)
4142
4148
;;                                                            image-type)))
4143
4149
;;          (error
4144
 
;;           (vm-warn 0 0 "Failed making image strips: %s" error-data)))
 
4150
;;           (vm-warn 0 0 "%s: Failed making image strips: %s" 
 
4151
;;                        (buffer-name vm-mail-buffer) error-data)))
4145
4152
;;        t ))
4146
4153
;;     nil ))
4147
4154