[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [STUMP] [PATCH] pushnew instead of push for adding to *screen-mode-l
From: |
John Li |
Subject: |
Re: [STUMP] [PATCH] pushnew instead of push for adding to *screen-mode-line-formatters* (was: adjoin instead of push...) |
Date: |
Fri, 11 Jul 2008 12:52:34 -0400 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
---
This lets you load these files multiple times without having
duplicates in *screen-mode-line-formatters*.
Also removes tabs, EOL whitespace, and setq's.
On Thu, Jul 10, 2008 at 07:53:46PM -0700, Shawn wrote:
> pushnew is probably the one you want to use.
Whoops, didn't know about pushnew. This one uses it.
contrib/battery.lisp | 23 +++++++++++------------
contrib/cpu.lisp | 2 +-
contrib/mpd.lisp | 6 +++---
contrib/notifications.lisp | 2 +-
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/contrib/battery.lisp b/contrib/battery.lisp
index 3e7ca13..605c1db 100644
--- a/contrib/battery.lisp
+++ b/contrib/battery.lisp
@@ -37,7 +37,7 @@
(export '(*battery-name*))
(dolist (a '((#\b fmt-bat-charge)))
- (push a *screen-mode-line-formatters*))
+ (pushnew a *screen-mode-line-formatters* :test 'equal))
(defvar *bat-state* nil)
(defvar *bat-remain* 0)
@@ -63,7 +63,7 @@
(let ((battery-state (read-battery-file *battery-name* "state"))
(battery-info (read-battery-file *battery-name* "info")))
(if (string= "no" (gethash "present" battery-state))
- (setq *bat-state* nil)
+ (setf *bat-state* nil)
(let ((charge-state (gethash "charging state" battery-state))
(remain (parse-integer (gethash "remaining capacity"
battery-state)
:junk-allowed t))
@@ -71,15 +71,14 @@
:junk-allowed t) 0) 60))
(full (parse-integer (gethash "design capacity" battery-info)
:junk-allowed t)))
- (setq *bat-remain* (round (/ (* 100 remain) full))
+ (setf *bat-remain* (round (/ (* 100 remain) full))
*bat-state* charge-state
*bat-remain-time* nil)
-
(when (> rate 0)
(let* ((online (round (/ (if (string= "charging" *bat-state*)
(- full remain) remain)
rate))))
- (setq *bat-remain-time* (multiple-value-bind (h m)
+ (setf *bat-remain-time* (multiple-value-bind (h m)
(truncate online 60)
(list h m)))))))))))
@@ -88,10 +87,10 @@
(declare (ignore ml))
(current-battery-charge)
(if *bat-state*
- (format nil "BAT: ~D%~A"
- *bat-remain*
- (if *bat-remain-time*
- (format nil " (~2,'0d:~2,'0d) ~A" (car *bat-remain-time*)
(cadr *bat-remain-time*) *bat-state*) "")) "no battery"))
+ (format nil "BAT: ~D%~A"
+ *bat-remain*
+ (if *bat-remain-time*
+ (format nil " (~2,'0d:~2,'0d) ~A" (car *bat-remain-time*)
(cadr *bat-remain-time*) *bat-state*) "")) "no battery"))
;; Alternative display:
@@ -116,9 +115,9 @@
;; (if (or (string= *bat-state* "charging")
;; (string= *bat-state* "charged"))
;; "AC" "DC")
-;; *bat-remain*
-;; (if (and (string/= *bat-state* "charged") *bat-remain-time*)
-;; (format nil (if (and (= (car *bat-remain-time*) 0)
+;; *bat-remain*
+;; (if (and (string/= *bat-state* "charged") *bat-remain-time*)
+;; (format nil (if (and (= (car *bat-remain-time*) 0)
;; (< (cadr *bat-remain-time*) 30))
;; " (^[^B^1*~2,'0d:~2,'0d^])" "
(~2,'0d:~2,'0d)")
;; (car *bat-remain-time*)
diff --git a/contrib/cpu.lisp b/contrib/cpu.lisp
index d62a080..7b980f9 100644
--- a/contrib/cpu.lisp
+++ b/contrib/cpu.lisp
@@ -41,7 +41,7 @@
(#\C fmt-cpu-usage-bar)
(#\f fmt-cpu-freq)
(#\t fmt-cpu-temp)))
- (push a *screen-mode-line-formatters*))
+ (pushnew a *screen-mode-line-formatters* :test 'equal))
;; Defaults arguments for fmt-cpu-usage-bar
(defvar *cpu-usage-bar-width* 10)
diff --git a/contrib/mpd.lisp b/contrib/mpd.lisp
index b8d1bdd..9ac7faf 100644
--- a/contrib/mpd.lisp
+++ b/contrib/mpd.lisp
@@ -102,7 +102,7 @@
(defun init-mpd-connection ()
"Connect to mpd server"
- (setq *mpd-socket*
+ (setf *mpd-socket*
#+clisp
(handler-case (socket:socket-connect *mpd-port* *mpd-server*
:element-type 'character)
@@ -134,7 +134,7 @@
;;mpd formatter
(dolist (a '((#\m fmt-mpd-status)))
- (push a *screen-mode-line-formatters*))
+ (pushnew a *screen-mode-line-formatters* :test 'equal))
(defparameter *mpd-current-song* nil)
(defparameter *mpd-status* nil)
@@ -454,4 +454,4 @@
(define-key m (kbd "d") "mpd-volume-down")
(define-key m (kbd "S") '*mpd-search-map*)
(define-key m (kbd "A") '*mpd-add-map*)
- m))
\ No newline at end of file
+ m))
diff --git a/contrib/notifications.lisp b/contrib/notifications.lisp
index 9d58c9c..2d9ccd9 100644
--- a/contrib/notifications.lisp
+++ b/contrib/notifications.lisp
@@ -66,7 +66,7 @@
(in-package :stumpwm)
-(push '(#\N notifications-as-string) *screen-mode-line-formatters*)
+(pushnew '(#\N notifications-as-string) *screen-mode-line-formatters* :test
'equal)
(defparameter *notifications-delimiters* '("[" "]"))
--
1.5.6