From 3835c2e45ee51eaa8236aed6cc49b04d3813a947 Mon Sep 17 00:00:00 2001 From: Thierry Volpiatto Date: Sun, 2 Mar 2014 20:58:49 +0100 Subject: [PATCH] * mu4e/mu4e-utils.el (mu4e~fontify-cited): Use string-width. * mu4e/mu4e-vars.el (mu4e-cited-regexp): Improve it. --- mu4e/mu4e-utils.el | 8 ++++---- mu4e/mu4e-vars.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el index 26bd1c80..5f246eb6 100644 --- a/mu4e/mu4e-utils.el +++ b/mu4e/mu4e-utils.el @@ -1090,10 +1090,10 @@ used in the view and compose modes." (goto-char (point-min)) (when (search-forward-regexp "^\n" nil t) ;; search the first empty line (while (re-search-forward mu4e-cited-regexp nil t) - (let* ((level (length (replace-regexp-in-string " " "" (match-string 1)))) - (face - (unless (zerop level) - (intern-soft (format "mu4e-cited-%d-face" level))))) + (let* ((level (string-width (replace-regexp-in-string + " " "" (match-string 1)))) + (face (unless (zerop level) + (intern-soft (format "mu4e-cited-%d-face" level))))) (when face (add-text-properties (line-beginning-position 1) (line-end-position 1) `(face ,face))))))))) diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el index 839d0214..73c22f1c 100644 --- a/mu4e/mu4e-vars.el +++ b/mu4e/mu4e-vars.el @@ -181,7 +181,7 @@ view buffer." :type 'boolean :group 'mu4e) -(defcustom mu4e-cited-regexp "^ *\\(> *>*\\)" +(defcustom mu4e-cited-regexp "^ *\\(\\(>+ ?\\)+\\)" "Regular expression that determines whether a line is a citation." :type 'string :group 'mu4e)