aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-03 13:35:10 +1100
committerLars Ingebrigtsen2016-02-03 13:35:32 +1100
commit6191003fcd2bc65f2b18d5337f6f390d43f07173 (patch)
treeab4839d72e0fb5dd69911982580ae8168f32aaa8
parentfe321fdb668c42f1fbb2590c6c8cabcfcc59ab13 (diff)
downloademacs-6191003fcd2bc65f2b18d5337f6f390d43f07173.tar.gz
emacs-6191003fcd2bc65f2b18d5337f6f390d43f07173.zip
Use pop-to-buffer-same-window in eww
* lisp/net/eww.el: pop-to-buffer-same-window throughout instead of switch-to-buffer (bug#22244).
-rw-r--r--lisp/net/eww.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 7f98b5b8c7b..af6e0afdfa7 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -551,7 +551,7 @@ Currently this means either text/html or application/xhtml+xml."
551(declare-function mailcap-view-mime "mailcap" (type)) 551(declare-function mailcap-view-mime "mailcap" (type))
552(defun eww-display-pdf () 552(defun eww-display-pdf ()
553 (let ((data (buffer-substring (point) (point-max)))) 553 (let ((data (buffer-substring (point) (point-max))))
554 (switch-to-buffer (get-buffer-create "*eww pdf*")) 554 (pop-to-buffer-same-window (get-buffer-create "*eww pdf*"))
555 (let ((coding-system-for-write 'raw-text) 555 (let ((coding-system-for-write 'raw-text)
556 (inhibit-read-only t)) 556 (inhibit-read-only t))
557 (erase-buffer) 557 (erase-buffer)
@@ -748,7 +748,7 @@ the like."
748;;;###autoload 748;;;###autoload
749(defun eww-browse-url (url &optional new-window) 749(defun eww-browse-url (url &optional new-window)
750 (when new-window 750 (when new-window
751 (switch-to-buffer (generate-new-buffer "*eww*")) 751 (pop-to-buffer-same-window (generate-new-buffer "*eww*"))
752 (eww-mode)) 752 (eww-mode))
753 (eww url)) 753 (eww url))
754 754
@@ -1728,7 +1728,7 @@ If CHARSET is nil then use UTF-8."
1728 (let ((buffer eww-current-buffer)) 1728 (let ((buffer eww-current-buffer))
1729 (quit-window) 1729 (quit-window)
1730 (when buffer 1730 (when buffer
1731 (switch-to-buffer buffer))) 1731 (pop-to-buffer-same-window buffer)))
1732 (eww-restore-history history))) 1732 (eww-restore-history history)))
1733 1733
1734(defvar eww-history-mode-map 1734(defvar eww-history-mode-map
@@ -1809,7 +1809,7 @@ If CHARSET is nil then use UTF-8."
1809 (unless buffer 1809 (unless buffer
1810 (error "No buffer on current line")) 1810 (error "No buffer on current line"))
1811 (quit-window) 1811 (quit-window)
1812 (switch-to-buffer buffer))) 1812 (pop-to-buffer-same-window buffer)))
1813 1813
1814(defun eww-buffer-show () 1814(defun eww-buffer-show ()
1815 "Display buffer under point in eww buffer list." 1815 "Display buffer under point in eww buffer list."
@@ -1818,7 +1818,7 @@ If CHARSET is nil then use UTF-8."
1818 (unless buffer 1818 (unless buffer
1819 (error "No buffer on current line")) 1819 (error "No buffer on current line"))
1820 (other-window -1) 1820 (other-window -1)
1821 (switch-to-buffer buffer) 1821 (pop-to-buffer-same-window buffer)
1822 (other-window 1))) 1822 (other-window 1)))
1823 1823
1824(defun eww-buffer-show-next () 1824(defun eww-buffer-show-next ()