diff options
| author | Lars Ingebrigtsen | 2016-04-29 16:41:13 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-04-29 16:41:13 +0200 |
| commit | 0c035a742f4298b8a924de70756df730be2de989 (patch) | |
| tree | f7631f452ffd80446f63894243e1d98e857b5b9b | |
| parent | bc5f27aa099cdde02ca66e71501b89300685ab28 (diff) | |
| download | emacs-0c035a742f4298b8a924de70756df730be2de989.tar.gz emacs-0c035a742f4298b8a924de70756df730be2de989.zip | |
Remove ": ?" from the read-face-name prompt
* lisp/faces.el (read-face-name): Remove ": ?" from the prompt
to be more backwards compatible (bug#15909).
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 7bd8107066a..1b97093a8c4 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1004,6 +1004,10 @@ a single face name." | |||
| 1004 | ;; to define DEFAULT if MULTIPLE is nil. | 1004 | ;; to define DEFAULT if MULTIPLE is nil. |
| 1005 | (setq default (car (split-string default crm-separator t)))) | 1005 | (setq default (car (split-string default crm-separator t)))) |
| 1006 | 1006 | ||
| 1007 | ;; Older versions of `read-face-name' did not append ": " to the | ||
| 1008 | ;; prompt, so there are third party libraries that have that in the | ||
| 1009 | ;; prompt. If so, remove it. | ||
| 1010 | (setq prompt (replace-regexp-in-string ": ?\\'" "" prompt)) | ||
| 1007 | (let ((prompt (if default | 1011 | (let ((prompt (if default |
| 1008 | (format-message "%s (default `%s'): " prompt default) | 1012 | (format-message "%s (default `%s'): " prompt default) |
| 1009 | (format "%s: " prompt))) | 1013 | (format "%s: " prompt))) |