Skip to content

Commit d4bb370

Browse files
committed
chore: update Emacs compatibility metadata
Raise the declared minimum Emacs version to 27.1, add a local compatibility helper for manual URL construction, and clean up package metadata for MELPA/package-lint style. Also defines missing custom groups and fixes the manual lookup file header.
1 parent 0d20367 commit d4bb370

12 files changed

Lines changed: 45 additions & 22 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ and add it manually to load-path like shown here:
3232

3333
## Requirements
3434

35-
- Emacs 25+
35+
- Emacs 27.1+
3636
- Csound 6.10+ (any release/compilation after 1. December 2017)
3737

3838
## Usage

csound-eldoc.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.9
6-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
6+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
77
;; URL: https://github.com/hlolli/csound-mode
88

99
;; This program is free software; you can redistribute it and/or modify

csound-font-lock.el

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.9
6-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
6+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
77
;; URL: https://github.com/hlolli/csound-mode
88

99
;; This program is free software; you can redistribute it and/or modify
@@ -29,6 +29,11 @@
2929
(require 'font-lock)
3030
(require 'csound-opcodes)
3131

32+
(defgroup csound-mode-font-lock nil
33+
"Csound font lock."
34+
:prefix "csound-font-lock-"
35+
:group 'csound-mode)
36+
3237
(defvar csound-font-lock--missing-faces '())
3338

3439
(defcustom csound-font-lock-rainbow-score-parameters-p nil

csound-indentation.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.9
7-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
7+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
88
;; URL: https://github.com/hlolli/csound-mode
99

1010
;; This program is free software; you can redistribute it and/or modify

csound-manual-lookup.el

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
;;; csound-eldoc.el --- A major mode for interacting and coding Csound
1+
;;; csound-manual-lookup.el --- Browse the Csound manual
22
;; Copyright (C) 2017 - 2023 Hlöðver Sigurðsson
33

44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
5-
;; Version: 0.2.7
6-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
5+
;; Version: 0.2.9
6+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
77
;; URL: https://github.com/hlolli/csound-mode
88

99
;; This program is free software; you can redistribute it and/or modify
@@ -58,14 +58,27 @@
5858
;;; installed locally.
5959
;;; RP Wed Sep 20 19:51:22 2023
6060
;;; Updated by Brandon Hale April 25, 2026
61+
(defgroup csound-mode-manual-lookup nil
62+
"Csound manual lookup."
63+
:prefix "csound-manual-"
64+
:group 'csound-mode)
65+
6166
(defcustom csound-manual-url
6267
"https://csound.com/docs/manual/"
6368
"The URL to the root directory of the Csound manual."
6469
:group 'csound-mode-manual-lookup
6570
:type 'string)
6671

67-
(defun csound-manual-browse (file)
68-
(browse-url (file-name-concat csound-manual-url file)))
72+
(defun csound-manual--file-name-concat (directory filename)
73+
"Return FILENAME under DIRECTORY.
74+
Use `file-name-concat' when available, and fall back to an Emacs 27
75+
compatible implementation otherwise."
76+
(if (fboundp 'file-name-concat)
77+
(file-name-concat directory filename)
78+
(concat (file-name-as-directory directory) filename)))
79+
80+
(defun csound-manual--browse (file)
81+
(browse-url (csound-manual--file-name-concat csound-manual-url file)))
6982

7083
(defun csound-manual-lookup ()
7184
(interactive)
@@ -74,7 +87,7 @@
7487
csdoc-opcode-database)
7588
(downcase lemma)
7689
(read-string "Lookup function in Csound manual: "))))
77-
(csound-manual-browse (concat lookup-lemma ".html"))))
90+
(csound-manual--browse (concat lookup-lemma ".html"))))
7891

7992
(defun csound-gen-manual-lookup ()
8093
(interactive)
@@ -85,15 +98,15 @@
8598
(use-input (if (= (length user-input) 1)
8699
(concat "0" user-input)
87100
user-input)))
88-
(csound-manual-browse (concat "GEN" use-input ".html"))))
101+
(csound-manual--browse (concat "GEN" use-input ".html"))))
89102

90103
(defun csound-browse-manual ()
91104
(interactive)
92-
(csound-manual-browse "index.html"))
105+
(csound-manual--browse "index.html"))
93106

94107
(defun csound-browse-gen-manual ()
95108
(interactive)
96-
(csound-manual-browse "ScoreGenRef.html"))
109+
(csound-manual--browse "ScoreGenRef.html"))
97110

98111
;;; key binding
99112

csound-mode.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.9
6-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
6+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
77
;; URL: https://github.com/hlolli/csound-mode
88

99
;; This program is free software; you can redistribute it and/or modify
@@ -43,9 +43,9 @@
4343

4444

4545
(defgroup csound-mode nil
46-
"Tiny functionality enhancements for evaluating sexps."
46+
"Major mode for Csound."
4747
:prefix "csound-mode-"
48-
:group 'csound-mode)
48+
:group 'languages)
4949

5050
(defvar csound-mode-syntax-table
5151
(let ((st (make-syntax-table)))

csound-opcodes.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.9
6-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
6+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
77
;; URL: https://github.com/hlolli/csound-mode
88

99
;; This program is free software; you can redistribute it and/or modify

csound-repl-interaction.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.9
7-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
7+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
88
;; URL: https://github.com/hlolli/csound-mode
99

1010
;; This program is free software; you can redistribute it and/or modify

csound-repl.el

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.9
7-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
7+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
88
;; URL: https://github.com/hlolli/csound-mode
99

1010
;; This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,11 @@
3535
(require 'highlight)
3636
(require 'shut-up)
3737

38+
(defgroup csound-mode-repl nil
39+
"Csound REPL."
40+
:prefix "csound-repl-"
41+
:group 'csound-mode)
42+
3843
(defvar csound-repl--csound-server)
3944
(defvar csound-repl--udp-client-proc)
4045
(defvar csound-repl--console-client-proc)

csound-score.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.9
7-
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
7+
;; Package-Requires: ((emacs "27.1") (shut-up "0.3.2") (multi "2.0.1") (dash "2.16.0") (highlight "0"))
88
;; URL: https://github.com/hlolli/csound-mode
99

1010
;; This program is free software; you can redistribute it and/or modify

0 commit comments

Comments
 (0)