auto upstream

2 files changed, 3 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab351f2a69c..18dc2e962ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-12-07  Chong Yidong  <cyd@gnu.org>
 
+        * novice.el (disabled-command-function): Remove a spurious help
+        xref (Bug#13043).  Suggested by Kelly Dean.
+
         * subr.el (text-clone-maintain): Fix clone overlay deletion when a
         syntax is specified (Bug#13025).
 
diff --git a/lisp/novice.el b/lisp/novice.el
index c621ac4b692..b8e4a268b23 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -49,7 +49,6 @@ If nil, the feature is disabled, i.e., all commands work normally.")
   (unless keys (setq keys (this-command-keys)))
   (let (char)
     (save-window-excursion
-      (help-setup-xref (list 'disabled-command-function cmd keys) nil)
       (with-output-to-temp-buffer "*Disabled Command*" ;; (help-buffer)
          (if (or (eq (aref keys 0)
                      (if (stringp keys)