merge trunk

2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5d8b71bb8d..c34cab68426 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-map): Reinstate the `u' key binding, since it's
+        been used a while.
+
 2013-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * subr.el (read-quoted-char): Remove unused local variable `char'.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bdc30bc9292..4506ede8722 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -145,6 +145,7 @@ cid: URL as the argument.")
     (define-key map [follow-link] 'mouse-face)
     (define-key map "I" 'shr-insert-image)
     (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 "\r" 'shr-browse-url)