Skip to content

Commit 6d5c258

Browse files
committed
Replace ledger-get-minibuffer-prompt with built-in format-prompt
1 parent c2ae1ec commit 6d5c258

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ packages in [MELPA][melpa] or [MELPA Stable][melpa-stable], you'll need to
2121
add the directory containing `ledger-mode.el` to your `load-path`, and
2222
then `(require 'ledger-mode)`.
2323

24+
You will also need to have the `compat` package installed, at version 28.1 or
25+
newer.
26+
2427
Configuring completion
2528
======================
2629

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
package-lint
4343
elisp-autofmt
4444
undercover
45+
compat
4546
]
4647
);
4748

ledger-mode.el

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; This file is not part of GNU Emacs.
66

77
;; Version: 4.1.0
8-
;; Package-Requires: ((emacs "26.1"))
8+
;; Package-Requires: ((emacs "26.1") (compat "28.1"))
99
;; URL: https://github.com/ledger/ledger-mode
1010

1111
;; This is free software; you can redistribute it and/or modify it under
@@ -32,6 +32,7 @@
3232

3333
;;; Code:
3434

35+
(require 'compat)
3536
(require 'ledger-regex)
3637
(require 'org)
3738
(require 'ledger-commodities)
@@ -111,22 +112,15 @@ This uses `org-read-date', which see."
111112
(ledger-format-date (let ((org-read-date-prefer-future nil))
112113
(org-read-date nil t nil prompt))))
113114

114-
(defun ledger-get-minibuffer-prompt (prompt default)
115-
"Return a minibuffer prompt string composing PROMPT and DEFAULT."
116-
(concat prompt
117-
(if default
118-
(concat " (" default "): ")
119-
": ")))
120-
121115
(defun ledger-completing-read-with-default (prompt default collection)
122116
"Return a user-supplied string after PROMPT.
123117
Use the given DEFAULT, while providing completions from COLLECTION."
124-
(completing-read (ledger-get-minibuffer-prompt prompt default)
118+
(completing-read (format-prompt prompt default)
125119
collection nil nil nil 'ledger-minibuffer-history default))
126120

127121
(defun ledger-read-string-with-default (prompt default)
128122
"Return user supplied string after PROMPT, or DEFAULT."
129-
(read-string (ledger-get-minibuffer-prompt prompt default)
123+
(read-string (format-prompt prompt default)
130124
nil 'ledger-minibuffer-history default))
131125

132126
(defun ledger-display-balance-at-point (&optional arg)

tools/lint.el

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
;;; Code:
2020

21+
;; Required for `package-lint' to find installed `compat' package and not warn
22+
;; about the dependency.
23+
(package-initialize)
24+
2125
(require 'package-lint nil t)
2226
(require 'checkdoc)
2327

0 commit comments

Comments
 (0)