From: plugd Date: Tue, 6 Jul 2021 18:58:24 +0000 (+0200) Subject: Invisible messages now properly filled. X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=8d3a7b25c3766e81cbbd0062b311c8bb6cf25abb;p=lurk.git Invisible messages now properly filled. --- diff --git a/lurk.el b/lurk.el index 4d2a92e..26eb894 100644 --- a/lurk.el +++ b/lurk.el @@ -405,6 +405,15 @@ portion of the source component of the message, as LURK doesn't use this.") (puthash context facelist lurk-context-facelists)) facelist)) +(defun lurk--fill-strings (col indent &rest strings) + (with-temp-buffer + (setq buffer-invisibility-spec nil) + (let ((fill-column col) + (adaptive-fill-regexp (rx-to-string `(= ,indent anychar)))) + (apply #'insert strings) + (fill-region (point-min) (point-max) nil t) + (buffer-string)))) + (defun lurk-display-string (context prefix &rest strings) (with-current-buffer (get-buffer-create "*lurk*") (save-excursion @@ -413,28 +422,26 @@ portion of the source component of the message, as LURK doesn't use this.") (old-pos (marker-position lurk-prompt-marker)) (padded-timestamp (concat (format-time-string "%H:%M "))) (padded-prefix (if prefix (concat prefix " ") "")) - (adaptive-fill-regexp (rx-to-string - `(= ,(+ (length padded-timestamp) - (length padded-prefix)) - anychar))) - (fill-column 80) (context-atom (if context (intern context) nil))) (insert-before-markers - (propertize padded-timestamp - 'face 'lurk-timestamp - 'read-only t - 'context context - 'invisible context-atom) - (propertize padded-prefix - 'read-only t - 'context context - 'invisible context-atom) - (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n") - 'face (lurk-get-context-facelist context) - 'read-only t - 'context context - 'invisible context-atom)) - (fill-region old-pos lurk-prompt-marker nil t))))) + (lurk--fill-strings + 80 + (+ (length padded-timestamp) + (length padded-prefix)) + (propertize padded-timestamp + 'face 'lurk-timestamp + 'read-only t + 'context context + 'invisible context-atom) + (propertize padded-prefix + 'read-only t + 'context context + 'invisible context-atom) + (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n") + 'face (lurk-get-context-facelist context) + 'read-only t + 'context context + 'invisible context-atom))))))) (defun lurk-display-message (from to text) (let ((context (if (eq 'channel (lurk-get-context-type to))