From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Protesilaos Stavrou Newsgroups: gmane.emacs.bugs Subject: bug#45068: Patch for Modus themes 1.1.1? Date: Sun, 28 Feb 2021 08:30:16 +0200 Message-ID: <874khwn1qf.fsf@protesilaos.com> References: <87im9fgm27.fsf@protesilaos.com> <87ft4edret.fsf@protesilaos.com> <87zh2ldgtf.fsf@protesilaos.com> <87k0toof83.fsf@mail.linkov.net> <83wnxo1mcr.fsf@gnu.org> <83v9d81khh.fsf@gnu.org> <83mtyk1hq3.fsf@gnu.org> <87czzgbapt.fsf@protesilaos.com> <83lfe4192f.fsf@gnu.org> <83im9814oh.fsf@gnu.org> <87sg6po0yd.fsf_-_@protesilaos.com> <83czxt2fpd.fsf@gnu.org> <87h7m0n0em.fsf@protesilaos.com> <83v9agryuz.fsf@gnu.org> <87tupyw83e.fsf@protesilaos.com> <83zgzqncxx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10333"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 45068@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 28 07:31:42 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lGFcE-0002b9-5j for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Feb 2021 07:31:42 +0100 Original-Received: from localhost ([::1]:55602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGFcC-00076J-QR for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Feb 2021 01:31:40 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGFba-00075q-0L for bug-gnu-emacs@gnu.org; Sun, 28 Feb 2021 01:31:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGFbZ-0005lP-P1 for bug-gnu-emacs@gnu.org; Sun, 28 Feb 2021 01:31:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGFbZ-0006HG-Lj for bug-gnu-emacs@gnu.org; Sun, 28 Feb 2021 01:31:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Protesilaos Stavrou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 28 Feb 2021 06:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45068 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 45068-submit@debbugs.gnu.org id=B45068.161449382924093 (code B ref 45068); Sun, 28 Feb 2021 06:31:01 +0000 Original-Received: (at 45068) by debbugs.gnu.org; 28 Feb 2021 06:30:29 +0000 Original-Received: from localhost ([127.0.0.1]:45751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGFb2-0006GX-Oo for submit@debbugs.gnu.org; Sun, 28 Feb 2021 01:30:29 -0500 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:52915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGFaz-0006Bp-Ir for 45068@debbugs.gnu.org; Sun, 28 Feb 2021 01:30:28 -0500 X-Originating-IP: 94.46.225.161 Original-Received: from kronos (unknown [94.46.225.161]) (Authenticated sender: public@protesilaos.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 300F81C0009; Sun, 28 Feb 2021 06:30:18 +0000 (UTC) In-Reply-To: <83zgzqncxx.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 27 Feb 2021 10:15:54 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:201010 Archived-At: On 2021-02-27, 10:15 +0200, Eli Zaretskii wrote: >> From: Protesilaos Stavrou >> Cc: 45068@debbugs.gnu.org >> Date: Sat, 27 Feb 2021 04:35:49 +0200 >> >> > A simple implementation that checks whether a theme is already loaded, >> > and if not, looks it up in a suitable list of directories and loads >> > when found. The main part is to make sure themes are looked up in the >> > directories where we expect them to be, as opposed to load-path, which >> > is where 'require' looks for files to load. A Lisp implementation >> > should be fine, I think. >> > >> > Let me know if you need further clarifications. >> >> Hello Eli, >> >> This is what I could come up with. It is not what you stipulated, as it >> only accounts for the default themes' directory instead of checking the >> 'custom-theme-load-path'. > > Hmm... I'm surprised. What I had in mind was a simple use of > locate-file, which already accepts a path argument, so you could pass > custom-theme-load-path to it, and it would do the job. > > Maybe I misunderstand or misremember the problem which led us here. > Wasn't the problem that 'load' and 'require' search along load-path > instead of custom-theme-load-path? IOW, could you show the code you'd > use to load the other components of the theme if you could use 'load' > and 'require'? My idea was simply to replace > > (require 'foo-themes) > > with > > (require-theme 'foo-themes) > > Would that solve your original problem, assuming that require-theme > would look for and load foo-themes.el? > > Thanks. I retried and feel I am now closer to what you have described. The following is meant to go in custom.el: (defun require-theme (theme &optional directories) "Load THEME stored in `custom-theme-load-path'. THEME is a symbol or string that corresponds to the file name without its file type extension. That is assumed to be either '.el' or '.elc'. If THEME names a valid theme, load and enable it. Otherwise load the file, if present. In the latter case, the file is intended to work as the basis of a theme declared with `deftheme'. With optional DIRECTORIES as a list of filesystem paths, search for THEME file in those locations instead and load it, if present." (let* ((theme-dirs (custom-theme--load-path)) (custom-dirs (when (and directories (listp directories)) directories)) (theme-name (cond ((stringp theme) theme) ((symbolp theme) (format "%s" theme)) (t (error "`%s' must be either a symbol or string" theme)))) (dirs (or custom-dirs theme-dirs)) (file (locate-file theme-name dirs '(".el" ".elc")))) (cond ((custom-theme-p theme) (load-theme theme t)) (file (load-file file))))) This works in two ways: 1. To load a theme's dependency: (require-theme 'modus-themes) 2. To load and enable a theme: (require-theme 'modus-operandi) I am using functionality 1 on a newly compiled Emacs with 'emacs -Q'. I placed my three files in etc/themes (modus-{operandi,vivendi}-theme.el and modus-themes.el) and tried 'M-x load-theme RET modus-operandi' and the same for modus-vivendi, as well as 'M-x customize-themes'. -- Protesilaos Stavrou protesilaos.com