X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=8060a20e2c3f7c0d63556d7a3b2872db6eb47c37;hp=47b66f34e19f4a15b425e6b4d4a3bd77a33e0f64;hb=18d001ce49a30194017396018d50a341286ea180;hpb=f021b824348ab525af737a879b8548ec4d84ca87 diff --git a/emacs.el b/emacs.el index 47b66f3..8060a20 100644 --- a/emacs.el +++ b/emacs.el @@ -386,14 +386,6 @@ load-warning buffer in case of failure." ;; "tool" bar? Are you kidding? (when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) -;; ;; If my own letter icon is here, use it and change its color -;; (when (file-exists-p "~/local/share/emacs/letter.xbm") -;; (setq-default display-time-mail-icon -;; (find-image -;; '((:type xbm -;; :file "~/local/share/emacs/letter.xbm" -;; :ascent center))))) - ;; My funky setting of face colors. Basically, we switch to a sober ;; look and darken a bit the colors which need to (because of the ;; darker background) @@ -409,8 +401,6 @@ load-warning buffer in case of failure." ;; X-window (when window-system - ;; (setq - ;; display-time-use-mail-icon t) (ff/configure-faces '( @@ -461,8 +451,8 @@ load-warning buffer in case of failure." ;; (fringe :background "black" :foreground "gray90") (fringe :background "gray80") (ff/date-info-face :foreground "white") - (ff/battery-info-face :foreground "white") - (ff/mail-alarm-face :foreground "white" :background "red2") + (ff/battery-info-face :foreground "black") + ;; (ff/mail-alarm-face :foreground "white" :background "red2") ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal) (gui-button-face :background "green" :foreground "black") )) @@ -514,8 +504,8 @@ load-warning buffer in case of failure." :inverse-video nil) (region :background "white" :foreground "black") (ff/date-info-face :foreground "white" :weight 'bold) - (ff/battery-info-face :foreground "white") - (ff/mail-alarm-face :foreground "red" :weight 'bold) + (ff/battery-info-face :foreground "black") + ;; (ff/mail-alarm-face :foreground "red" :weight 'bold) (selector/selection :background "yellow") (gui-button-face :background "green" :foreground "white") (enotes/information-face :foreground "cyan") @@ -607,13 +597,6 @@ load-warning buffer in case of failure." ;; Playing sounds ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; (defun ff/esd-sound (file) -;; "Plays a sound with the Enlighted sound daemon." -;; (interactive) -;; (process-kill-without-query (start-process-shell-command "esdplay" -;; nil -;; "esdplay" file))) - (defun ff/alsa-sound (file) "Plays a sound with ALSA." (interactive) @@ -867,40 +850,38 @@ printer." (error -1)) ) -(defun ff/temp-and-battery-info-string () (interactive) +(defun ff/temp-info-string () (interactive) (condition-case nil - (concat - - ;; The temperature - - (let ((temp (/ - (apply 'max (mapcar - (lambda (f) (string-to-number (ff/file-first-line f))) - ff/temperature-files)) - 1000))) - - (if (> temp 50) - (let ((s (format "%dC " temp))) - (if (> temp 70) - (propertize s 'face 'font-lock-warning-face) - s) - ) - ) - ) - - ;; The battery - - (pcase (ff/battery-state ff/battery-dirs) - ;; (`charging (format "c%d%%" (ff/battery-percent))) - ;; (`discharging (format "d%d%%" (ff/battery-percent))) - ;; (`unknown "f") - (`charging (format "↑%d%%" (ff/battery-percent))) - (`discharging (format "↓%d%%" (ff/battery-percent))) - (`unknown "✱") - (_ "?")) + ;; The temperature + + (let ((temp (/ + (apply 'max (mapcar + (lambda (f) (string-to-number (ff/file-first-line f))) + ff/temperature-files)) + 1000))) + + (if (> temp 50) + (let ((s (format "%dC " temp))) + (if (> temp 70) + (propertize s 'face 'font-lock-warning-face) + s) + ) + ) + ) - ) + (error nil)) + ) +(defun ff/battery-info-string () (interactive) + (condition-case nil + (pcase (ff/battery-state ff/battery-dirs) + ;; (`charging (format "c%d%%" (ff/battery-percent))) + ;; (`discharging (format "d%d%%" (ff/battery-percent))) + ;; (`unknown "f") + (`charging (format "↑%d%%" (ff/battery-percent))) + (`discharging (format "↓%d%%" (ff/battery-percent))) + (`unknown "✱") + (_ "?")) (error nil)) ) @@ -948,47 +929,38 @@ printer." (set-buffer-modified-p nil) )) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Make a sound when there is new mail -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; I do not like sounds anymore - -;; (setq ff/already-boinged-for-mail nil) - -;; (defun ff/boing-if-new-mail () -;; (if mail (when (not ff/already-boinged-for-mail) -;; ;; (ff/play-sound-async "~/local/sounds/boing1.wav") -;; ;; (ff/show-unspooled-mails) -;; (setq ff/already-boinged-for-mail t)) -;; (setq ff/already-boinged-for-mail nil)) -;; ) - -;; (add-hook 'display-time-hook 'ff/boing-if-new-mail) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Display time ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (setq - display-time-interval 15 ;; Check every 15s + display-time-interval 10 ;; Check every 10s display-time-string-forms `( - load " " + load - (propertize - (ff/temp-and-battery-info-string) - 'face 'ff/battery-info-face) + " " + + ,@(when (ff/battery-info-string) + '((ff/temp-info-string))) + + ,@(when (ff/battery-info-string) + '((propertize + (ff/battery-info-string) + 'face 'ff/battery-info-face))) + + " " (propertize - (concat " <" - 24-hours ":" minutes - " " - ;; dayname " " - monthname " " day - ">") + (concat ;;" ˌ" + 24-hours ":" minutes + " " + ;; dayname " " + monthname " " day + ;;"ˌ" + ) 'face 'ff/date-info-face) ) @@ -1950,19 +1922,6 @@ a file in /tmp" (define-key global-map [f8] 'ff-find-other-file) (define-key global-map [(shift f8)] (lambda () (interactive) (ff-find-other-file t))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Antiword, htmlize and boxquote -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(autoload 'no-word "no-word") -(add-to-list 'auto-mode-alist '("\\.doc\\'" . no-word)) -;; (add-to-list 'auto-mode-alist '("\\.DOC\\'" . no-word)) - -(autoload 'htmlize-buffer "htmlize" nil t) - -(setq boxquote-top-and-tail "------------------") -(autoload 'boxquote-region "boxquote" nil t) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The compilation hacks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;