* lisp/bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.

diff --git a/etc/NEWS b/etc/NEWS
index cb34e9b461339470becc384ecf5adc39dae75a93..ecbbf74771346fb41ba10fd7fc36cd3eb8bf898c 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -51,7 +51,7 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 
 ** C-h l now also lists the commands that were run.
 
-** The new M-s M-s key binding uses eww to search the web for the
+** The new M-s M-w key binding uses eww to search the web for the
 text in the region.
 
 ** M-x suggests shorthands and ignores obsolete commands for completion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c30a2dd9b4d4a93ea8b10cbffb31af830ec5a8ad..c052a68c61f31c03de2d325589e83f23b50a7627 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
+
 2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port new time stamp handling to old Emacs and to XEmacs.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 46ff522c731e7afc75638aa631aed72384c409f6..110774082e0b446ffb19b7d63bd8592fb5c17897 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -926,7 +926,7 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key esc-map "s" search-map)
 
 (define-key search-map "o"    'occur)
-(define-key search-map "\M-s" 'eww-search-words)
+(define-key search-map "\M-w" 'eww-search-words)
 (define-key search-map "hr"   'highlight-regexp)
 (define-key search-map "hp"   'highlight-phrase)
 (define-key search-map "hl"   'highlight-lines-matching-regexp)