[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/moe-theme 41bab7a397 3/3: Rename mode-line related variabl
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/moe-theme 41bab7a397 3/3: Rename mode-line related variables/function from moe-theme-* to moe-theme-modeline-* |
|
Date: |
Thu, 18 May 2023 08:01:29 -0400 (EDT) |
branch: elpa/moe-theme
commit 41bab7a3974b81dc40226bfd1e0190e2d7e57db0
Author: ono ono <azazabc123@gmail.com>
Commit: ono ono <azazabc123@gmail.com>
Rename mode-line related variables/function from moe-theme-* to
moe-theme-modeline-*
---
README.org | 25 ++++---------
moe-theme.el | 114 ++++++++++++++++++++++++++++++++---------------------------
2 files changed, 67 insertions(+), 72 deletions(-)
diff --git a/README.org b/README.org
index 1a6d31edac..902cea591f 100644
--- a/README.org
+++ b/README.org
@@ -1,17 +1,4 @@
* moe-theme
-#+BEGIN_QUOTE
-** Acknowedgement
-Latest version is under inactive development. I haven't finished it indeed,
however, I personally have already used it for quite a long time.
-
-Currently free time is precious for me, to rest from work, to learn foreign
languages, to study Harmony & Voice Leading, to compose, to practice piano and
violin, to exercise. So I will not spend more massive time on this project for
any large modification. I've ever spent too much time on this project before to
hold more passion and patience to write merely a color theme, even not an
application. (You will not believe how much it is if you has never done such
tedious task for EACH mode [...]
-
-*If you want to try or help to QA the latest development version, see ~dev~
branch.*
-
-*If you want to make `moe-theme` supports more modes, please send a PR (but be
aesthetic; patch with too ugly color balance will be rejected.^^||| )*.
Currently I honestly has no more free time and passion on such a tedious
time-costing trial-and-error task.
-
-The last but not the least, thanks for your using and happy hacking!
-#+END_QUOTE
-
#+BEGIN_HTML
<a
href="https://raw.github.com/kuanyui/moe-theme.el/master/pics/moe-theme.png";><img
src="https://raw.github.com/kuanyui/moe-theme.el/master/pics/moe-theme.png";
width="720" height="401"/></a>
#+END_HTML
@@ -39,7 +26,7 @@ And more:
2. Delightful & good-looking color palettes™
3. Customizable
- Optional =Monokai= / =Tomorrow= for syntax-highlighting (or totally
customize by yourself)
- - Changable Mode-line / Powerline color.
+ - Mode-line / Powerline color
- Titles font sizes for .
4. Fully-supported for each modes:
- Diff / EDiff
@@ -106,8 +93,8 @@ There's a full customization example:
(setq moe-theme-resize-title-org '(1.5 1.4 1.3 1.2 1.1 1.0 1.0 1.0
1.0))
(setq moe-theme-resize-title-rst '(1.5 1.4 1.3 1.2 1.1 1.0))
- ;; Choose a color for mode-line.(Default: blue)
- (setq moe-theme-mode-line-color 'cyan)
+ ;; Choose a color for modeline.(Default: blue)
+ (setq moe-theme-modeline-color 'cyan)
;; Finally, apply moe-theme now.
;; Choose what you like, (moe-light) or (moe-dark)
@@ -162,13 +149,13 @@ same size.
*** Change Color of Mode-line (or Powerline)
#+BEGIN_SRC lisp
- (setq moe-theme-mode-line-color 'orange)
+ (setq moe-theme-modeline-color 'orange)
;; (Available colors: blue, orange, green ,magenta, yellow, purple, red,
cyan, w/b.)
#+END_SRC
-You can also use =M-x= =moe-theme-select-color= to change color interactively.
+You can also use =M-x= =moe-theme-modeline-select-color= to change color
interactively.
-Or =M-x= =moe-theme-random-color= to have a good luck.
+Or =M-x= =moe-theme-modeline-random-color= to have a good luck.
**** Powerline support
diff --git a/moe-theme.el b/moe-theme.el
index 3d6b07bcae..9dbef70940 100644
--- a/moe-theme.el
+++ b/moe-theme.el
@@ -56,7 +56,9 @@ If nil, just bold buffer-id without highlight")
(defconst moe-theme-modeline-available-colors-set '(blue green orange magenta
yellow purple red cyan w/b))
-(defvar moe-theme-mode-line-color 'blue
+(defalias 'moe-theme-mode-line-color 'moe-theme-modeline-color)
+(make-obsolete-variable 'moe-theme-mode-line-color 'moe-theme-modeline-color
"unpredictable someday.")
+(defvar moe-theme-modeline-color 'blue
"Default is 'blue.
If nil, no background color.
Available choices: 'blue, 'cyan', 'green, 'magenta, 'red, 'orange, 'yellow,
'purple, 'w/b")
@@ -202,39 +204,39 @@ Avoid unnecessary load-theme")
(null (window-system)))
(set-face-attribute 'default nil :background "#ffffff"
:foreground "#5f5f5f"))))
- (cond ((eq moe-theme-mode-line-color 'blue)
+ (cond ((eq moe-theme-modeline-color 'blue)
(set-face-attribute 'mode-line nil :background "#afd7ff" :foreground
"#005f87")
(set-face-attribute 'mode-line-buffer-id nil :background "#afd7ff"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#5fafd7"
:background "#3a3a3a"))
- ((eq moe-theme-mode-line-color 'green)
+ ((eq moe-theme-modeline-color 'green)
(set-face-attribute 'mode-line nil :background "#afdf77" :foreground
"#005f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#a1db00"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#a1db00"
:background "#3a3a3a"))
- ((eq moe-theme-mode-line-color 'orange)
+ ((eq moe-theme-modeline-color 'orange)
(set-face-attribute 'mode-line nil :background "#ffd787" :foreground
"#d75f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffd787"
:foreground "#1c1c1c")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff8700"
:background "#1c1c1c"))
- ((eq moe-theme-mode-line-color 'magenta)
+ ((eq moe-theme-modeline-color 'magenta)
(set-face-attribute 'mode-line nil :background "#ffafd7" :foreground
"#cc1f8b")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffafd7"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff4ea3"
:background "#3a3a3a"))
- ((eq moe-theme-mode-line-color 'yellow)
+ ((eq moe-theme-modeline-color 'yellow)
(set-face-attribute 'mode-line nil :background "#fce94f" :foreground
"#875f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#fce94f"
:foreground "#3a3a3a")
(set-face-attribute 'minibuffer-prompt nil :foreground "#fce94f"
:background "#3a3a3a"))
- ((eq moe-theme-mode-line-color 'purple)
+ ((eq moe-theme-modeline-color 'purple)
(set-face-attribute 'mode-line nil :background "#e6a8df" :foreground
"#6c0099")
(set-face-attribute 'mode-line-buffer-id nil :background "#e6a8df"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#af5fd7"
:background "#080808"))
- ((eq moe-theme-mode-line-color 'red)
+ ((eq moe-theme-modeline-color 'red)
(set-face-attribute 'mode-line nil :background "#ffafaf" :foreground
"#d40000")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffafaf"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff4b4b"
:background "#080808"))
- ((eq moe-theme-mode-line-color 'cyan)
+ ((eq moe-theme-modeline-color 'cyan)
(set-face-attribute 'mode-line nil :background "#87d7af" :foreground
"#005f5f")
(set-face-attribute 'mode-line-buffer-id nil :background "#87d7af"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#5faf87"
:background "#3a3a3a"))
- ((eq moe-theme-mode-line-color 'w/b)
+ ((eq moe-theme-modeline-color 'w/b)
(set-face-attribute 'mode-line nil :background "#555555" :foreground
"#ffffff")
(set-face-attribute 'mode-line-buffer-id nil :background "#555555"
:foreground 'unspecified)
(set-face-attribute 'minibuffer-prompt nil :foreground "#8a8a8a"
:background "#080808")))
@@ -244,39 +246,39 @@ Avoid unnecessary load-theme")
"Load moe-light-theme with your additional customization."
(interactive)
(if moe-theme--need-reload-theme (load-theme 'moe-dark t))
- (cond ((eq moe-theme-mode-line-color 'blue)
+ (cond ((eq moe-theme-modeline-color 'blue)
(set-face-attribute 'mode-line nil :background "#afd7ff" :foreground
"#005f87")
(set-face-attribute 'mode-line-buffer-id nil :background "#afd7ff"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#005f87"
:background "#afd7ff"))
- ((eq moe-theme-mode-line-color 'green)
+ ((eq moe-theme-modeline-color 'green)
(set-face-attribute 'mode-line nil :background "#afdf77" :foreground
"#005f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#afdf77"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#005f00"
:background "#a1db00"))
- ((eq moe-theme-mode-line-color 'orange)
+ ((eq moe-theme-modeline-color 'orange)
(set-face-attribute 'mode-line nil :background "#ffaf5f" :foreground
"#b75f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffaf5f"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#080808"
:background "#ffaf5f"))
- ((eq moe-theme-mode-line-color 'magenta)
+ ((eq moe-theme-modeline-color 'magenta)
(set-face-attribute 'mode-line nil :background "#ffafd7" :foreground
"#cc1f8b")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffafd7"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#ff1f8b"
:background "#ffffff"))
- ((eq moe-theme-mode-line-color 'yellow)
+ ((eq moe-theme-modeline-color 'yellow)
(set-face-attribute 'mode-line nil :background "#fce94f" :foreground
"#875f00")
(set-face-attribute 'mode-line-buffer-id nil :background "#fce94f"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#875f00"
:background "#ffff87"))
- ((eq moe-theme-mode-line-color 'purple)
+ ((eq moe-theme-modeline-color 'purple)
(set-face-attribute 'mode-line nil :background "#e6a8df" :foreground
"#6c0099")
(set-face-attribute 'mode-line-buffer-id nil :background "#e6a8df"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#6c0099"
:background "#e6a8df"))
- ((eq moe-theme-mode-line-color 'red)
+ ((eq moe-theme-modeline-color 'red)
(set-face-attribute 'mode-line nil :background "#ef2929" :foreground
"#ffffff")
(set-face-attribute 'mode-line-buffer-id nil :background "#ef2929"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#a40000"
:background "#ffafaf"))
- ((eq moe-theme-mode-line-color 'cyan)
+ ((eq moe-theme-modeline-color 'cyan)
(set-face-attribute 'mode-line nil :background "#87d7af" :foreground
"#005f5f")
(set-face-attribute 'mode-line-buffer-id nil :background "#87d7af"
:foreground "#080808")
(set-face-attribute 'minibuffer-prompt nil :foreground "#005f5f"
:background "#87d7af"))
- ((eq moe-theme-mode-line-color 'w/b)
+ ((eq moe-theme-modeline-color 'w/b)
(set-face-attribute 'mode-line nil :background "#ffffff" :foreground
"#3a3a3a")
(set-face-attribute 'mode-line-buffer-id nil :background "#ffffff"
:foreground 'unspecified)
(set-face-attribute 'minibuffer-prompt nil :foreground "#3e3e3e"
:background "#ffffff")))
@@ -285,12 +287,18 @@ Avoid unnecessary load-theme")
;; ======================================================
;; Colorize mode-line (and Powerline)
;; ======================================================
-
-(defun moe-theme-apply-color (color)
+(defalias 'moe-theme-apply-color 'moe-theme-modeline-apply-color)
+(make-obsolete 'moe-theme-apply-color 'moe-theme-modeline-apply-color
"unpredictable someday.")
+(defalias 'moe-theme-select-color 'moe-theme-modeline-select-color)
+(make-obsolete 'moe-theme-select-color 'moe-theme-modeline-select-color
"unpredictable someday.")
+(defalias 'moe-theme-apply-color 'moe-theme-modeline-apply-color)
+(make-obsolete 'moe-theme-apply-color 'moe-theme-modeline-apply-color
"unpredictable someday.")
+
+(defun moe-theme-modeline-apply-color (color)
"Set the COLOR of mode-line you like. You may also like
-`moe-theme-random-color' This should be called
+`moe-theme-modeline-random-color' This should be called
programmly (e.g. in init.el), not interactively."
- (setq moe-theme-mode-line-color
+ (setq moe-theme-modeline-color
color)
(let (moe-theme--need-reload-theme) ;set to nil to change only mode-line's
color
(if (eq (frame-parameter nil 'background-mode) 'light)
@@ -298,24 +306,24 @@ programmly (e.g. in init.el), not interactively."
(moe-dark))))
-(defun moe-theme-select-color ()
+(defun moe-theme-modeline-select-color ()
"Interactively select the color of mode-line you like and set
-it. Also see `moe-theme-random-color'"
+it. Also see `moe-theme-modeline-random-color'"
(interactive)
- (moe-theme-apply-color (intern (completing-read
+ (moe-theme-modeline-apply-color (intern (completing-read
"Select a color: "
(mapcar #'list
moe-theme-modeline-available-colors-set)
nil t "" nil nil t))))
-(defun moe-theme-random-color ()
+(defun moe-theme-modeline-random-color ()
"Give me a random mode-line color.
This function can be called both programmly and interactively."
(interactive)
(let* ((n (abs (% (random) 9)))
- (current-color moe-theme-mode-line-color))
+ (current-color moe-theme-modeline-color))
(if (eq (elt moe-theme-modeline-available-colors-set n) current-color) ;If
gotten color eq current-color, random again.
- (moe-theme-random-color)
- (moe-theme-apply-color (elt moe-theme-modeline-available-colors-set
n)))))
+ (moe-theme-modeline-random-color)
+ (moe-theme-modeline-apply-color (elt
moe-theme-modeline-available-colors-set n)))))
;; ======================================================
;; Powerline
@@ -325,7 +333,7 @@ This function can be called both programmly and
interactively."
(defun moe-theme-powerline ()
"Powerline theme powered by moe-theme.el
It's recommended use this with `moe-light' or `moe-dark', but it's ok without
them,
-as long as setq `moe-theme-mode-line-color' first."
+as long as setq `moe-theme-modeline-color' first."
(interactive)
(cond ((eq (frame-parameter nil 'background-mode) 'light)
(set-face-attribute 'mode-line-buffer-id nil :background
'unspecified :foreground "#1c1c1c")
@@ -333,31 +341,31 @@ as long as setq `moe-theme-mode-line-color' first."
(set-face-attribute 'powerline-active2 nil :background "#585858"
:foreground "#ffffff")
(set-face-attribute 'powerline-inactive1 nil :background "#c6c6c6"
:foreground "#585858")
(set-face-attribute 'powerline-inactive2 nil :background "#e4e4e4"
:foreground "#585858")
- (cond ((eq moe-theme-mode-line-color 'blue)
+ (cond ((eq moe-theme-modeline-color 'blue)
(set-face-attribute 'mode-line nil :background "#5fafd7"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#afd7ff" :foreground "#005faf"))
- ((eq moe-theme-mode-line-color 'green)
+ ((eq moe-theme-modeline-color 'green)
(set-face-attribute 'mode-line nil :background "#a1db00"
:foreground "#005f00")
(set-face-attribute 'powerline-active1 nil :background
"#d7ff87" :foreground "#008700"))
- ((eq moe-theme-mode-line-color 'orange)
+ ((eq moe-theme-modeline-color 'orange)
(set-face-attribute 'mode-line nil :background "#ff8700"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffd787" :foreground "#d75f00"))
- ((eq moe-theme-mode-line-color 'magenta)
+ ((eq moe-theme-modeline-color 'magenta)
(set-face-attribute 'mode-line nil :background "#ff4ea3"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffafff" :foreground "#ff1f8b"))
- ((eq moe-theme-mode-line-color 'yellow)
+ ((eq moe-theme-modeline-color 'yellow)
(set-face-attribute 'mode-line nil :background "#fce94f"
:foreground "#875f00")
(set-face-attribute 'powerline-active1 nil :background
"#ffff87" :foreground "#875f00"))
- ((eq moe-theme-mode-line-color 'purple)
+ ((eq moe-theme-modeline-color 'purple)
(set-face-attribute 'mode-line nil :background "#af5fd7"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#e6a8df" :foreground "#6c0099"))
- ((eq moe-theme-mode-line-color 'red)
+ ((eq moe-theme-modeline-color 'red)
(set-face-attribute 'mode-line nil :background "#ff4b4b"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffafaf" :foreground "#cc0000"))
- ((eq moe-theme-mode-line-color 'cyan)
+ ((eq moe-theme-modeline-color 'cyan)
(set-face-attribute 'mode-line nil :background "#5faf87"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#87d7af" :foreground "#005f5f"))
- ((eq moe-theme-mode-line-color 'w/b)
+ ((eq moe-theme-modeline-color 'w/b)
(set-face-attribute 'mode-line nil :background "#1c1c1c"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#bcbcbc" :foreground "#3a3a3a")
(set-face-attribute 'mode-line-buffer-id nil :background
'unspecified :foreground "#ffffff"))))
@@ -367,31 +375,31 @@ as long as setq `moe-theme-mode-line-color' first."
(set-face-attribute 'powerline-active2 nil :background "#ffffff"
:foreground "#3a3a3a")
(set-face-attribute 'powerline-inactive1 nil :background "#626262"
:foreground "#eeeeee")
(set-face-attribute 'powerline-inactive2 nil :background "#767676"
:foreground "#e4e4e4")
- (cond ((eq moe-theme-mode-line-color 'blue)
+ (cond ((eq moe-theme-modeline-color 'blue)
(set-face-attribute 'mode-line nil :background "#5fafd7"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#afd7ff" :foreground "#005faf"))
- ((eq moe-theme-mode-line-color 'green)
+ ((eq moe-theme-modeline-color 'green)
(set-face-attribute 'mode-line nil :background "#a1db00"
:foreground "#005f00")
(set-face-attribute 'powerline-active1 nil :background
"#d7ff87" :foreground "#008700"))
- ((eq moe-theme-mode-line-color 'orange)
+ ((eq moe-theme-modeline-color 'orange)
(set-face-attribute 'mode-line nil :background "#ff8700"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffd787" :foreground "#d75f00"))
- ((eq moe-theme-mode-line-color 'magenta)
+ ((eq moe-theme-modeline-color 'magenta)
(set-face-attribute 'mode-line nil :background "#ff4ea3"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffafff" :foreground "#ff1f8b"))
- ((eq moe-theme-mode-line-color 'yellow)
+ ((eq moe-theme-modeline-color 'yellow)
(set-face-attribute 'mode-line nil :background "#fce94f"
:foreground "#875f00")
(set-face-attribute 'powerline-active1 nil :background
"#ffff87" :foreground "#875f00"))
- ((eq moe-theme-mode-line-color 'purple)
+ ((eq moe-theme-modeline-color 'purple)
(set-face-attribute 'mode-line nil :background "#af5fd7"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#e6a8df" :foreground "#6c0099"))
- ((eq moe-theme-mode-line-color 'red)
+ ((eq moe-theme-modeline-color 'red)
(set-face-attribute 'mode-line nil :background "#ff4b4b"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#ffafaf" :foreground "#cc0000"))
- ((eq moe-theme-mode-line-color 'cyan)
+ ((eq moe-theme-modeline-color 'cyan)
(set-face-attribute 'mode-line nil :background "#5faf87"
:foreground "#ffffff")
(set-face-attribute 'powerline-active1 nil :background
"#87d7af" :foreground "#005f5f"))
- ((eq moe-theme-mode-line-color 'w/b)
+ ((eq moe-theme-modeline-color 'w/b)
(set-face-attribute 'mode-line nil :background "#ffffff"
:foreground "#080808")
(set-face-attribute 'powerline-active1 nil :background
"#bcbcbc" :foreground "#3a3a3a")
(set-face-attribute 'mode-line-buffer-id nil :background
'unspecified :foreground "#3a3a3a")))))
@@ -415,15 +423,15 @@ as long as setq `moe-theme-mode-line-color' first."
(defadvice other-frame (after change-mode-line-color-by-frame-id activate)
(if moe-theme-colorize-modeline-by-frame-id
- (moe-theme-apply-color (moe-theme-get-color-by-frame-name))))
+ (moe-theme-modeline-apply-color (moe-theme-get-color-by-frame-name))))
(defadvice delete-frame (after change-mode-line-color-by-frame-id activate)
(if moe-theme-colorize-modeline-by-frame-id
- (moe-theme-apply-color (moe-theme-get-color-by-frame-name))))
+ (moe-theme-modeline-apply-color (moe-theme-get-color-by-frame-name))))
(defadvice make-frame-command (after change-mode-line-color-by-frame-id
activate)
(if moe-theme-colorize-modeline-by-frame-id
- (moe-theme-apply-color (moe-theme-get-color-by-frame-name)))))
+ (moe-theme-modeline-apply-color (moe-theme-get-color-by-frame-name)))))
;; support for Elscreen
(with-eval-after-load 'elscreen
@@ -437,7 +445,7 @@ as long as setq `moe-theme-mode-line-color' first."
gotten-color))
(defadvice elscreen-goto (after change-mode-line-color-by-frame-id
activate)
(if moe-theme-colorize-modeline-by-frame-id
- (moe-theme-apply-color (moe-theme-get-color-by-frame-name)))
+ (moe-theme-modeline-apply-color (moe-theme-get-color-by-frame-name)))
)
))
;;;###autoload