Missing announcement of main branch change

Now I'm lost. It seems the main branch is completely separate from the master branch. They don't seem to share history.

Thank you @DamienCassou for reporting this!

Let's keep this issue pinned for a while. I will add it to the README as well.

The changes happened at the end of last year and were documented in the change log entry for version 1.0.0: https://protesilaos.com/codelog/2020-12-05-modus-themes-1-0-0/.

Yes, the main branch does not share any history with master. Sorry about that!

Summary of the changes from 0.13.0 to >= 1.0.0 (now at 1.2.3 or 1.3.0-dev):

The packages modus-operandi-theme and modus-vivendi-theme are replaced by modus-themes.
The modus-themes is available on GNU ELPA (last tagged release) or MELPA (latest commit). If you are on Emacs28, they are built-in (last tagged release).
The new package unifies all customisation options between the two themes. For example:

(setq modus-operandi-bold-constructs t)
(setq modus-operandi-slanted-constructs t)

(setq modus-vivendi-bold-constructs t)
(setq modus-vivendi-slanted-constructs t)

;;; Become:

(setq modus-themes-bold-constructs t)
(setq modus-themes-slanted-constructs t)

Old variables are made obsolete and replaced by the new ones. Many of them have new options. Here is an excerpt from my Emacs config:

;; NOTE: these are not my preferences!  I am always testing various
;; configurations.  Though I still like what I have here.
(setq modus-themes-slanted-constructs t
      modus-themes-bold-constructs nil
      modus-themes-fringes nil ; {nil,'subtle,'intense}

      ;; Options for `modus-themes-lang-checkers': nil,
      ;; 'straight-underline, 'subtle-foreground,
      ;; 'subtle-foreground-straight-underline, 'intense-foreground,
      ;; 'intense-foreground-straight-underline, 'colored-background
      modus-themes-lang-checkers nil

      ;; Options for `modus-themes-mode-line': nil, '3d, 'moody,
      ;; 'borderless, 'borderless-3d, 'borderless-moody
      modus-themes-mode-line 'borderless

      ;; Options for `modus-themes-syntax': nil, 'faint,
      ;; 'yellow-comments, 'green-strings,
      ;; 'yellow-comments-green-strings, 'alt-syntax,
      ;; 'alt-syntax-yellow-comments,'faint-yellow-comments
      modus-themes-syntax 'faint-yellow-comments

      ;; Options for `modus-themes-hl-line': nil, 'intense-background,
      ;; 'accented-background, 'underline-neutral,
      ;; 'underline-accented, 'underline-only-neutral,
      ;; 'underline-only-accented
      modus-themes-hl-line 'underline-neutral
      modus-themes-subtle-line-numbers nil
      modus-themes-paren-match 'subtle-bold ; {nil,'subtle-bold,'intense,'intense-bold}

      ;; Options for `modus-themes-links': nil, 'faint,
      ;; 'neutral-underline, 'faint-neutral-underline, 'no-underline,
      ;; 'underline-only, 'neutral-underline-only
      modus-themes-links 'faint-neutral-underline
      modus-themes-no-mixed-fonts nil

      ;; Options for `modus-themes-prompts': nil, 'subtle-accented,
      ;; 'intense-accented, 'subtle-gray, 'intense-gray
      modus-themes-prompts 'subtle-accented
      modus-themes-completions 'moderate ; {nil,'moderate,'opinionated}

      ;; Options for `modus-themes-region': nil, 'no-extend, 'bg-only,
      ;; 'bg-only-no-extend, 'accent, 'accent-no-extend
      modus-themes-region 'accent-no-extend

      modus-themes-diffs 'deuteranopia ; {nil,'desaturated,'fg-only,'bg-only,'deuteranopia}
      modus-themes-org-blocks nil ; {nil,'grayscale,'rainbow}
      modus-themes-org-habit nil ; {nil,'simplified,'traffic-light}
      modus-themes-headings ; Read the manual for this one
      '((1 . section-no-bold)
        (2 . line-no-bold)
        (t . no-color))
      modus-themes-variable-pitch-ui nil
      modus-themes-variable-pitch-headings nil
      modus-themes-scale-headings nil
      modus-themes-scale-1 1.1
      modus-themes-scale-2 1.15
      modus-themes-scale-3 1.21
      modus-themes-scale-4 1.27
      modus-themes-scale-5 1.33)

Everything is documented in the official manual, which you can find either on my website or, if you have the new package installed, by evaluating the expression (info "(modus-themes) Top"). Again, Emacs28 has this built-in.
Apart from unifying customisations, the new themes share common functions and commands. For example, the modus-themes-toggle command.
There is a macro, modus-themes-with-colors that lets you re-use colour variables from the themes in arbitrary elisp. It always gets the colour values of the active Modus theme. There are lots of examples of this macro in the manual.
The manual also has other "Do It Yourself" documentation, such as how to configure fonts, extend Org faces for new TODO keywords, and so on.
And, of course, the opening sections of the manual describe installation and initial setup.
Finally, I posted on emacs-devel when we updated the themes in emacs.git https://lists.gnu.org/archive/html/emacs-devel/2021-03/msg00300.html.

If you have any questions, please let me know.

added documentation + 1 deleted label

mentioned in commit 978f2fd2

The changes happened at the end of last year and were documented in the change log entry for version 1.0.0: https://protesilaos.com/codelog/2020-12-05-modus-themes-1-0-0/.

I read the beginning of this announcement but quickly discarded it because I was following the changes commit by commit and thought I knew everything. How fool was I :-). Sorry for the noise and thank you so much for your work.

Yes, the main branch does not share any history with master. Sorry about that!

Please don't apologize, you are doing an awesome work!!

What about adding a commit on top of the master branch to either:

delete everything to only keep a README with a message explaining the switch to main; or
update the README file with a sentence explaining the switch?

Please don't apologize, you are doing an awesome work!!

Thanks!

What about adding a commit on top of the master branch to either:

delete everything to only keep a README with a message explaining the switch to main; or

update the README file with a sentence explaining the switch?

I have not done it yet, because I thought I might need it for the old packages, which also have their own branches:

We discussed this with the Emacs maintainers: those old packages will be deleted in ~3 months from now from GNU ELPA (they have already been removed from MELPA).

Perhaps, the change to master should be along those lines mutatis mutandis:

(if t (require 'modus-themes)) ;; Don't require it during compilation!

(eval-and-compile
  (let ((msg "Package `modus-operandi-theme' is obsolete; use the new `modus-themes'"))
    (if (and noninteractive (fboundp 'byte-compile-warn))
        (byte-compile-warn msg)
      (message "%s" msg))))

