diff options
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 2 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3bae3baaa71..391a34206f4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-07-04 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <larsi@gnus.org> * isearch.el (isearch-search-fun-function): Clarify further the @@ -28,7 +34,7 @@ 2011-07-04 Lars Magne Ingebrigtsen <larsi@gnus.org> - * play/animate.el (animation-buffer-name): Renamed from *animate*. + * play/animate.el (animation-buffer-name): Rename from *animate*. 2011-07-04 Paul Eggert <eggert@cs.ucla.edu> @@ -61,7 +67,7 @@ 2011-07-03 Chong Yidong <cyd@stupidchicken.com> * 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 <larsi@gnus.org> - * dired.el (dired-flagging-regexp): Removed unused variable + * dired.el (dired-flagging-regexp): Remove unused variable (bug#8769). 2011-03-29 Kevin Ryde <user42@zip.com.au> @@ -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 <drew.adams@oracle.com> diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 127f93c6858..223e9667ac3 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -355,7 +355,7 @@ else the global value will be modified." (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 diff --git a/lisp/files.el b/lisp/files.el index 3cc41b04b4e..c9f85ff6a1a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1341,8 +1341,8 @@ automatically choosing a major mode, use \\[find-file-literally]." (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. |