From 94914ca4690c0cff12d600a0c8ba6bfb3fb38dc5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 25 Jun 2019 21:44:32 +0200 Subject: [PATCH] magit-log-format-author-margin: New function Split it from `magit-log-format-margin'. --- lisp/magit-log.el | 48 +++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/lisp/magit-log.el b/lisp/magit-log.el index c8e6ef63..c0a79b19 100644 --- a/lisp/magit-log.el +++ b/lisp/magit-log.el @@ -1374,28 +1374,32 @@ The shortstat style is experimental and rather slow." (when-let ((option (magit-margin-option))) (if magit-log-margin-show-shortstat (magit-log-format-shortstat-margin rev) - (pcase-let ((`(,_ ,style ,width ,details ,details-width) - (or magit-buffer-margin - (symbol-value option)))) - (magit-make-margin-overlay - (concat (and details - (concat (propertize (truncate-string-to-width - (or author "") - details-width - nil ?\s (make-string 1 magit-ellipsis)) - 'face 'magit-log-author) - " ")) - (propertize - (if (stringp style) - (format-time-string - style - (seconds-to-time (string-to-number date))) - (pcase-let* ((abbr (eq style 'age-abbreviated)) - (`(,cnt ,unit) (magit--age date abbr))) - (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") - (- width (if details (1+ details-width) 0))) - cnt unit))) - 'face 'magit-log-date))))))) + (magit-log-format-author-margin author date)))) + +(defun magit-log-format-author-margin (author date &optional previous-line) + (pcase-let ((`(,_ ,style ,width ,details ,details-width) + (or magit-buffer-margin + (symbol-value option)))) + (magit-make-margin-overlay + (concat (and details + (concat (propertize (truncate-string-to-width + (or author "") + details-width + nil ?\s (make-string 1 magit-ellipsis)) + 'face 'magit-log-author) + " ")) + (propertize + (if (stringp style) + (format-time-string + style + (seconds-to-time (string-to-number date))) + (pcase-let* ((abbr (eq style 'age-abbreviated)) + (`(,cnt ,unit) (magit--age date abbr))) + (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") + (- width (if details (1+ details-width) 0))) + cnt unit))) + 'face 'magit-log-date)) + previous-line))) (defun magit-log-format-shortstat-margin (rev) (magit-make-margin-overlay -- 2.23.0 on): Likewise. * gnu/services/docker.scm (docker-configuration): Likewise. * gnu/services/file-sharing.scm (transmission-daemon-configuration): Likewise. * gnu/services/getmail.scm (getmail-configuration): Likewise. * gnu/services/mail.scm (dovecot-configuration) (opaque-dovecot-configuration): Likewise. * gnu/services/messaging.scm (prosody-configuration) (opaque-prosody-configuration): Likewise. * gnu/services/monitoring.scm (zabbix-server-configuration) (zabbix-agent-configuration): Likewise. * gnu/services/networking.scm (opendht-configuration): Likewise. * gnu/services/pm.scm (tlp-configuration): Likewise. * gnu/services/telephony.scm (jami-configuration): Likewise. * gnu/services/virtualization.scm (libvirt-configuration) (qemu-guest-agent-configuration): Likewise. * gnu/services/vpn.scm (openvpn-client-configuration): Likewise. Tobias Geerinckx-Rice 2021-10-11services: ganeti: Don't start the metadata daemon automatically....* gnu/services/ganeti.scm (ganeti-metad-service)[auto-start?]: New field. Marius Bakke 2020-10-28gnu: ganeti-luxid-service-type: Fix typo....* gnu/services/ganeti (ganeti-luxid-service-type)[description]: Fix spelling of "authoritative". Vagrant Cascadian 2020-10-10services: ganeti: Fix typo....* gnu/services/ganeti.scm (ganeti-luxid-service-type)[description]: Fix typo. Marius Bakke 2020-08-25services: ganeti-kvmd-service-type: Fix typo in description....* gnu/services/ganeti.scm (ganeti-kvmd-service-type)[description]: Fix typo. Tobias Geerinckx-Rice 2020-07-21services: ganeti: Fix erroneous gexp....* gnu/services/ganeti.scm (ganeti-watcher-command): Add missing parens. Marius Bakke 2020-07-19services: ganeti: Use TLS on the remote API by default....* gnu/services/ganeti.scm (<ganeti-rapi-configuration>): Set SSL? to #t. * gnu/tests/ganeti.scm (%ganeti-os): Set SSL? to #f. * doc/guix.texi (Virtualization Services): Adjust accordingly. Marius Bakke 2020-07-16services: Add ganeti....* gnu/services/ganeti.scm, gnu/tests/ganeti.scm: New files. * doc/guix.texi (Virtualization Services): Document the Ganeti services. Marius Bakke