diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
| commit | f92ac2e82ed199d6f25d2a59508e08addb1150ac (patch) | |
| tree | d7d7756e3dbce10d8f73c27815d815499f78c2bd /lisp/replace.el | |
| parent | 5a094119ce79723108abd90a1fcc33721e964823 (diff) | |
| parent | a40869789fc5502e3d4e393b7c31d78cb7f29aa1 (diff) | |
| download | emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.gz | |
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 12 |
1 files changed, 5 insertions, 7 deletions
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") |