*** empty log message ***

4 files changed, 30 insertions, 14 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 347fce775f1..c45f7552aae 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -99,10 +99,12 @@ Called with region narrowed to unformatted header.")
 (defvar rmail-last-file nil)
 (defvar rmail-last-rmail-file nil)
 
+;;; Regexp matching the delimiter of messages in UNIX mail format
+;;; (UNIX From lines), minus the initial ^.  Note that if you change
+;;; this expression, you must change the code in rmail-nuke-pinhead-header
+;;; that knows the exact ordering of the \\( \\) subexpressions.
 (defvar rmail-unix-mail-delimiter
-  "From \\([^ \n]*\\(\\|\".*\"[^ \n]*\\)\\)  ?\\([^ \n]*\\) \\([^ ]*\\) *\\([0-9]*\\) \\([0-9:]*\\)\\( ?[A-Z]?[A-Z][A-Z]T\\( DST\\)?\\| ?[-+]?[0-9][0-9][0-9][0-9]\\|\\) [0-9][0-9]\\([0-9]*\\) *\\(remote from [^\n]*\\)?\n"
-   "Regexp matching the delimiter of messages in UNIX mail format (UNIX From lines), minus the
-initial ^.  ")
+  "From \\([^ \n]*\\(\\|\".*\"[^ \n]*\\)\\)  ?\\([^ \n]*\\) \\([^ ]*\\) *\\([0-9]*\\) \\([0-9:]*\\)\\( ?[A-Z]?[A-Z][A-Z]T\\( DST\\)?\\| ?[-+]?[0-9][0-9][0-9][0-9]\\|\\) [0-9][0-9]\\([0-9]*\\) *\\(remote from [^\n]*\\)?\n" nil)
 
 ;;;; *** Rmail Mode ***
 
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 873fc5f5c50..74d6efc4c2d 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1319,7 +1319,7 @@ element pair in RLIST."
 TYPE is number of words preceding KEY to start looking for subject.
 MEM is t if results are to be put on Doctor's memory stack.
 Return in the global variables SUBJ, VERB and OBJECT."
-  (let ((foo (doctor-subjsearch sent key type) sent))
+  (let ((foo (doctor-subjsearch sent key type)))
     (or foo
 	(setq foo sent
 	      mem nil))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d8e8f6e3bd5..48e061c3481 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -19,8 +19,6 @@
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
 
-(provide 'compile)
-
 ;;;###autoload
 (defvar compilation-mode-hook nil
   "*List of hook functions run by compilation-mode (see `run-hooks').")
@@ -437,18 +435,30 @@ other kinds of prefix arguments are ignored."
 ;; If compilation-last-buffer is set to a live buffer, use that.
 ;; Otherwise, look for a compilation buffer and signal an error
 ;; if there are none.
-(defun compilation-find-buffer ()
-  (if (compilation-buffer-p (current-buffer))
+(defun compilation-find-buffer (&optional other-buffer)
+  (if (and (not other-buffer)
+	   (compilation-buffer-p (current-buffer)))
       ;; The current buffer is a compilation buffer.
       (current-buffer)
-    (if (and compilation-last-buffer (buffer-name compilation-last-buffer))
+    (if (and compilation-last-buffer (buffer-name compilation-last-buffer)
+	     (or (not other-buffer) (not (eq compilation-last-buffer
+					     (current-buffer)))))
 	compilation-last-buffer
       (let ((buffers (buffer-list)))
-	(while (and buffers (not (compilation-buffer-p (car buffers))))
+	(while (and buffers (or (not (compilation-buffer-p (car buffers)))
+				(and other-buffer
+				     (eq (car buffers) (current-buffer)))))
 	  (setq buffers (cdr buffers)))
 	(if buffers
 	    (car buffers)
-	  (error "No compilation started!"))))))
+	  (or (and other-buffer
+		   (compilation-buffer-p (current-buffer))
+		   ;; The current buffer is a compilation buffer.
+		   (progn
+		     (if other-buffer
+			 (message "This is the only compilation buffer."))
+		     (current-buffer)))
+	      (error "No compilation started!")))))))
 
 ;;;###autoload
 (defun next-error (&optional argp)
@@ -792,3 +802,5 @@ See variable `compilation-parse-errors-function' for the interface it uses."
   (setq compilation-error-list (nreverse compilation-error-list)))
 
 (define-key ctl-x-map "`" 'next-error)
+
+(provide 'compile)
diff --git a/lisp/startup.el b/lisp/startup.el
index fa81e24b775..3bd20aa9de5 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,11 +1,11 @@
 ;; Process Emacs shell arguments
-;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -116,7 +116,9 @@ directory name of the directory where the `.emacs' file was looked for.")
     (setq command-line-processed t)
     ;; In presence of symlinks, switch to cleaner form of default directory.
     (if (and (not (eq system-type 'vax-vms))
-	     (getenv "PWD"))
+	     (getenv "PWD")
+	     (equal (nthcdr 10 (file-attributes default-directory))
+		    (nthcdr 10 (file-attributes (getenv "PWD")))))
 	(setq default-directory (file-name-as-directory (getenv "PWD"))))
     (let ((tail directory-abbrev-alist))
       (while tail