aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-10-31 22:01:45 +0300
committerAlex Kost <alezost@gmail.com>2015-11-02 15:52:52 +0300
commitf4044b586d04c197325dec36eb35e77fe05028c7 (patch)
tree406d7be64dd166984d79c2e0eb88bab44d255029 /emacs
parent0048552d0de1582f016535078274be3cd4c66057 (diff)
downloadguix-f4044b586d04c197325dec36eb35e77fe05028c7.tar
guix-f4044b586d04c197325dec36eb35e77fe05028c7.tar.gz
emacs: Enable 'guix-build-log-minor-mode' in shell buffers.
* emacs/guix-build-log.el (guix-build-log-minor-mode-activate): New variable. (guix-build-log-minor-mode-activate-maybe): New function. * emacs/guix-init.el: Add it to 'shell-mode-hook'. * doc/emacs.texi (Emacs Build Log): Mention it.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-build-log.el13
-rw-r--r--emacs/guix-init.el1
2 files changed, 14 insertions, 0 deletions
diff --git a/emacs/guix-build-log.el b/emacs/guix-build-log.el
index c64946846e..3f78121a90 100644
--- a/emacs/guix-build-log.el
+++ b/emacs/guix-build-log.el
@@ -102,6 +102,12 @@
"Face for the number of seconds for a phase."
:group 'guix-build-log-faces)
+(defcustom guix-build-log-minor-mode-activate t
+ "If non-nil, then `guix-build-log-minor-mode' is automatically
+activated in `shell-mode' buffers."
+ :type 'boolean
+ :group 'guix-build-log)
+
(defcustom guix-build-log-mode-hook '()
"Hook run after `guix-build-log-mode' is entered."
:type 'hook
@@ -347,6 +353,13 @@ programmatically using hooks:
(font-lock-fontify-buffer)))
;;;###autoload
+(defun guix-build-log-minor-mode-activate-maybe ()
+ "Activate `guix-build-log-minor-mode' depending on
+`guix-build-log-minor-mode-activate' variable."
+ (when guix-build-log-minor-mode-activate
+ (guix-build-log-minor-mode)))
+
+;;;###autoload
(add-to-list 'auto-mode-alist
;; Regexp for log files (usually placed in /var/log/guix/...)
(cons (rx "/guix/drvs/" (= 2 alnum) "/" (= 30 alnum)
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 4b3d9c281c..1612dee83f 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -15,5 +15,6 @@ avoid loading autoloads of Emacs packages installed in
(guix-emacs-load-autoloads 'all))
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
+(add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe)
(provide 'guix-init)