[Emacs-diffs] master bb2ab2f: Move `o' to `O' in shr-map

[Lars Ingebrigtsen]

branch: master
commit bb2ab2fbccf1474b53152347286412591e5401c5
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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'.
---
 etc/NEWS        |    4 ++++
 lisp/net/shr.el |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 18810ea..4a6a0ac 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -73,6 +73,10 @@ in these situations.
 +++
 *** A new `s' command for switching to another eww buffer via the minibuffer.
 
+---
+*** The `o' command (`shr-save-contents') has moved to `O' to avoid collision
+with the `o' command from `image-map'.
+
 +++
 ** The commands that add ChangeLog entries now prefer a VCS root directory
 for the ChangeLog file, if none already exists.  Customize
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4c3dfc4..6e6a423 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -186,7 +186,7 @@ and other things:
     (define-key map "w" 'shr-copy-url)
     (define-key map "u" 'shr-copy-url)
     (define-key map "v" 'shr-browse-url)
-    (define-key map "o" 'shr-save-contents)
+    (define-key map "O" 'shr-save-contents)
     (define-key map "\r" 'shr-browse-url)
     map))