|
5 | 5 | ;; This file is not part of GNU Emacs. |
6 | 6 |
|
7 | 7 | ;; Version: 4.1.0 |
8 | | -;; Package-Requires: ((emacs "26.1")) |
| 8 | +;; Package-Requires: ((emacs "26.1") (compat "28.1")) |
9 | 9 | ;; URL: https://github.com/ledger/ledger-mode |
10 | 10 |
|
11 | 11 | ;; This is free software; you can redistribute it and/or modify it under |
|
32 | 32 |
|
33 | 33 | ;;; Code: |
34 | 34 |
|
| 35 | +(require 'compat) |
35 | 36 | (require 'ledger-regex) |
36 | 37 | (require 'org) |
37 | 38 | (require 'ledger-commodities) |
@@ -111,22 +112,15 @@ This uses `org-read-date', which see." |
111 | 112 | (ledger-format-date (let ((org-read-date-prefer-future nil)) |
112 | 113 | (org-read-date nil t nil prompt)))) |
113 | 114 |
|
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 | | - |
121 | 115 | (defun ledger-completing-read-with-default (prompt default collection) |
122 | 116 | "Return a user-supplied string after PROMPT. |
123 | 117 | 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) |
125 | 119 | collection nil nil nil 'ledger-minibuffer-history default)) |
126 | 120 |
|
127 | 121 | (defun ledger-read-string-with-default (prompt default) |
128 | 122 | "Return user supplied string after PROMPT, or DEFAULT." |
129 | | - (read-string (ledger-get-minibuffer-prompt prompt default) |
| 123 | + (read-string (format-prompt prompt default) |
130 | 124 | nil 'ledger-minibuffer-history default)) |
131 | 125 |
|
132 | 126 | (defun ledger-display-balance-at-point (&optional arg) |
|
0 commit comments