Fix help-mode highlighting of advice warning (Bug#6304).

* emacs-lisp/advice.el (ad-make-advised-docstring): Don't apply
highlighting to the "this function is advisted" message.

* help-mode.el (help-mode-finish): Apply highlighting here, to
avoid clobbering by substitute-command-keys (Bug#6304).

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index cafd7d07fde..826145d7af0 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -325,6 +325,15 @@ Commands:
     ;; View mode's read-only status of existing *Help* buffer is lost
     ;; by with-output-to-temp-buffer.
     (toggle-read-only 1)
+
+    (save-excursion
+      (goto-char (point-min))
+      (let ((inhibit-read-only t))
+        (when (re-search-forward "^This \\w+ is advised.$" nil t)
+          (put-text-property (match-beginning 0)
+                             (match-end 0)
+                             'face 'font-lock-warning-face))))
+
     (help-make-xrefs (current-buffer))))
 
 ;; Grokking cross-reference information in doc strings and