aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorEli Zaretskii2013-12-11 19:06:29 +0200
committerEli Zaretskii2013-12-11 19:06:29 +0200
commita34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch)
tree92503ed7f7d3fb3c73c38d4689611b8202682970 /lisp/net
parent8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff)
parent1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff)
downloademacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz
emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.zip
Merge from trunk.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/eww.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 9d1c3a26949..8355ce1fb3c 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -418,7 +418,8 @@ word(s) will be searched for via `eww-search-prefix'."
418 418
419 (easy-menu-define nil map "" 419 (easy-menu-define nil map ""
420 '("Eww" 420 '("Eww"
421 ["Quit" eww-quit t] 421 ["Exit" eww-quit t]
422 ["Close browser" quit-window t]
422 ["Reload" eww-reload t] 423 ["Reload" eww-reload t]
423 ["Back to previous page" eww-back-url 424 ["Back to previous page" eww-back-url
424 :active (not (zerop (length eww-history)))] 425 :active (not (zerop (length eww-history)))]
@@ -429,7 +430,7 @@ word(s) will be searched for via `eww-search-prefix'."
429 ["View page source" eww-view-source] 430 ["View page source" eww-view-source]
430 ["Copy page URL" eww-copy-page-url t] 431 ["Copy page URL" eww-copy-page-url t]
431 ["Add bookmark" eww-add-bookmark t] 432 ["Add bookmark" eww-add-bookmark t]
432 ["List bookmarks" eww-copy-page-url t] 433 ["List bookmarks" eww-list-bookmarks t]
433 ["List cookies" url-cookie-list t])) 434 ["List cookies" url-cookie-list t]))
434 map)) 435 map))
435 436