commit 374f4235d5e78def23d92b05f3d0257c1f609725 (HEAD, refs/remotes/origin/master)
Author: Rodrigo Kassick <kassick@gmail.com>
Date:   Wed Jun 19 23:04:08 2024 +0200

    Fix display-buffer-override-next-command (bug#71654)
    
    * lisp/window.el (display-buffer-override-next-command):
    display-buffer-overriding-action's car can be either a function or a
    list of functions. When a function,
    (push action (car display-buffer-overriding-action)) will create a
    cons-cell (action . function) instead of a list. In the clear-fun
    callback, trying to
    (delq action (car display-buffer-overriding-action)) causes an
    wrong-type-argument error.
    
    Copyright-paperwork-exempt: yes

diff --git a/lisp/window.el b/lisp/window.el
index 0cfe7df73d5..cb2eea11d13 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9305,6 +9305,9 @@ to deactivate this overriding action."
     (when echofun
       (add-hook 'prefix-command-echo-keystrokes-functions echofun))
     (setq switch-to-buffer-obey-display-actions t)
+    (unless (listp (car display-buffer-overriding-action))
+      (setcar display-buffer-overriding-action
+              (list (car display-buffer-overriding-action))))
     (push action (car display-buffer-overriding-action))
     exitfun))
 

commit 499d5dd95818389c664a9f11c1fdd73de30c803f
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Wed Jun 19 23:21:10 2024 +0200

    Update leuven-theme to latest upstream version
    
    * etc/themes/leuven-dark-theme.el:
    * etc/themes/leuven-theme.el: Update to latest upstream version
    https://github.com/fniessen/emacs-leuven-theme/ commit
    a504c1d20625fe373ad5ea4ff3d94ea3706cbb87 (2024-03-30).

diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el
index e5427f77909..68624ffdc81 100644
--- a/etc/themes/leuven-dark-theme.el
+++ b/etc/themes/leuven-dark-theme.el
@@ -4,8 +4,9 @@
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; Contributor: Thibault Polge <(concat "thibault" at-sign "thb.lt")>
-;; URL: https://github.com/fniessen/emacs-leuven-dark-theme
-;; Version: 20221010.1208
+;; URL: https://github.com/fniessen/emacs-leuven-theme
+;; Version: 1.2.0
+;; Last-Updated: 2022-10-04 01:15
 ;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
@@ -33,9 +34,6 @@
 ;;   (load-theme 'leuven-dark t)
 ;;
 ;; Requirements: Emacs 24+.
-;;
-;; NOTE -- Would you like implement a version of this for dark backgrounds,
-;; please do so!  I'm willing to integrate it...
 
 ;;; Code:
 
@@ -107,7 +105,7 @@ more..."
 
       ;; Leuven generic colors.
       (cancel '(:slant italic :strike-through t :foreground "#5b5660"))
-      ;; (clock-line '(:box (:line-width 1 :color "#cfa161") :foreground "#ffffff" :background "#1636ff"))
+      (clock-line '(:box (:line-width 1 :color "#cfa161") :foreground "#ffffff" :background "#1636ff"))
       (code-block '(:foreground "#ffff7f" :background "#252046"))
       (code-inline '(:foreground "#ff9bff" :background "#262031"))
       (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#1e52b8" :background "#252c48"))
@@ -128,10 +126,10 @@ more..."
       (grep-file-name '(:weight bold :foreground "#d8b76b")) ; Used for grep hits.
       (grep-line-number '(:weight bold :foreground "#5fca5b"))
       (highlight-blue '(:background "#3c312a"))
-      ;; (highlight-blue2 '(:background "#3e2d2f"))
+      (highlight-blue2 '(:background "#3e2d2f"))
       (highlight-gray '(:background "#3e3944"))
-      ;; (highlight-green '(:background "#2f0e3a"))
-      ;; (highlight-red '(:background "#063741"))
+      (highlight-green '(:background "#2f0e3a"))
+      (highlight-red '(:background "#063741"))
       (highlight-yellow '(:background "#2d2058"))
       (link '(:weight normal :underline t :foreground "#ff925a"))
       (link-no-underline '(:weight normal :foreground "#ff925a"))
@@ -168,7 +166,7 @@ more..."
       (xml-attribute '(:foreground "#119cd0"))
       (xml-tag '(:foreground "#56e46f"))
       (highlight-current-tag '(:background "#3a352a")) ; #342b32 or #0614df
-  )
+      )
 
   (custom-theme-set-faces
    'leuven-dark
@@ -463,7 +461,7 @@ more..."
    `(compilation-mode-line-run ((,class (:weight bold :foreground "#065aff")))) ; :run
    `(css-property ((,class (:foreground "#ff55ff"))))
    `(css-selector ((,class (:weight bold :foreground "#ffff0b"))))
-   `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "gray20" :background "lightgrey"))))
+   `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "#ffffff" :background "lightgrey"))))
    `(custom-button-mouse ((,class (:box (:line-width 2 :style released-button) :foreground "#ffffff" :background "#3d3842"))))
    `(custom-button-pressed ((,class (:box (:line-width 2 :style pressed-button) :foreground "#ffffff" :background "#312c36"))))
    `(custom-button-pressed-unraised ((,class (:underline t :foreground "#78ff7c"))))
@@ -1092,8 +1090,8 @@ more..."
 ;; This is for the sake of Emacs.
 ;; Local Variables:
 ;; time-stamp-end: "$"
-;; time-stamp-format: "%:y%02m%02d.%02H%02M"
-;; time-stamp-start: "Version: "
+;; time-stamp-format: "%Y-%02m-%02d %02H:%02M"
+;; time-stamp-start: "Last-Updated: "
 ;; End:
 
 ;;; leuven-dark-theme.el ends here
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 2f20dc39859..7ee0c8cc71e 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -1,10 +1,11 @@
-;;; leuven-theme.el --- Awesome Emacs color theme on white background  -*- lexical-binding:t -*-
+;;; leuven-theme.el --- Elegant Emacs color theme for a white background -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20221010.1209
+;; Version: 1.2.0
+;; Last-Updated: 2024-03-04 10:45
 ;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
@@ -24,17 +25,24 @@
 
 ;;; Commentary:
 
-;; This elegant Org-enhancing color theme "leuven" ROCKS!
-;; ... and not just for Org mode.
-;;
-;; To use it, put the following in your Emacs configuration file:
-;;
+;; The "leuven" color theme is an elegant and visually appealing theme designed
+;; to enhance the appearance of Emacs, particularly in Org mode and other
+;; contexts.  It provides a carefully crafted color scheme optimized for a white
+;; background, creating a pleasant and readable environment for your Emacs
+;; sessions.
+
+;; To use the "leuven" theme, simply add the following line to your Emacs
+;; configuration file:
+
 ;;   (load-theme 'leuven t)
-;;
-;; Requirements: Emacs 24+.
-;;
-;; NOTE -- Would you like implement a version of this for dark backgrounds,
-;; please do so!  I'm willing to integrate it...
+
+;; This will load and activate the theme.
+
+;; Requirements:
+;; - Emacs 24 or later.
+
+;; For more information and updates, visit the theme's GitHub repository at:
+;; https://github.com/fniessen/emacs-leuven-theme
 
 ;;; Code:
 
@@ -45,6 +53,15 @@
 The theme has to be reloaded after changing anything in this group."
   :group 'faces)
 
+(defcustom leuven-scale-org-document-title t
+  "Scale Org document title.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+  :type '(choice
+          (const :tag "Unscaled" nil)
+          (const :tag "Default provided by theme" t)
+          (number :tag "Set scaling")))
+
 (defcustom leuven-scale-outline-headlines t
   "Scale `outline' (and `org') level-1 headlines.
 This can be nil for unscaled, t for using the theme default, or a scaling
@@ -52,8 +69,7 @@ number."
   :type '(choice
           (const :tag "Unscaled" nil)
           (const :tag "Default provided by theme" t)
-          (number :tag "Set scaling"))
-  :group 'leuven)
+          (number :tag "Set scaling")))
 
 (defcustom leuven-scale-org-agenda-structure t
   "Scale Org agenda structure lines, like dates.
@@ -64,6 +80,16 @@ number."
           (const :tag "Default provided by theme" t)
           (number :tag "Set scaling")))
 
+(defcustom leuven-scale-volatile-highlight t
+  "Increase size in the `next-error' face.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+  :type '(choice
+          (const :tag "Unscaled" nil)
+          (const :tag "Default provided by theme" t)
+          (number :tag "Set scaling")))
+
+;;;###autoload
 (defun leuven-scale-font (control default-height)
   "Function for splicing optional font heights into face descriptions.
 CONTROL can be a number, nil, or t.  When t, use DEFAULT-HEIGHT."
@@ -88,13 +114,13 @@ more..."
 
       ;; Leuven generic colors.
       (cancel '(:slant italic :strike-through t :foreground "#A9A9A9"))
-      (clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
+      ;; (clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
       (code-block '(:foreground "#000088" :background "#FFFFE0"))
       (code-inline '(:foreground "#006400" :background "#FDFFF7"))
-      (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
+      (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through unspecified :foreground "#E6AD4F" :background "#FFF2DE"))
       (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google.
-      (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE"))
-      (completion-selected-candidate '(:weight bold :foreground "white" :background "#0052A4"))
+      (completion-other-candidates '(:foreground "black" :background "#F7F7F7"))
+      (completion-selected-candidate '(:weight bold :foreground "black" :background "#C1E0FD"))
       (diff-added '(:background "#DDFFDD"))
       (diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
       (diff-header '(:weight bold :foreground "#800000" :background "#FFFFAF"))
@@ -108,11 +134,10 @@ more..."
       (function-param '(:foreground "#247284"))
       (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits.
       (grep-line-number '(:weight bold :foreground "#A535AE"))
-      (highlight-blue '(:background "#E6ECFF"))
-      (highlight-blue2 '(:background "#E4F1F9"))
+      (highlight-blue '(:background "#B6D6FD"))
       (highlight-gray '(:background "#E4E4E3"))
-      (highlight-green '(:background "#D5F1CF"))
-      (highlight-red '(:background "#FFC8C8"))
+      ;; (highlight-green '(:background "#D5F1CF"))
+      ;; (highlight-red '(:background "#FFC8C8"))
       (highlight-yellow '(:background "#F6FECD"))
       (link '(:weight normal :underline t :foreground "#006DAF"))
       (link-no-underline '(:weight normal :foreground "#006DAF"))
@@ -121,7 +146,7 @@ more..."
       (mail-read '(:foreground "#8C8C8C"))
       (mail-read-high '(:foreground "#808080"))
       (mail-ticked '(:foreground "#FF3300"))
-      (mail-to '(:family "Sans Serif" :underline nil :foreground "#006DAF"))
+      (mail-to '(:family "Sans Serif" :underline unspecified :foreground "#006DAF"))
       (mail-unread '(:weight bold :foreground "#000000"))
       (mail-unread-high '(:weight bold :foreground "#135985"))
       (marked-line '(:foreground "#AA0000" :background "#FFAAAA"))
@@ -143,8 +168,8 @@ more..."
       (symlink '(:foreground "#1F8DD6"))
       (tab '(:foreground "#E8E8E8" :background "white"))
       (trailing '(:foreground "#E8E8E8" :background "#FFFFAB"))
-      (volatile-highlight '(:underline nil :foreground "white" :background "#9E3699"))
-      (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "white" :background "#9E3699")) ; flash-region
+      (volatile-highlight '(:underline unspecified :foreground "white" :background "#9E3699"))
+      (volatile-highlight-supersize `(,@(leuven-scale-font leuven-scale-volatile-highlight 1.1) :underline unspecified :foreground "white" :background "#9E3699")) ; flash-region
       (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))
       (xml-attribute '(:foreground "#F36335"))
       (xml-tag '(:foreground "#AE1B9A"))
@@ -192,7 +217,7 @@ more..."
    `(escape-glyph ((,class (:foreground "#008ED1"))))
    `(error ((,class (:foreground "red"))))
    `(warning ((,class (:weight bold :foreground "orange"))))
-   `(success ((,class (:foreground "green"))))
+   `(success ((,class (:foreground "green4"))))
 
    ;; Font lock faces.
    `(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
@@ -201,9 +226,9 @@ more..."
    `(font-lock-constant-face ((,class (:foreground "#D0372D"))))
    `(font-lock-doc-face ((,class (:foreground "#036A07"))))
    `(font-lock-function-name-face ((,class (:weight normal :foreground "#006699"))))
-   `(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC
+   `(font-lock-keyword-face ((,class (:bold unspecified :foreground "#0000FF")))) ; #3654DC
    `(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
-   `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil))))
+   `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit unspecified))))
    `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil))))
    `(font-lock-string-face ((,class ,string)))
    `(font-lock-type-face ((,class (:weight normal :foreground "#6434A3"))))
@@ -349,7 +374,7 @@ more..."
 
    ;; Flyspell.
    (if (version< emacs-version "24.4")
-       `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit nil))))
+       `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit unspecified))))
      `(flyspell-duplicate ((,class (:underline (:style wave :color "#F4EB80") :background "#FAF7CC" :inherit nil)))))
    (if (version< emacs-version "24.4")
        `(flyspell-incorrect ((,class (:underline "#FAA7A5" :inherit nil))))
@@ -372,7 +397,7 @@ more..."
    `(ace-jump-face-foreground ((,class (:weight bold :foreground "black" :background "#FEA500"))))
    `(ahs-face ((,class (:background "#E4E4FF"))))
    `(ahs-definition-face ((,class (:background "#FFB6C6"))))
-   `(ahs-plugin-defalt-face ((,class (:background "#FFE4FF")))) ; Current.
+   `(ahs-plugin-default-face ((,class (:background "#FFE4FF")))) ; Current.
    `(anzu-match-1 ((,class (:foreground "black" :background "aquamarine"))))
    `(anzu-match-2 ((,class (:foreground "black" :background "springgreen"))))
    `(anzu-match-3 ((,class (:foreground "black" :background "red"))))
@@ -382,7 +407,8 @@ more..."
    `(anzu-replace-to ((,class (:weight bold :foreground "#BD33FD" :background "#FDBD33"))))
    `(auto-dim-other-buffers-face ((,class (:background "#F7F7F7"))))
    `(avy-background-face ((,class (:background "#A9A9A9"))))
-   `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#FEA500"))))
+   `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#F6F707"))))
+   `(avy-lead-face-0 ((,class (:weight bold :foreground "white" :background "#4E8D12"))))
    `(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
    `(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
    `(bbdb-field-value ((,class (:foreground "steel blue"))))
@@ -425,9 +451,6 @@ more..."
    `(circe-originator-face ((,class (:foreground "blue"))))
    `(circe-prompt-face ((,class (:foreground "red"))))
    `(circe-server-face ((,class (:foreground "#99CAE5"))))
-   `(comint-highlight-input ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
-   ;; `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
-   `(comint-highlight-prompt ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
 
    ;; `(ac-selection-face ((,class ,completion-selected-candidate)))
    `(ac-selection-face ((,class (:weight bold :foreground "white" :background "orange")))) ; TEMP For diff'ing AC from Comp.
@@ -437,19 +460,48 @@ more..."
    `(popup-scroll-bar-background-face ((,class (:background "#EBF4FE"))))
    `(popup-scroll-bar-foreground-face ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
 
-   `(company-tooltip-common-selection ((,class (:weight normal :foreground "#F9ECCC" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
+   ;; Company.
+   `(company-tooltip-common-selection ((,class (:weight bold :foreground "#0474B6" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
    `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection).
-   `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#F9ECCC")))) ; Annotation (for selection).
-
-   `(company-tooltip-common ((,class (:weight normal :foreground "#B000B0" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
+   `(company-tooltip-annotation-selection ((,class (:weight bold :foreground "#818181")))) ; Annotation (for selection).
+   `(company-tooltip-common ((,class (:weight normal :foreground "#0474B6" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
    `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip.
-   `(company-tooltip-annotation ((,class (:weight normal :foreground "#2415FF")))) ; Annotation.
-
+   `(company-tooltip-annotation ((,class (:weight normal :foreground "#818181")))) ; Annotation.
+   `(company-preview ((,class ,completion-inline)))
    `(company-preview-common ((,class ,completion-inline)))
-
    `(company-scrollbar-bg ((,class (:background "#EBF4FE"))))
    `(company-scrollbar-fg ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
 
+   ;; Centaur Tabs
+   ;; With the addition of tab-mode, centaur tabs looks there first for how the tabline should look
+   (if (version<= "27.0" emacs-version)
+       `(tab-line ((t (:background ,"#5D6B99" :foreground ,"#5D6B99")))))
+   `(centaur-tabs-default ((t (:background ,"#335EA8" :foreground ,"#FFFFFF" :box nil))))
+   `(centaur-tabs-background-color ((t (:background ,"#5D6B99" :foreground ,"#5D6B99" :box nil))))
+   `(centaur-tabs-active-bar-face ((t (:background ,"#335EA8" :foreground ,"#FFFFFF"  :box nil))))
+   `(centaur-tabs-selected ((t (:foreground ,"#333333" :background ,"#F5CC84" :box nil))))
+   `(centaur-tabs-unselected ((t (:foreground ,"#FFFFFF" :background ,"#3B4F81" :box nil))))
+   `(centaur-tabs-selected-modified ((t (:foreground ,"#333333" :background ,"#F5CC84" :weight ,'bold :box nil))))
+   `(centaur-tabs-unselected-modified ((t (:foreground ,"#FFFFFF" :background ,"#3B4F81" :weight ,'bold :box nil))))
+   `(centaur-tabs-modified-marker-selected ((t (:foreground ,"#333333" :background ,"#F5CC84" :weight ,'bold :box nil))))
+   `(centaur-tabs-modified-marker-unselected ((t (:foreground ,"#FFFFFF" :background ,"#3B4F81" :weight ,'bold :box nil))))
+
+   ;; doom-modeline
+   `(doom-modeline-bar ((t (:background ,"#5D6B99"))))
+   `(doom-modeline-info ((t (:inherit ,'mode-line-emphasis))))
+   `(doom-modeline-urgent ((t (:inherit ,'mode-line-emphasis))))
+   `(doom-modeline-warning ((t (:inherit ,'mode-line-emphasis))))
+   `(doom-modeline-debug ((t (:inherit ,'mode-line-emphasis))))
+   `(doom-modeline-buffer-minor-mode ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-project-dir ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-project-parent-dir ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-persp-name ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-buffer-file ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-buffer-modified ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-lsp-success ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-buffer-path ((t (:inherit ,'mode-line-emphasis :weight ,'bold))))
+   `(doom-modeline-buffer-project-root ((t (:inherit ,'mode-line-emphasis))))
+
    `(compare-windows ((,class (:background "#FFFF00"))))
    ;; `(completions-common-part ((,class (:foreground "red" :weight bold))))
    ;; `(completions-first-difference ((,class (:foreground "green" :weight bold))))
@@ -522,6 +574,7 @@ more..."
    `(dired-mark ((,class ,marked-line)))
    `(dired-marked ((,class ,marked-line)))
    `(dired-symlink ((,class ,symlink)))
+   `(diredfl-compressed-file-suffix ((,class (:foreground "#000000" :background "#FFF68F"))))
    `(diredp-compressed-file-suffix ((,class (:foreground "red"))))
    `(diredp-date-time ((,class (:foreground "purple"))))
    `(diredp-dir-heading ((,class ,directory)))
@@ -680,7 +733,9 @@ more..."
    `(linum ((,class (:foreground "#9A9A9A" :background "#EDEDED"))))
    `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
    `(log-view-message ((,class (:foreground "black" :background "#EDEA74"))))
+   `(lsp-modeline-code-actions-preferred-face ((,class (:foreground "#000000" :background "#FFF68F"))))
    `(lsp-ui-doc-background ((,class (:background "#F6FECD"))))
+   `(lsp-ui-sideline-code-action ((,class (:foreground "#000000" :background "#FFF68F"))))
    `(lui-button-face ((,class ,link)))
    `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ; my nickname
    `(lui-time-stamp-face ((,class (:foreground "purple"))))
@@ -776,7 +831,7 @@ more..."
    `(org-block-background ((,class (:background "#FFFFE0")))) ;; :inherit fixed-pitch))))
    `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
    `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
-   `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3"))))
+   `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#D4D4D4"))))
    `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
    `(org-code ((,class ,code-inline)))
    `(org-column ((,class ,column)))
@@ -786,13 +841,22 @@ more..."
    `(org-dim ((,class (:foreground "#AAAAAA"))))
    `(org-document-info ((,class (:foreground "#484848"))))
    `(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
-   `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
+   `(org-document-title ((,class (,@(leuven-scale-font leuven-scale-org-document-title 1.8)  :weight bold :foreground "black"))))
    `(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
-   `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
+   `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EEFFEE"))))
    `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
-   `(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
+   `(org-example ((,class (:foreground "blue" :background "#EEFFEE"))))
    `(org-footnote ((,class (:underline t :foreground "#008ED1"))))
    `(org-formula ((,class (:foreground "chocolate1"))))
+   ;; org-habit colours are thanks to zenburn
+   `(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green
+   `(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-1 fg ,zenburn-bg
+   `(org-habit-clear-face ((t :background "#5C888B")))                       ; ,zenburn-blue-3
+   `(org-habit-overdue-face ((t :background "#9C6363")))                     ; ,zenburn-red-3
+   `(org-habit-clear-future-face ((t :background "#4C7073")))                ; ,zenburn-blue-4
+   `(org-habit-ready-future-face ((t :background "#5F7F5F")))                ; ,zenburn-green-2
+   `(org-habit-alert-future-face ((t :background "#D0BF8F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-2 fg ,zenburn-bg
+   `(org-habit-overdue-future-face ((t :background "#8C5353"))) ; ,zenburn-red-4
    `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
    `(org-hide ((,class (:foreground "#E2E2E2"))))
    `(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
@@ -818,11 +882,11 @@ more..."
    `(org-scheduled-previously ((,class (:foreground "#1466C6"))))
    `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
    `(org-sexp-date ((,class (:foreground "#3774CC"))))
-   `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
-   `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) ;; :inherit fixed-pitch))))
+   `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EEFFEE"))))
+   `(org-table ((,class (:foreground "dark green" :background "#EEFFEE")))) ;; :inherit fixed-pitch))))
    `(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "white"))))
    `(org-target ((,class (:foreground "#FF6DAF"))))
-   `(org-time-grid ((,class (:foreground "#CFCFCF"))))
+   `(org-time-grid ((,class (:foreground "#B8B8B8"))))
    `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
    `(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
    `(org-verbatim ((,class (:foreground "#0066CC" :background "#F7FDFF"))))
@@ -1074,8 +1138,8 @@ more..."
 ;; This is for the sake of Emacs.
 ;; Local Variables:
 ;; time-stamp-end: "$"
-;; time-stamp-format: "%:y%02m%02d.%02H%02M"
-;; time-stamp-start: "Version: "
+;; time-stamp-format: "%Y-%02m-%02d %02H:%02M"
+;; time-stamp-start: "Last-Updated: "
 ;; End:
 
 ;;; leuven-theme.el ends here

commit 830b392e1824200e0cab85ac64d1b1794ac5568d
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Jun 19 22:54:05 2024 +0200

    * lisp/which-key.el (which-key-is-verbose): Remove unused option

diff --git a/lisp/which-key.el b/lisp/which-key.el
index 1de599e5497..e9567d262c6 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -424,11 +424,6 @@ Note that `which-key-idle-delay' should be set before turning on
   :type 'boolean
   :package-version "1.0" :version "30.1")
 
-(defcustom which-key-is-verbose nil
-  "Whether to warn about potential mistakes in configuration."
-  :type 'boolean
-  :package-version "1.0" :version "30.1")
-
 (defcustom which-key-preserve-window-configuration nil
   "Save and restore window configuration around which-key popup display.
 If non-nil, save window configuration before which-key buffer is

commit c75aa8e0f626d8e3917ef98c9ecf2b928b7a76d2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Jun 19 14:30:17 2024 +0300

    Avoid compilation warnings
    
    * src/xwidget.c (Fxwidget_perform_lispy_event): Avoid compiler
    warnings.  (Bug#71638)

diff --git a/src/xwidget.c b/src/xwidget.c
index 04ebcbfe96c..5093e0c1e00 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -489,10 +489,7 @@ On X11, modifier keys will not be processed if FRAME is nil and the
 selected frame is not an X-Windows frame.  */)
   (Lisp_Object xwidget, Lisp_Object event, Lisp_Object frame)
 {
-  struct xwidget *xw;
   struct frame *f = NULL;
-  int character = -1, keycode = -1;
-  int modifiers = 0;
 
 #ifdef USE_GTK
   GdkEvent *xg_event;
@@ -506,7 +503,6 @@ selected frame is not an X-Windows frame.  */)
 #endif
 
   CHECK_LIVE_XWIDGET (xwidget);
-  xw = XXWIDGET (xwidget);
 
   if (!NILP (frame))
     f = decode_window_system_frame (frame);
@@ -514,6 +510,10 @@ selected frame is not an X-Windows frame.  */)
     f = SELECTED_FRAME ();
 
 #ifdef USE_GTK
+  int character = -1, keycode = -1;
+  int modifiers = 0;
+  struct xwidget *xw = XXWIDGET (xwidget);
+
 #ifdef HAVE_XINPUT2
   /* XI2 GDK devices crash if we try this without an embedder set.  */
   if (!f)

commit e6f4370c3beacf74342eccab7cbdfe2615e6b06f
Merge: db18613c962 0dd2defc2c1
Author: Po Lu <luangruo@yahoo.com>
Date:   Wed Jun 19 16:42:49 2024 +0800

    Merge remote-tracking branch 'savannah/master' into master-android-1

commit db18613c962ea4db42aa9bdd4c211f6b8312bd49
Author: Po Lu <luangruo@yahoo.com>
Date:   Wed Jun 19 16:41:59 2024 +0800

    Don't follow symlinks in returning directory attributes of /
    
    * src/androidvfs.c (struct android_vops) <stat>: New argument
    for flags.
    (android_unix_stat): Implement in terms of fstatat, not stat,
    and provide flags to the same.
    (android_afs_stat, android_content_stat, android_authority_stat)
    (android_saf_root_stat, android_saf_tree_stat)
    (android_saf_new_stat, android_fstatat): Adjust to match.

diff --git a/src/androidvfs.c b/src/androidvfs.c
index 28a23920533..346eb639b11 100644
--- a/src/androidvfs.c
+++ b/src/androidvfs.c
@@ -203,9 +203,10 @@ struct android_vops
      Value is otherwise the same as `rename'.  */
   int (*rename) (struct android_vnode *, struct android_vnode *, bool);
 
-  /* Return statistics for the specified VNODE.
-     Value and errno are the same as with Unix `stat'.  */
-  int (*stat) (struct android_vnode *, struct stat *);
+  /* Return statistics for the specified VNODE, and FLAGS, as in a call
+     to `fstatat'.  Value and errno are the same as with Unix
+     `stat'.  */
+  int (*stat) (struct android_vnode *, struct stat *, int);
 
   /* Return whether or not VNODE is accessible.
      Value, errno and MODE are the same as with Unix `access'.  */
@@ -649,7 +650,7 @@ static int android_unix_symlink (const char *, struct android_vnode *);
 static int android_unix_rmdir (struct android_vnode *);
 static int android_unix_rename (struct android_vnode *,
 				struct android_vnode *, bool);
-static int android_unix_stat (struct android_vnode *, struct stat *);
+static int android_unix_stat (struct android_vnode *, struct stat *, int);
 static int android_unix_access (struct android_vnode *, int);
 static int android_unix_mkdir (struct android_vnode *, mode_t);
 static int android_unix_chmod (struct android_vnode *, mode_t, int);
@@ -896,12 +897,13 @@ android_unix_rename (struct android_vnode *src,
 }
 
 static int
-android_unix_stat (struct android_vnode *vnode, struct stat *statb)
+android_unix_stat (struct android_vnode *vnode, struct stat *statb,
+		   int flags)
 {
   struct android_unix_vnode *vp;
 
   vp = (struct android_unix_vnode *) vnode;
-  return stat (vp->name, statb);
+  return fstatat (AT_FDCWD, vp->name, statb, flags);
 }
 
 static int
@@ -1669,7 +1671,7 @@ static int android_afs_symlink (const char *, struct android_vnode *);
 static int android_afs_rmdir (struct android_vnode *);
 static int android_afs_rename (struct android_vnode *,
 			       struct android_vnode *, bool);
-static int android_afs_stat (struct android_vnode *, struct stat *);
+static int android_afs_stat (struct android_vnode *, struct stat *, int);
 static int android_afs_access (struct android_vnode *, int);
 static int android_afs_mkdir (struct android_vnode *, mode_t);
 static int android_afs_chmod (struct android_vnode *, mode_t, int);
@@ -2090,7 +2092,8 @@ android_afs_rename (struct android_vnode *src, struct android_vnode *dst,
 }
 
 static int
-android_afs_stat (struct android_vnode *vnode, struct stat *statb)
+android_afs_stat (struct android_vnode *vnode, struct stat *statb,
+		  int flags)
 {
   const char *dir;
   struct android_afs_vnode *vp;
@@ -2506,7 +2509,7 @@ static int android_content_symlink (const char *, struct android_vnode *);
 static int android_content_rmdir (struct android_vnode *);
 static int android_content_rename (struct android_vnode *,
 				   struct android_vnode *, bool);
-static int android_content_stat (struct android_vnode *, struct stat *);
+static int android_content_stat (struct android_vnode *, struct stat *, int);
 static int android_content_access (struct android_vnode *, int);
 static int android_content_mkdir (struct android_vnode *, mode_t);
 static int android_content_chmod (struct android_vnode *, mode_t, int);
@@ -2696,7 +2699,7 @@ android_content_rename (struct android_vnode *src,
 
 static int
 android_content_stat (struct android_vnode *vnode,
-		      struct stat *statb)
+		      struct stat *statb, int flags)
 {
   memset (statb, 0, sizeof *statb);
 
@@ -3190,7 +3193,7 @@ static int android_authority_symlink (const char *, struct android_vnode *);
 static int android_authority_rmdir (struct android_vnode *);
 static int android_authority_rename (struct android_vnode *,
 				     struct android_vnode *, bool);
-static int android_authority_stat (struct android_vnode *, struct stat *);
+static int android_authority_stat (struct android_vnode *, struct stat *, int);
 static int android_authority_access (struct android_vnode *, int);
 static int android_authority_mkdir (struct android_vnode *, mode_t);
 static int android_authority_chmod (struct android_vnode *, mode_t, int);
@@ -3415,7 +3418,7 @@ android_authority_rename (struct android_vnode *src,
 
 static int
 android_authority_stat (struct android_vnode *vnode,
-			struct stat *statb)
+			struct stat *statb, int flags)
 {
   int rc, fd, save_errno;
   struct android_authority_vnode *vp;
@@ -3642,7 +3645,7 @@ static int android_saf_root_symlink (const char *, struct android_vnode *);
 static int android_saf_root_rmdir (struct android_vnode *);
 static int android_saf_root_rename (struct android_vnode *,
 				    struct android_vnode *, bool);
-static int android_saf_root_stat (struct android_vnode *, struct stat *);
+static int android_saf_root_stat (struct android_vnode *, struct stat *, int);
 static int android_saf_root_access (struct android_vnode *, int);
 static int android_saf_root_mkdir (struct android_vnode *, mode_t);
 static int android_saf_root_chmod (struct android_vnode *, mode_t, int);
@@ -3870,7 +3873,7 @@ android_saf_root_rename (struct android_vnode *src,
 
 static int
 android_saf_root_stat (struct android_vnode *vnode,
-		       struct stat *statb)
+		       struct stat *statb, int flags)
 {
   struct android_saf_root_vnode *vp;
 
@@ -4706,7 +4709,7 @@ static int android_saf_tree_symlink (const char *, struct android_vnode *);
 static int android_saf_tree_rmdir (struct android_vnode *);
 static int android_saf_tree_rename (struct android_vnode *,
 				    struct android_vnode *, bool);
-static int android_saf_tree_stat (struct android_vnode *, struct stat *);
+static int android_saf_tree_stat (struct android_vnode *, struct stat *, int);
 static int android_saf_tree_access (struct android_vnode *, int);
 static int android_saf_tree_mkdir (struct android_vnode *, mode_t);
 static int android_saf_tree_chmod (struct android_vnode *, mode_t, int);
@@ -5369,7 +5372,7 @@ android_saf_tree_rename (struct android_vnode *src,
 
 static int
 android_saf_tree_stat (struct android_vnode *vnode,
-		       struct stat *statb)
+		       struct stat *statb, int flags)
 {
   struct android_saf_tree_vnode *vp;
 
@@ -6156,7 +6159,7 @@ static int android_saf_new_symlink (const char *, struct android_vnode *);
 static int android_saf_new_rmdir (struct android_vnode *);
 static int android_saf_new_rename (struct android_vnode *,
 				   struct android_vnode *, bool);
-static int android_saf_new_stat (struct android_vnode *, struct stat *);
+static int android_saf_new_stat (struct android_vnode *, struct stat *, int);
 static int android_saf_new_access (struct android_vnode *, int);
 static int android_saf_new_mkdir (struct android_vnode *, mode_t);
 static int android_saf_new_chmod (struct android_vnode *, mode_t, int);
@@ -6335,7 +6338,7 @@ android_saf_new_rename (struct android_vnode *src,
 
 static int
 android_saf_new_stat (struct android_vnode *vnode,
-		      struct stat *statb)
+		      struct stat *statb, int flags)
 {
   errno = ENOENT;
   return -1;
@@ -7418,7 +7421,7 @@ android_fstatat (int dirfd, const char *restrict pathname,
   if (!vp)
     return -1;
 
-  rc = (*vp->ops->stat) (vp, statbuf);
+  rc = (*vp->ops->stat) (vp, statbuf, flags);
   (*vp->ops->close) (vp);
   return rc;
 }