From 5e915691ff097668b60c715cd39ab87975fc3000 Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Fri, 2 Dec 2016 16:50:25 -0500 Subject: [PATCH] Use pop-to-buffer-same-window * lisp/image-dired.el (image-dired-dired-with-window-configuration): (image-dired-dired-edit-comment-and-tags): Instead of switch-to-buffer, use pop-to-buffer-same-window cf. Bug#22244. (image-dired-forward-image, image-dired-backward-image): Ignore unused. --- lisp/image-dired.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/image-dired.el b/lisp/image-dired.el index a55dd40c09a..714182ae25f 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -799,9 +799,9 @@ calling `image-dired-restore-window-configuration'." (setq truncate-lines t) (save-excursion (other-window 1) - (switch-to-buffer buf) + (pop-to-buffer-same-window buf) (select-window (split-window-below)) - (switch-to-buffer buf2) + (pop-to-buffer-same-window buf2) (other-window -2))))) (defun image-dired-restore-window-configuration () @@ -1110,7 +1110,7 @@ Optional prefix ARG says how many images to move; default is one image." (interactive "p") (let (pos (steps (or arg 1))) - (dotimes (i steps) + (dotimes (_ steps) (if (and (not (eobp)) (save-excursion (forward-char) @@ -1131,7 +1131,7 @@ Optional prefix ARG says how many images to move; default is one image." (interactive "p") (let (pos (steps (or arg 1))) - (dotimes (i steps) + (dotimes (_ steps) (if (and (not (bobp)) (save-excursion (backward-char) @@ -2484,7 +2484,7 @@ easy-to-use form." (setq image-dired-widget-list nil) ;; Setup buffer. (let ((files (dired-get-marked-files))) - (switch-to-buffer "*Image-Dired Edit Meta Data*") + (pop-to-buffer-same-window "*Image-Dired Edit Meta Data*") (kill-all-local-variables) (make-local-variable 'widget-example-repeat) (let ((inhibit-read-only t)) -- 2.39.5