* test/lisp/help-fns-tests.el: Add several tests for 'describe-function'.

[gnu-emacs] / admin / bzrmerge.el

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 42d39d3071a4f94831b4902879067cd1dd29edd3..1de7bc445e087622e5121738c5e7c852d5be5d9f 100644 (file)
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,6 +1,6 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: maint
@@ -140,11 +140,11 @@ are both lists of revnos, in oldest-first order."
                     (setq str (substring str (match-end 0))))
                   (when (string-match "[.!;, ]+\\'" str)
                     (setq str (substring str 0 (match-beginning 0))))
-                  (let ((help-form "\
+                  (let ((help-form (substitute-command-keys "\
 Type `y' to skip this revision,
 `N' to include it and go on to the next revision,
 `n' to not skip, but continue to search this log entry for skip regexps,
-`q' to quit merging."))
+`q' to quit merging.")))
                     (pcase (save-excursion
                             (read-char-choice
                              (format "%s: Skip (y/n/N/q/%s)? " str