From: Glenn Morris <rgm@gnu.org>
Date: Thu, 16 Apr 2015 15:32:38 +0000 (-0700)
Subject: * lisp/replace.el (query-replace-from-to-separator): Delay initialization
X-Git-Tag: emacs-25.0.90~2397
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ab1784327d4d40b3e6bc3a14323740c9a62fa16;p=emacs.git

* lisp/replace.el (query-replace-from-to-separator): Delay initialization

to avoid rogue setting after startup.
---

diff --git a/lisp/replace.el b/lisp/replace.el
index 70b86dd2016..8e71615ca14 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -68,14 +68,12 @@ to the minibuffer that reads the string to replace, or invoke replacements
 from Isearch by using a key sequence like `C-s C-s M-%'." "24.3")
 
 (defcustom query-replace-from-to-separator
-  (propertize
-   (or (ignore-errors
-	 ;; Ignore errors when attempt to autoload char-displayable-p
-	 ;; fails while preparing to dump.
-	 (if (char-displayable-p ?\u2192) " \u2192 " " -> "))
-       " -> ")
-   'face 'minibuffer-prompt)
+  (propertize (if (char-displayable-p ?\u2192) " \u2192 " " -> ")
+              'face 'minibuffer-prompt)
   "String that separates FROM and TO in the history of replacement pairs."
+  ;; Avoids error when attempt to autoload char-displayable-p fails
+  ;; while preparing to dump, also stops customize-rogue listing this.
+  :initialize 'custom-initialize-delay
   :group 'matching
   :type 'sexp
   :version "25.1")