alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e.el: improve url-matching regexp, some cosmetics

Browse Source
This commit is contained in:
djcb
2011-12-21 08:49:13 +02:00
parent c9664d85ef
commit 4bcf2a30d6
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emacs/mu4e-view.el
View File

@ -91,7 +91,8 @@ marking if it still had that."
;; date ;; date
(:date (:date
(let ((datestr (let ((datestr
(when fieldval (format-time-string mu4e-view-date-format fieldval)))) (when fieldval (format-time-string mu4e-view-date-format
fieldval))))
(if datestr (mu4e-view-header fieldname datestr) ""))) (if datestr (mu4e-view-header fieldname datestr) "")))
;; size ;; size
(:size (mu4e-view-size msg) (:size (mu4e-view-size msg)
@ -172,11 +173,13 @@ marking if it still had that."
(incf id) (incf id)
(puthash id att mu4e-attach-map) (puthash id att mu4e-attach-map)
(concat (concat
(propertize (format "[%d]" id) 'face 'mu4e-view-attach-number-face) (propertize (format "[%d]" id)
'face 'mu4e-view-attach-number-face)
(propertize name 'face 'mu4e-view-link-face) (propertize name 'face 'mu4e-view-link-face)
(if size (if size
(concat (concat
"(" (propertize (mu4e-display-size size) 'face 'mu4e-view-header-key-face) "(" (propertize (mu4e-display-size size)
'face 'mu4e-view-header-key-face)
")") ")")
"") "")
))) )))
@ -346,6 +349,11 @@ Seen; if the message is not New/Unread, do nothing."
(defvar mu4e-link-map nil (defvar mu4e-link-map nil
"*internal* A map of some number->url so we can jump to url by number.") "*internal* A map of some number->url so we can jump to url by number.")
(defconst mu4e-url-regexp
"\\(https?://[+-a-zA-Z0-9.?_$%/+&#@!~,:;=/]+\\)"
"*internal* regexp that matches URLs; match-string 1 will contain
the matched URL, if any.")
(defun mu4e-view-beautify () (defun mu4e-view-beautify ()
"Improve the message view a bit, by making URLs clickable, "Improve the message view a bit, by making URLs clickable,
removing '^M' etc." removing '^M' etc."
@ -361,9 +369,8 @@ removing '^M' etc."
(when p (when p
(add-text-properties p (point-max) '(face mu4e-view-footer-face)))) (add-text-properties p (point-max) '(face mu4e-view-footer-face))))
;; this is fairly simplistic... ;; this is fairly simplistic...
(goto-char (point-min)) ;; FIXME: breaks with URLs ending in (e.g.) '=' (goto-char (point-min))
(while (re-search-forward "\\(https?://[+-a-zA-Z0-9.?_$%/+&#@!~,:;=]*\\)\\>" (while (re-search-forward mu4e-url-regexp nil t)
nil t)
(let ((subst (propertize (match-string-no-properties 0) (let ((subst (propertize (match-string-no-properties 0)
'face 'mu4e-view-link-face))) 'face 'mu4e-view-link-face)))
(incf num) (incf num)