summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2013-06-25 21:25:14 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2013-06-25 21:25:14 +0200
commit16f74f10ba890564e6d93b221ec38091af781bf3 (patch)
tree0116f10a75b82c204afc1e3e3165dabf174e054d /lisp
parentab5340fe26ade1e3b10ea2e87a471fecff355735 (diff)
downloademacs-16f74f10ba890564e6d93b221ec38091af781bf3.tar.gz
emacs-16f74f10ba890564e6d93b221ec38091af781bf3.tar.bz2
emacs-16f74f10ba890564e6d93b221ec38091af781bf3.zip
Use `w' for copying URLs in shr and eww
* net/eww.el (eww-mode-map): Ditto. * net/eww.el (eww-copy-page-url): Changed name of command. * net/shr.el (shr-map): Change `shr-copy-url' from `u' to `w' to be more consistent with Info and dired.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/net/eww.el9
-rw-r--r--lisp/net/shr.el2
3 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4a42f955d3..2f6f2df3221 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * net/eww.el (eww-copy-page-url): Changed name of command.
+
+ * net/shr.el (shr-map): Change `shr-copy-url' from `u' to `w' to
+ be more consistent with Info and dired.
+
+ * net/eww.el (eww-mode-map): Ditto.
+
2013-06-25 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el: Use lexical-binding. Include obsolete
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index a77bed52a96..9d6e42792ec 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -324,8 +324,8 @@ word(s) will be searched for via `eww-search-prefix'."
(define-key map "p" 'eww-previous-url)
(define-key map "u" 'eww-up-url)
(define-key map "t" 'eww-top-url)
- (define-key map "w" 'eww-browse-with-external-browser)
- (define-key map "y" 'eww-yank-page-url)
+ (define-key map "&" 'eww-browse-with-external-browser)
+ (define-key map "w" 'eww-copy-page-url)
map))
(define-derived-mode eww-mode nil "eww"
@@ -871,10 +871,11 @@ The browser to used is specified by the `shr-external-browser' variable."
(interactive)
(funcall shr-external-browser eww-current-url))
-(defun eww-yank-page-url ()
+(defun eww-copy-page-url ()
(interactive)
- (message eww-current-url)
+ (message "%s" eww-current-url)
(kill-new eww-current-url))
+
(provide 'eww)
;;; eww.el ends here
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 886308d55ef..e1b1d4a93f7 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -144,7 +144,7 @@ cid: URL as the argument.")
(define-key map [backtab] 'shr-previous-link)
(define-key map [follow-link] 'mouse-face)
(define-key map "I" 'shr-insert-image)
- (define-key map "u" 'shr-copy-url)
+ (define-key map "w" 'shr-copy-url)
(define-key map "v" 'shr-browse-url)
(define-key map "o" 'shr-save-contents)
(define-key map "\r" 'shr-browse-url)