(provide 'modus-operandi-theme)

But I prefer to do that after we are done for good with the old packages. Let's say in June.

What do you think?

"Protesilaos Stavrou (@protesilaos)" gitlab@mg.gitlab.com writes:

What do you think?

sure! Good idea.

mentioned in commit 142d199a

Re-bonjour! It has been about three months since we last discussed this issue (the old packages are now replaced by modus-themes and the project has switched from the master to the main branch).

The commit I just pushed:

  commit 142d199ae8aac8aa48556eec08cecd0bf95f5c71
  Author: Protesilaos Stavrou <info@protesilaos.com>
  Date:   Sat Jul 17 09:50:44 2021 +0300
  
      Render obsolete the 'master' branch
      
      'main' has been the primary branch since December 2020 when the project
      underwent a major refactoring that brought about the unification of the
      two themes into a single code base.
      
      The packages 'modus-operandi-theme' and 'modus-vivendi-theme' were
      deleted from GNU ELPA yesterday (see Emacs bug#49574), following a ~3
      month period during which they would unconditionally pull in the new
      'modus-themes' package.
      
      This formally fixes issue 174 by Damien Cassou:
      <https://gitlab.com/protesilaos/modus-themes/-/issues/174>.
  
   README.md               |   37 +-
   modus-operandi-theme.el | 4905 +----------------------------------------------
   modus-vivendi-theme.el  | 4905 +----------------------------------------------
   3 files changed, 54 insertions(+), 9793 deletions(-)

How the old files look:

;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) [DEPRECATED] -*- lexical-binding:t -*-

[...]

;;; Commentary:
;;
;; This package is obsolete.  It has been replaced by `modus-themes',
;; which includes the modus-operandi and modus-vivendi themes.  Users
;; who were tracking the `master' branch must switch to `main'.
;;
;; An Info manual should be distributed with the Modus themes.
;; Evaluate this form to access it directly:
;;
;;    (info "(modus-themes) Top")
;;
;; Else check the web page: <https://protesilaos.com/modus-themes/>.
;;
;; A summary of all new customisation options is available here:
;; <https://protesilaos.com/modus-themes/#h:bf1c82f2-46c7-4eb2-ad00-dd11fdd8b53f>.
;; Or evaluate this form to read the Info manual:
;;
;;    (info "(modus-themes) Customization Options")

;;; Code:



(if t (require 'modus-themes)) ;; Don't require it during compilation!

(eval-and-compile
  (let ((msg "Package `modus-operandi-theme' is obsolete; use the new `modus-themes' or switch to the `main' branch"))
    (if (and noninteractive (fboundp 'byte-compile-warn))
        (byte-compile-warn msg)
      (message "%s" msg))))

(provide 'modus-operandi-theme)

;;; modus-operandi-theme.el ends here

And the README:

# Modus themes (Modus Operandi and Modus Vivendi)

1. The `master` branch is obsolete.  **Switch to `main`**.
2. The old packages, `modus-operandi-theme` and `modus-vivendi-theme`
   have been discontinued.  **Switch to `modus-themes`**.
3. A summary of all new customisation options is available here:
   <https://protesilaos.com/modus-themes/#h:bf1c82f2-46c7-4eb2-ad00-dd11fdd8b53f>.
   Or evaluate this form to read the Info manual: 
   
   (info "(modus-themes) Customization Options")

I think we are done here. Closing this. Thanks again!

closed

mentioned in commit d061b3d5

Missing announcement of main branch change

Designs

Child items ...

Activity