diff options
| -rw-r--r-- | attic/elisp/jao-proton-utils.el (renamed from lib/net/jao-proton-utils.el) | 0 | ||||
| -rw-r--r-- | custom/jao-custom-notmuch.el | 4 | ||||
| -rw-r--r-- | lib/doc/jao-words.el | 2 | ||||
| -rw-r--r-- | lib/eos/jao-afio.el | 1 | ||||
| -rw-r--r-- | lib/eos/jao-tracking.el | 2 | ||||
| -rw-r--r-- | lib/media/jao-mpc.el | 4 | ||||
| -rw-r--r-- | lib/net/jao-notmuch.el | 5 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 8 |
8 files changed, 14 insertions, 12 deletions
diff --git a/lib/net/jao-proton-utils.el b/attic/elisp/jao-proton-utils.el index a8f13eb..a8f13eb 100644 --- a/lib/net/jao-proton-utils.el +++ b/attic/elisp/jao-proton-utils.el diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el index 49230e8..06908e8 100644 --- a/custom/jao-custom-notmuch.el +++ b/custom/jao-custom-notmuch.el @@ -253,10 +253,6 @@ (jao-notmuch-jump-search t))) ;;; tags -(defvar jao-notmuch--shared-tags - '("new" "unread" "flagged" "signed" "sent" "attachment" "forwarded" "inbox" - "encrypted" "gmane" "gnus" "feeds" "rss" "mce" "trove" "prog" "emacs")) - (setq notmuch-archive-tags '("+trove" "-hacking" "-new" "-drivel" "-words" "-inbox") notmuch-show-mark-read-tags '("-new" "-unread") diff --git a/lib/doc/jao-words.el b/lib/doc/jao-words.el index 328fecf..52e5093 100644 --- a/lib/doc/jao-words.el +++ b/lib/doc/jao-words.el @@ -28,7 +28,7 @@ (cl-loop with result = nil for elt in raw-word-list do (cl-incf (cdr (or (assoc elt result) - (first (push (cons elt 0) result))))) + (car (push (cons elt 0) result))))) finally return (sort result (lambda (a b) (string< (car a) (car b)))))) diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el index f6f07a3..caacc8c 100644 --- a/lib/eos/jao-afio.el +++ b/lib/eos/jao-afio.el @@ -22,7 +22,6 @@ (require 'multisession) (require 'cl-lib) (require 'jao-doc-session) -(require 'jao-pdf) (defvar jao-afio-use-frames (not window-system)) (defvar jao-afio-frame-parameters nil) diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el index 6ee04bd..4cf80c1 100644 --- a/lib/eos/jao-tracking.el +++ b/lib/eos/jao-tracking.el @@ -93,7 +93,7 @@ (defun jao-tracking-set-log (v) (when (fboundp 'x-change-window-property) (x-change-window-property "_EMACS_LOG" v nil nil nil nil 0)) - (if jao-wayland-enabled + (if (bound-and-true-p jao-wayland-enabled) (let ((inhibit-message t)) (shell-command (format "echo \"%s\" > %s" v jao-tracking--pipe))) (let* ((action (if (string-blank-p v) "remove" "add")) diff --git a/lib/media/jao-mpc.el b/lib/media/jao-mpc.el index cb47f17..f2286a2 100644 --- a/lib/media/jao-mpc.el +++ b/lib/media/jao-mpc.el @@ -79,10 +79,6 @@ (defsubst jao-mpc--queue-len (&optional port) (string-to-number (jao-mpc--cmd "status %length%" port))) -(defsubst jao--put-face (str face) - (put-text-property 0 (length str) 'face face str) - str) - (defun jao-mpc--current-timestr (playing-times &optional current) (let* ((current (or current (jao-mpc--current))) (time (alist-get 'totaltime current ""))) diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el index 40db88d..61233e6 100644 --- a/lib/net/jao-notmuch.el +++ b/lib/net/jao-notmuch.el @@ -346,12 +346,15 @@ (let ((tags (plist-get (notmuch-tree-get-message-properties) :orig-tags))) (jao-notmuch-tree--tag tags nil))) +(defvar jao-notmuch--shared-tags + '("new" "unread" "flagged" "signed" "sent" "attachment" "forwarded" "inbox" + "encrypted" "gmane" "gnus" "feeds" "rss" "mce" "trove" "prog" "emacs")) + (defun jao-notmuch-subtags (tag &rest excl) (let* ((cmd (concat "notmuch search --output=tags tag:" tag)) (ts (split-string (shell-command-to-string cmd)))) (seq-difference ts (append jao-notmuch--shared-tags (cons tag excl))))) - ;;; fcc (defvar jao-notmuch-tags-not-inherited '("attachment" "sent" "new" "trove" "flagged" "drivel" "replied")) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index dc3eee5..1f5e09a 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -68,6 +68,10 @@ (defvar jao-themes--f11 '((c "cadetblue4"))) (defvar jao-themes--f12 '((c "darkslategrey"))) +(defgroup jao-themes-faces nil + "Faces for unified custom themes" + :group 'faces) + (defface jao-themes-hilite '((t :inherit default)) "") (defface jao-themes-italic '((t :inherit default)) "") (defface jao-themes-button '((t :inherit default)) "") @@ -118,6 +122,10 @@ (jao-themes--normalize-body (apply 'append (mapcar 'jao-themes--parse-face-sym f)))))) +(defsubst jao--put-face (str face) + (put-text-property 0 (length str) 'face face str) + str) + (defvar jao-themes--default-cidxs '("#000000" "#cd0000" "#00cd00" "#cdcd00" "#0000cd" "#cd00cd" "#00cdcd" "#e5e5e5" |