* net/eww.el (eww-mode-map): [tab] doesn't work on tty.

* net/eww.el (eww-mode-map): [tab] doesn't work on tty.
(eww-setup-buffer): Clear next/prev/etc more reliably.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d799dbbd9619225e85bb70ac523d18e85f88c336..a83f7e30de31a671769a7f52bc878515bf2ebb0c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-05  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-mode-map): [tab] doesn't work on tty.
+       (eww-setup-buffer): Clear next/prev/etc more reliably.
+
 2014-03-04  Glenn Morris  <rgm@gnu.org>
 
        * minibuffer.el (completion-hilit-commonality):

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 65b1c6b2d7dedf0a839fda55c3a8d1077f1ccd1e..4d5fc4a80e0f32b87f35629cf28e512a6c226183 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -186,12 +186,6 @@ word(s) will be searched for via `eww-search-prefix'."
   (let ((redirect (plist-get status :redirect)))
     (when redirect
       (setq url redirect)))
-  (setq-local eww-next-url nil)
-  (setq-local eww-previous-url nil)
-  (setq-local eww-up-url nil)
-  (setq-local eww-home-url nil)
-  (setq-local eww-start-url nil)
-  (setq-local eww-contents-url nil)
   (let* ((headers (eww-parse-headers))
         (content-type
          (mail-header-parse-content-type
@@ -393,7 +387,13 @@ word(s) will be searched for via `eww-search-prefix'."
     (remove-overlays)
     (erase-buffer))
   (unless (eq major-mode 'eww-mode)
-    (eww-mode)))
+    (eww-mode))
+  (setq-local eww-next-url nil)
+  (setq-local eww-previous-url nil)
+  (setq-local eww-up-url nil)
+  (setq-local eww-home-url nil)
+  (setq-local eww-start-url nil)
+  (setq-local eww-contents-url nil))
 
 (defun eww-view-source ()
   (interactive)
@@ -412,8 +412,8 @@ word(s) will be searched for via `eww-search-prefix'."
     (suppress-keymap map)
     (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)
+    (define-key map [?\t] 'shr-next-link)
+    (define-key map [?\M-\t] 'shr-previous-link)
     (define-key map [delete] 'scroll-down-command)
     (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\177" 'scroll-down-command)