[Emacs-diffs] /srv/bzr/emacs/trunk r105955: In command-line-1 insert initial-scratch-message before markers (Bug#9605).

[martin rudalics]

------------------------------------------------------------
revno: 105955
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-29 10:16:15 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/help.el
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-29 07:21:06 +0000
+++ b/lisp/ChangeLog    2011-09-29 08:16:15 +0000
@@ -1,3 +1,9 @@
+2011-09-29  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * pcmpl-cvs.el (pcomplete/cvs): Add "status" handler.

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2011-09-21 08:20:21 +0000
+++ b/lisp/help.el      2011-09-29 08:16:15 +0000
@@ -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

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2011-08-20 19:30:53 +0000
+++ b/lisp/startup.el   2011-09-29 08:16:15 +0000
@@ -2318,7 +2318,10 @@
         (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