Browse files

Avoid unnecessary errors

  • Loading branch information...
sabof committed Feb 7, 2014
1 parent 28a970a commit 186fc8941484511749cf54a403cb67d37f733d2c
Showing with 10 additions and 7 deletions.
  1. +10 −7 mu4e/mu4e-view.el
@@ -337,12 +337,12 @@ add text-properties to VAL."
-(defun mu4e~view-toggle-contact (&optional point)
+(defun* mu4e~view-toggle-contact (&optional point)
"Toggle between the long and short versions of long/short string
at POINT, or if nil, at (point)."
(unless (get-text-property (or point (point)) 'long)
- (error "point is not toggleable"))
+ (return-from mu4e~view-toggle-contact))
(let* ((point (or point (point)))
;; find the first pos part of the button
(start (previous-property-change point))
@@ -443,14 +443,16 @@ at POINT, or if nil, at (point)."
(let* (( msg (mu4e~view-get-property-from-event 'mu4e-msg))
( attnum (mu4e~view-get-property-from-event 'mu4e-attnum)))
- (mu4e-view-open-attachment msg attnum)))
+ (when (and msg attnum)
+ (mu4e-view-open-attachment msg attnum))))
(defun mu4e~view-save-attach-from-binding ()
"Save the attachement at point, or click location."
(let* (( msg (mu4e~view-get-property-from-event 'mu4e-msg))
( attnum (mu4e~view-get-property-from-event 'mu4e-attnum)))
- (mu4e-view-save-attachment-single msg attnum)))
+ (when (and msg attnum)
+ (mu4e-view-save-attachment-single msg attnum))))
(defun mu4e~view-construct-attachments-header (msg)
"Display attachment information; the field looks like something like:
@@ -769,9 +771,10 @@ If the optional argument URL is provided, browse that instead.
If the url is mailto link, start writing an email to that address."
(let* (( url (or url (mu4e~view-get-property-from-event 'mu4e-url))))
- (if (string-match-p "^mailto:" url)
- (mu4e~compose-browse-url-mail url)
- (browse-url url))))
+ (when url
+ (if (string-match-p "^mailto:" url)
+ (mu4e~compose-browse-url-mail url)
+ (browse-url url)))))
(defun mu4e~view-show-images-maybe (msg)
"Show attached images, if `mu4e-show-images' is non-nil."

0 comments on commit 186fc89

Please sign in to comment.