[Emacs-diffs] trunk r115470: eww: exit and close actions

[Teodor Zlatanov]

------------------------------------------------------------
revno: 115470
revision-id: address@hidden
parent: address@hidden
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Wed 2013-12-11 14:01:44 -0500
message:
  eww: exit and close actions
  
  * net/eww.el (eww-exit, eww-close): Add UI convenience wrappers.
  (eww-mode-map): Use them.
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-11 17:54:09 +0000
+++ b/lisp/ChangeLog    2013-12-11 19:01:44 +0000
@@ -1,3 +1,8 @@
+2013-12-11  Teodor Zlatanov  <address@hidden>
+
+       * net/eww.el (eww-exit, eww-close): Add UI convenience wrappers.
+       (eww-mode-map): Use them.
+
 2013-12-11  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-in-side-window): Fix doc-string

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-12-11 00:27:27 +0000
+++ b/lisp/net/eww.el   2013-12-11 19:01:44 +0000
@@ -392,7 +392,8 @@
 (defvar eww-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q" 'quit-window)
+    (define-key map "q" 'eww-close)
+    (define-key map "Q" 'eww-exit)
     (define-key map "g" 'eww-reload)
     (define-key map [tab] 'shr-next-link)
     (define-key map [backtab] 'shr-previous-link)
@@ -418,8 +419,8 @@
 
     (easy-menu-define nil map ""
       '("Eww"
-       ["Exit" eww-quit t]
-       ["Close browser" quit-window t]
+       ["Exit" eww-exit t]
+       ["Close browser" eww-close t]
        ["Reload" eww-reload t]
        ["Back to previous page" eww-back-url
         :active (not (zerop (length eww-history)))]
@@ -450,6 +451,17 @@
   ;;(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