Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-17
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-18
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-45

2 files changed, 4 insertions, 3 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 6d76fe3384a..de050411411 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -754,7 +754,7 @@ Returns the compilation buffer created."
               compilation-directory-stack (list default-directory))
         (set-window-start outwin (point-min))
         (or (eq outwin (selected-window))
-            (set-window-point outwin (point-min)))
+            (set-window-point outwin (point)))
         ;; The setup function is called before compilation-set-window-height
         ;; so it can set the compilation-window-height buffer locally.
         (if compilation-process-setup-function
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 35a5780aa45..cb8fcf6e042 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -157,8 +157,9 @@ The following place holders should be present in the string:
     (define-key map " " 'scroll-up)
     (define-key map "\^?" 'scroll-down)
 
-    (define-key map [remap next-line] 'compilation-next-error)
-    (define-key map [remap previous-line] 'compilation-previous-error)
+    ;; This is intolerable -- rms
+;;;    (define-key map [remap next-line] 'compilation-next-error)
+;;;    (define-key map [remap previous-line] 'compilation-previous-error)
 
     (define-key map "\r" 'compile-goto-error)  ;; ?
     (define-key map "n" 'next-error-no-select)