diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9433c4f496..4fabd9cf65c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2005-04-07  Juri Linkov  <juri@jurta.org>
+
+	* simple.el (next-error-overlay-arrow-position): New defvar.
+	Put "=>" on its property `overlay-arrow-string'.  Add it to
+	`overlay-arrow-variable-list'.
+
+	* progmodes/compile.el (compilation-setup):
+	Set `next-error-overlay-arrow-position' to nil.  Also set it to
+	nil in the local hook `kill-buffer-hook'.  Make local variable
+	`overlay-arrow-string' and set it to "=>".
+	(compilation-goto-locus): Set BOL position to
+	`next-error-overlay-arrow-position' instead of
+	`overlay-arrow-position'.
+
+	* info.el (Info-mode): Add `Info-kill-buffer' to `kill-buffer-hook'
+	locally instead of adding it to the global hook.
+	(Info-kill-buffer): Move up.
+
 2005-04-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* term/xterm.el (xterm-standard-colors): Update color values from
diff --git a/lisp/info.el b/lisp/info.el
index cefe603a400..e44de75072e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3240,6 +3240,7 @@ Advanced commands:
   (setq line-move-ignore-invisible t)
   (make-local-variable 'desktop-save-buffer)
   (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
+  (add-hook 'kill-buffer-hook 'Info-kill-buffer nil t)
   (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   (add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
@@ -3254,6 +3255,13 @@ Advanced commands:
   (Info-set-mode-line)
   (run-hooks 'Info-mode-hook))
 
+;; When an Info buffer is killed, make sure the associated tags buffer
+;; is killed too.
+(defun Info-kill-buffer ()
+  (and (eq major-mode 'Info-mode)
+       Info-tag-table-buffer
+       (kill-buffer Info-tag-table-buffer)))
+
 (defun Info-clone-buffer-hook ()
   (when (bufferp Info-tag-table-buffer)
     (setq Info-tag-table-buffer
@@ -3887,16 +3895,6 @@ Preserve text properties."
 
       (set-buffer-modified-p nil))))
 
-
-;; When an Info buffer is killed, make sure the associated tags buffer
-;; is killed too.
-(defun Info-kill-buffer ()
-  (and (eq major-mode 'Info-mode)
-       Info-tag-table-buffer
-       (kill-buffer Info-tag-table-buffer)))
-
-(add-hook 'kill-buffer-hook 'Info-kill-buffer)
-
 ;;; Speedbar support:
 ;; These functions permit speedbar to display the "tags" in the
 ;; current info node.