From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 29 Apr 2016 14:41:13 +0000 (+0200)
Subject: Remove ": ?" from the read-face-name prompt
X-Git-Tag: emacs-26.0.90~2111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c035a742f4298b8a924de70756df730be2de989;p=emacs.git

Remove ": ?" from the read-face-name prompt

* lisp/faces.el (read-face-name): Remove ": ?" from the prompt
to be more backwards compatible (bug#15909).
---

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."
     ;; to define DEFAULT if MULTIPLE is nil.
     (setq default (car (split-string default crm-separator t))))
 
+  ;; Older versions of `read-face-name' did not append ": " to the
+  ;; prompt, so there are third party libraries that have that in the
+  ;; prompt.  If so, remove it.
+  (setq prompt (replace-regexp-in-string ": ?\\'" "" prompt))
   (let ((prompt (if default
                     (format-message "%s (default `%s'): " prompt default)
                   (format "%s: " prompt)))