[Emacs-diffs] /srv/bzr/emacs/trunk r103012: Fix help-mode highlighting of advice warning (Bug#6304).

[Chong Yidong]

------------------------------------------------------------
revno: 103012
author: Leo <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-28 16:42:11 -0500
message:
  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).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/advice.el
  lisp/help-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-28 21:20:40 +0000
+++ b/lisp/ChangeLog    2011-01-28 21:42:11 +0000
@@ -1,3 +1,11 @@
+2011-01-28  Leo  <address@hidden>
+
+       * 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  <address@hidden>
 
        * woman.el (woman0-roff-buffer): Process roff escape sequences

=== modified file 'lisp/emacs-lisp/advice.el'
--- a/lisp/emacs-lisp/advice.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/advice.el 2011-01-28 21:42:11 +0000
@@ -3007,9 +3007,7 @@
     (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

=== modified file 'lisp/help-mode.el'
--- a/lisp/help-mode.el 2011-01-26 08:36:39 +0000
+++ b/lisp/help-mode.el 2011-01-28 21:42:11 +0000
@@ -325,6 +325,15 @@
     ;; 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