eww: Have `q' do a normal `quit-window' instead of killing the buffer.

2 files changed, 6 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41a507f519f..54caa2b4261 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-mode-map): Have `q' do a normal `quit-window'
+        instead of killing the buffer.
+
 2013-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (newline): Mention `electric-indent-mode' (bug#16015).
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d8c0010b4ce..2726748337c 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -378,7 +378,7 @@ word(s) will be searched for via `eww-search-prefix'."
 (defvar eww-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q" 'eww-quit)
+    (define-key map "q" 'quit-window)
     (define-key map "g" 'eww-reload)
     (define-key map [tab] 'shr-next-link)
     (define-key map [backtab] 'shr-previous-link)
@@ -447,12 +447,6 @@ word(s) will be searched for via `eww-search-prefix'."
     (eww-save-history))
   (eww url))
 
-(defun eww-quit ()
-  "Exit the Emacs Web Wowser."
-  (interactive)
-  (setq eww-history nil)
-  (kill-buffer (current-buffer)))
-
 (defun eww-back-url ()
   "Go to the previously displayed page."
   (interactive)