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).

3 files changed, 18 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 272c1359008..ff99d22303f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-28  Leo  <sdl.web@gmail.com>
+
+        * 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).
+
 2011-01-28  Chong Yidong  <cyd@stupidchicken.com>
 
         * woman.el (woman0-roff-buffer): Process roff escape sequences
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index a1a3c3e5f93..915a726ae11 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3007,9 +3007,7 @@ in any of these classes."
     (setq usage (if (null usage) t (setq origdoc (cdr usage)) (car usage)))
     (if origdoc (setq paragraphs (list origdoc)))
     (unless (eq style 'plain)
-      (push (propertize (concat "This " origtype " is advised.")
-                        'face 'font-lock-warning-face)
-            paragraphs))
+      (push (concat "This " origtype " is advised.") paragraphs))
     (ad-dolist (class ad-advice-classes)
       (ad-dolist (advice (ad-get-enabled-advices function class))
         (setq advice-docstring
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