aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-24 18:07:49 +1100
committerLars Ingebrigtsen2016-02-24 18:07:49 +1100
commitbb2ab2fbccf1474b53152347286412591e5401c5 (patch)
tree03915a1bf742506488f5bbdb21aad7d745dd9bd6
parentdcf9eee5f1edac19f8421dc71bd11a843aaa919e (diff)
downloademacs-bb2ab2fbccf1474b53152347286412591e5401c5.tar.gz
emacs-bb2ab2fbccf1474b53152347286412591e5401c5.zip
Move `o' to `O' in shr-map
* lisp/net/shr.el (shr-map): `shr-save-contents' has moved from `o' to `O' to avoid collisions with `image-map'.
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/net/shr.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 18810eabf2c..4a6a0acbbab 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -73,6 +73,10 @@ in these situations.
73+++ 73+++
74*** A new `s' command for switching to another eww buffer via the minibuffer. 74*** A new `s' command for switching to another eww buffer via the minibuffer.
75 75
76---
77*** The `o' command (`shr-save-contents') has moved to `O' to avoid collision
78with the `o' command from `image-map'.
79
76+++ 80+++
77** The commands that add ChangeLog entries now prefer a VCS root directory 81** The commands that add ChangeLog entries now prefer a VCS root directory
78for the ChangeLog file, if none already exists. Customize 82for the ChangeLog file, if none already exists. Customize
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4c3dfc4fdeb..6e6a4233361 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -186,7 +186,7 @@ and other things:
186 (define-key map "w" 'shr-copy-url) 186 (define-key map "w" 'shr-copy-url)
187 (define-key map "u" 'shr-copy-url) 187 (define-key map "u" 'shr-copy-url)
188 (define-key map "v" 'shr-browse-url) 188 (define-key map "v" 'shr-browse-url)
189 (define-key map "o" 'shr-save-contents) 189 (define-key map "O" 'shr-save-contents)
190 (define-key map "\r" 'shr-browse-url) 190 (define-key map "\r" 'shr-browse-url)
191 map)) 191 map))
192 192