diff options
Diffstat (limited to 'lisp/vc/ediff-help.el')
| -rw-r--r-- | lisp/vc/ediff-help.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index 1a970f344e5..e2d93d2b31b 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el @@ -24,10 +24,6 @@ ;;; Code: -;; Compiler pacifier start -(defvar ediff-multiframe) -;; end pacifier - (require 'ediff-init) (defvar ediff-multiframe) @@ -152,7 +148,7 @@ the value of this variable and the variables `ediff-help-message-*' in ;; the keymap that defines clicks over the quick help regions -(defvar ediff-help-region-map (make-sparse-keymap)) +(defvar-keymap ediff-help-region-map) (define-key ediff-help-region-map [mouse-2] #'ediff-help-for-quick-help) @@ -227,7 +223,9 @@ the value of this variable and the variables `ediff-help-message-*' in ((string= cmd "s") (re-search-forward "^['`‘]s['’]")) ((string= cmd "+") (re-search-forward "^['`‘]\\+['’]")) ((string= cmd "=") (re-search-forward "^['`‘]=['’]")) - (t (user-error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"))) + (t (user-error (substitute-command-keys + "Undocumented command! Type \\`G' in Ediff Control \ +Panel to drop a note to the Ediff maintainer")))) ) ; let case-fold-search )) |