branch: master
commit eb4be938a0cd9c4e70d2c94bb529b2804dcb6d7a
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* packages/greenbar/greenbar.el: Fix copyright line
While at it, remove redundant `:group` arguments.
(greenbar-color-themes): Remove unneeded use of `eval`.
(greenbar-mode): Mark as autoloaded.
Remove the hook function from the part of the hook where it was added.
---
packages/greenbar/greenbar.el | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/packages/greenbar/greenbar.el b/packages/greenbar/greenbar.el
index f81cc4a..c29fe2a 100644
--- a/packages/greenbar/greenbar.el
+++ b/packages/greenbar/greenbar.el
@@ -1,6 +1,6 @@
;;; greenbar.el --- Mark comint output with "greenbar" background -*-
lexical-binding: t -*-
-;; Copyright (C) 2013, 2015, 2020 Michael R. Mauger
+;; Copyright (C) 2013-2020 Free Software Foundation, Inc.
;; Author: Michael R. Mauger <mich...@mauger.com>
;; Version: 1.0
@@ -66,7 +66,6 @@
(defcustom greenbar-lines-per-bar 3
"How many lines of output should be colored together."
- :group 'greenbar
:type 'integer)
(defvar greenbar-color-themes
@@ -84,8 +83,7 @@
(let ((x (if (eq (frame-parameter nil 'background-mode) 'dark) "40"
"f0"))
(o (if (eq (frame-parameter nil 'background-mode) 'dark) "34"
"e4")))
- (mapcar (lambda (c)
- (eval `(concat "#" ,@c)))
+ (mapcar (lambda (c) (apply #'concat "#" c))
`((,x ,x ,o) (,x ,o ,o) (,x ,o ,x) (,o ,o ,x) (,o ,x ,x)
(,o ,x ,o))))))
"Greenbar themes.
@@ -94,7 +92,6 @@ a symbol that names the theme followed by the list bar
colors.")
(defcustom greenbar-background-colors 'greenbar
"List of background colors to be applied to output stripes."
- :group 'greenbar
:type `(choice ,@(mapcar (lambda (c)
(list 'const (car c)))
greenbar-color-themes)
@@ -165,6 +162,7 @@ set of background colors found in
(greenbar-next-bar))))))
string)
+;;;###autoload
(define-minor-mode greenbar-mode
"Enable \"green bar striping\" of comint output"
nil nil nil
@@ -172,7 +170,7 @@ set of background colors found in
(add-hook 'comint-output-filter-functions
#'greenbar-output-filter t t)
(remove-hook 'comint-output-filter-functions
- #'greenbar-output-filter)))
+ #'greenbar-output-filter t)))
(provide 'greenbar)
