[Emacs-diffs] trunk r115611: eww: Revert r115470 UI wrappers (eww-exit, eww-close)

[Teodor Zlatanov]

------------------------------------------------------------
revno: 115611
revision-id: address@hidden
parent: address@hidden
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Thu 2013-12-19 11:25:25 -0500
message:
  eww: Revert r115470 UI wrappers (eww-exit, eww-close)
  
  * net/eww.el (eww-exit, eww-close, eww-mode-map): Revert change of
  2013-12-11 (r115470).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-19 14:00:55 +0000
+++ b/lisp/ChangeLog    2013-12-19 16:25:25 +0000
@@ -1,3 +1,8 @@
+2013-12-19  Teodor Zlatanov  <address@hidden>
+
+       * net/eww.el (eww-exit, eww-close, eww-mode-map): Revert change of
+       2013-12-11 (r115470).
+
 2013-12-19  Stefan Monnier  <address@hidden>
 
        * hl-line.el (hl-line-make-overlay): New fun.  Set priority (bug#16192).

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-12-17 21:17:05 +0000
+++ b/lisp/net/eww.el   2013-12-19 16:25:25 +0000
@@ -395,8 +395,7 @@
 (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 @@
 
     (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 @@
   ;;(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