aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2014-03-22 16:13:46 +0800
committerLeo Liu2014-03-22 16:13:46 +0800
commit3e7bc0445f728cdfcf140b2161529b765d997d75 (patch)
tree1364723a0e176abf4d50740f3852ad2df8fab7a3
parent43c75c8eae588a358af95c942742213040240b67 (diff)
downloademacs-3e7bc0445f728cdfcf140b2161529b765d997d75.tar.gz
emacs-3e7bc0445f728cdfcf140b2161529b765d997d75.zip
* help.el (temp-buffer-setup-hook): Remove help-mode-setup.
(temp-buffer-show-hook): Remove help-mode-finish. Fixes: debbugs:16038
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el4
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90a608a069d..786710f3689 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-03-22 Leo Liu <sdl.web@gmail.com>
2
3 * help.el (temp-buffer-setup-hook): Remove help-mode-setup.
4 (temp-buffer-show-hook): Remove help-mode-finish. (Bug#16038)
5
12014-03-21 Richard Stallman <rms@gnu.org> 62014-03-21 Richard Stallman <rms@gnu.org>
2 7
3 * battery.el (battery-linux-sysfs): Search for each field 8 * battery.el (battery-linux-sysfs): Search for each field
diff --git a/lisp/help.el b/lisp/help.el
index 14dda6456cf..6f096c48445 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -33,10 +33,6 @@
33;; or run interpreted, but not when the compiled code is loaded. 33;; or run interpreted, but not when the compiled code is loaded.
34(eval-when-compile (require 'help-macro)) 34(eval-when-compile (require 'help-macro))
35 35
36;; This makes `with-output-to-temp-buffer' buffers use `help-mode'.
37(add-hook 'temp-buffer-setup-hook 'help-mode-setup)
38(add-hook 'temp-buffer-show-hook 'help-mode-finish)
39
40;; `help-window-point-marker' is a marker you can move to a valid 36;; `help-window-point-marker' is a marker you can move to a valid
41;; position of the buffer shown in the help window in order to override 37;; position of the buffer shown in the help window in order to override
42;; the standard positioning mechanism (`point-min') chosen by 38;; the standard positioning mechanism (`point-min') chosen by