[Emacs-diffs] /srv/bzr/emacs/trunk r104946: * lisp/files.el (find-file): Use pop-to-buffer-same-window.

[Stefan Monnier]

------------------------------------------------------------
revno: 104946
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8911
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-07-04 12:08:16 -0400
message:
  * lisp/files.el (find-file): Use pop-to-buffer-same-window.
  * lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
  Add switch-to-buffer.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-04 12:15:16 +0000
+++ b/lisp/ChangeLog    2011-07-04 16:08:16 +0000
@@ -1,3 +1,9 @@
+2011-07-04  Stefan Monnier  <address@hidden>
+
+       * files.el (find-file): Use pop-to-buffer-same-window (bug#8911).
+       * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
+       Add switch-to-buffer.
+
 2011-07-04  Lars Magne Ingebrigtsen  <address@hidden>
 
        * isearch.el (isearch-search-fun-function): Clarify further the
@@ -28,7 +34,7 @@
 
 2011-07-04  Lars Magne Ingebrigtsen  <address@hidden>
 
-       * play/animate.el (animation-buffer-name): Renamed from *animate*.
+       * play/animate.el (animation-buffer-name): Rename from *animate*.
 
 2011-07-04  Paul Eggert  <address@hidden>
 
@@ -61,7 +67,7 @@
 2011-07-03  Chong Yidong  <address@hidden>
 
        * frame.el (frame-background-mode, frame-set-background-mode):
-       Moved from faces.el.
+       Move from faces.el.
        (frame-default-terminal-background): New function.
 
        * custom.el (custom-push-theme): Don't record faces in `changed'
@@ -71,7 +77,7 @@
 
 2011-07-03  Lars Magne Ingebrigtsen  <address@hidden>
 
-       * dired.el (dired-flagging-regexp): Removed unused variable
+       * dired.el (dired-flagging-regexp): Remove unused variable
        (bug#8769).
 
 2011-03-29  Kevin Ryde  <address@hidden>
@@ -158,8 +164,8 @@
        * info-look.el (info-lookup-add-help): Clarify that ARGS is a list
        of keyword/argument pairs (bug#6904).
 
-       * replace.el (multi-occur): Mention
-       `multi-occur-in-matching-buffers' in the doc string (bug#7566).
+       * replace.el (multi-occur):
+       Mention `multi-occur-in-matching-buffers' in the doc string (bug#7566).
 
 2011-07-02  Drew Adams  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2011-06-21 01:43:56 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2011-07-04 16:08:16 +0000
@@ -355,7 +355,7 @@
 (defvar byte-compile-interactive-only-functions
   '(beginning-of-buffer end-of-buffer replace-string replace-regexp
     insert-file insert-buffer insert-file-literally previous-line next-line
-    goto-line comint-run delete-backward-char)
+    goto-line comint-run delete-backward-char switch-to-buffer)
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-07-03 01:48:07 +0000
+++ b/lisp/files.el     2011-07-04 16:08:16 +0000
@@ -1341,8 +1341,8 @@
                         (confirm-nonexistent-file-or-buffer)))
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
-       (mapcar 'switch-to-buffer (nreverse value))
-      (switch-to-buffer value))))
+       (mapcar #'pop-to-buffer-same-window (nreverse value))
+      (pop-to-buffer-same-window value))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.