aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-17 19:46:51 +0100
committerLars Magne Ingebrigtsen2014-11-17 19:46:51 +0100
commit29f81b95885dfce4ef92b93c330cf9057d14745e (patch)
treec8a6ba218bb56d549e6b74b6700c55df3c09ffb1
parent83087df9492f4a16c835664aa39d0b8a7756d4bb (diff)
downloademacs-29f81b95885dfce4ef92b93c330cf9057d14745e.tar.gz
emacs-29f81b95885dfce4ef92b93c330cf9057d14745e.zip
* lisp/bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/bindings.el2
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index cb34e9b4613..ecbbf747713 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -51,7 +51,7 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
51 51
52** C-h l now also lists the commands that were run. 52** C-h l now also lists the commands that were run.
53 53
54** The new M-s M-s key binding uses eww to search the web for the 54** The new M-s M-w key binding uses eww to search the web for the
55text in the region. 55text in the region.
56 56
57** M-x suggests shorthands and ignores obsolete commands for completion. 57** M-x suggests shorthands and ignores obsolete commands for completion.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c30a2dd9b4d..c052a68c61f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-11-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
4
12014-11-17 Paul Eggert <eggert@cs.ucla.edu> 52014-11-17 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Port new time stamp handling to old Emacs and to XEmacs. 7 Port new time stamp handling to old Emacs and to XEmacs.
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."
926(define-key esc-map "s" search-map) 926(define-key esc-map "s" search-map)
927 927
928(define-key search-map "o" 'occur) 928(define-key search-map "o" 'occur)
929(define-key search-map "\M-s" 'eww-search-words) 929(define-key search-map "\M-w" 'eww-search-words)
930(define-key search-map "hr" 'highlight-regexp) 930(define-key search-map "hr" 'highlight-regexp)
931(define-key search-map "hp" 'highlight-phrase) 931(define-key search-map "hp" 'highlight-phrase)
932(define-key search-map "hl" 'highlight-lines-matching-regexp) 932(define-key search-map "hl" 'highlight-lines-matching-regexp)