From 8f2be364dc35feb39ea2274bd9d52cf2980227c7 Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Thu, 19 Dec 2013 11:25:25 -0500 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/net/eww.el | 18 +++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 127ed1f2987..31a8cead95f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-19 Teodor Zlatanov + + * 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 * 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 bff5cd8f2d3..2263f81ea7d 100644 --- 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