From 53c39a494ffb71ce5480f55e4dc70dc6a73e65e2 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 27 May 2024 22:43:00 -0400 Subject: [PATCH] org-ctags: Don't assume ctags-program-name is bound * lisp/org-ctags.el (org-ctags-path-to-ctags): Fall back to "ctags" if ctags-program-name isn't bound because that wasn't introduced until Emacs 30. This is a follow-up commit to the port of Emacs's 9082b4e6e. --- lisp/org-ctags.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el index b2f005846..98a00d2c3 100644 --- a/lisp/org-ctags.el +++ b/lisp/org-ctags.el @@ -162,9 +162,11 @@ Format is: /REGEXP/TAGNAME/FLAGS,TAGTYPE/ See the ctags documentation for more information.") (defcustom org-ctags-path-to-ctags - (if (executable-find "ctags-exuberant") - "ctags-exuberant" - ctags-program-name) + (cond ((executable-find "ctags-exuberant") + "ctags-exuberant") + ((boundp 'ctags-program-name) + ctags-program-name) + (t "ctags")) ; Emacs < 30 "Name of the ctags executable file." :version "24.1" :type 'file)