aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/help-fns.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e41ddc2ad1..4b1ba1e6606 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-30 Chong Yidong <cyd@gnu.org>
2
3 * help-fns.el (help-fns--obsolete): Fix last change.
4
12012-09-30 Stefan Monnier <monnier@iro.umontreal.ca> 52012-09-30 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here. 7 * winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 7dc7eebb061..ef482f8f0e9 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -494,8 +494,7 @@ suitable file is found, return nil."
494 (use (car obsolete))) 494 (use (car obsolete)))
495 (when obsolete 495 (when obsolete
496 (insert "\nThis " 496 (insert "\nThis "
497 (if (eq (car-safe (symbol-function 'with-current-buffer)) 497 (if (eq (car-safe (symbol-function function)) 'macro)
498 'macro)
499 "macro" 498 "macro"
500 "function") 499 "function")
501 " is obsolete") 500 " is obsolete")