eww: Revert 2013-12-11T19:01:44Z!tzz@lifelogs.com UI wrappers (eww-exit, eww-close)

* net/eww.el (eww-exit, eww-close, eww-mode-map): Revert change of
2013-12-11T19:01:44Z!tzz@lifelogs.com.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 127ed1f2987f36819fc645d302d8648fc1b7e275..31a8cead95ffd2bdf824c2e6d8a85f2834b0057c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-19  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * net/eww.el (eww-exit, eww-close, eww-mode-map): Revert change of
+       2013-12-11T19:01:44Z!tzz@lifelogs.com.
+
 2013-12-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * hl-line.el (hl-line-make-overlay): New fun.  Set priority (bug#16192).

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index bff5cd8f2d3ee9be3e7e183338d5eec85614801f..2263f81ea7d4fd6072601aeb37c137450d0ba900 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -395,8 +395,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-close)
-    (define-key map "Q" 'eww-exit)
+    (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)
@@ -423,8 +422,8 @@ word(s) will be searched for via `eww-search-prefix'."
 
     (easy-menu-define nil map ""
       '("Eww"
-       ["Exit" eww-exit t]
-       ["Close browser" eww-close t]
+       ["Exit" eww-quit t]
+       ["Close browser" quit-window t]
        ["Reload" eww-reload t]
        ["Back to previous page" eww-back-url
         :active (not (zerop (length eww-history)))]
@@ -455,17 +454,6 @@ word(s) will be searched for via `eww-search-prefix'."
   ;;(setq buffer-read-only t)
   )
 
-(defun eww-exit ()
-  "Exit the Emacs Web Wowser."
-  (interactive)
-  (setq eww-history nil)
-  (kill-buffer (current-buffer)))
-
-(defun eww-close ()
-  "Close the Emacs Web Wowser browser, leaving history intact."
-  (interactive)
-  (quit-window))
-
 (defun eww-save-history ()
   (push (list :url eww-current-url
              :title eww-current-title