Commit b1ea593c authored by Leo Liu's avatar Leo Liu Committed by Chong Yidong

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).
parent 40e22d80
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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment