(find-file-noselect): Switch to the correct buffer

before checking find-file-literally, and allow non-nil non-t
rawfile params.

diff --git a/lisp/files.el b/lisp/files.el
index bb1667eb502858a56c577efa186d4fb1eb90c9ff..c58edd7bcb84147f192102b14ec210d317dc3308 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -928,8 +928,9 @@ Optional second arg RAWFILE non-nil means the file is read literally."
                           (buffer-name buf))))
                       (with-current-buffer buf
                         (revert-buffer t t)))))
-           (when (not (eq rawfile (not (null find-file-literally))))
-             (with-current-buffer buf
+           (with-current-buffer buf
+             (when (not (eq (not (null rawfile))
+                            (not (null find-file-literally))))
                (if (buffer-modified-p)
                    (if (y-or-n-p (if rawfile
                                      "Save file and revisit literally? "