Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b232210f3c7..a4dec7af492 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,10 @@
         (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm):
         New functions for exporting alarms.
 
+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.
@@ -112,7 +116,7 @@
         * progmodes/python.el (python-indent-region):
         Use python-indent-line and skip special cases.  (Bug#18843)
 
-2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>
 
         * mail/emacsbug.el (report-emacs-bug): Make a better guess at
           envelope-from when reporting through sendmail (bug#19054).
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 46ff522c731..110774082e0 100644
--- 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)