From b5516bbd83019a2bf549991f1a73afe754cfc439 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 29 Sep 2011 10:16:15 +0200 Subject: [PATCH] In command-line-1 insert initial-scratch-message before markers (Bug#9605). * startup.el (command-line-1): Use insert-before-markers when inserting initial-scratch-message. (Bug#9605) * help.el (help-window): Remove variable. --- lisp/ChangeLog | 6 ++++++ lisp/help.el | 11 ----------- lisp/startup.el | 5 ++++- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8db50ac3bd..a5d048247a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-09-29 Martin Rudalics + + * startup.el (command-line-1): Use insert-before-markers when + inserting initial-scratch-message. (Bug#9605) + * help.el (help-window): Remove variable. + 2011-09-29 Glenn Morris * pcmpl-cvs.el (pcomplete/cvs): Add "status" handler. diff --git a/lisp/help.el b/lisp/help.el index f4338c28ffb..e2af0759a65 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -37,17 +37,6 @@ (add-hook 'temp-buffer-setup-hook 'help-mode-setup) (add-hook 'temp-buffer-show-hook 'help-mode-finish) -;; The variable `help-window' below is used by `help-mode-finish' to -;; communicate the window displaying help (the "help window") to the -;; macro `with-help-window'. The latter sets `help-window' to t before -;; invoking `with-output-to-temp-buffer'. If and only if `help-window' -;; is eq to t, `help-mode-finish' (called by `temp-buffer-setup-hook') -;; sets `help-window' to the window selected by `display-buffer'. -;; Exiting `with-help-window' and calling `help-print-return-message' -;; reset `help-window' to nil. -(defvar help-window nil - "Window chosen for displaying help.") - ;; `help-window-point-marker' is a marker you can move to a valid ;; position of the buffer shown in the help window in order to override ;; the standard positioning mechanism (`point-min') chosen by diff --git a/lisp/startup.el b/lisp/startup.el index 6c3bb397e9a..4e6f0af0368 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2318,7 +2318,10 @@ A fancy display is used on graphic displays, normal otherwise." (get-buffer "*scratch*") (with-current-buffer "*scratch*" (when (zerop (buffer-size)) - (insert initial-scratch-message) + ;; Insert before markers to make sure that window-point + ;; appears at end of buffer when *scratch* is displayed + ;; (Bug#9605). + (insert-before-markers initial-scratch-message) (set-buffer-modified-p nil)))) (if (or inhibit-startup-screen -- 2.39.5