[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/gnus mm-view.el gnus-art.el ChangeLog
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] emacs/lisp/gnus mm-view.el gnus-art.el ChangeLog |
Date: |
Thu, 04 Dec 2008 01:58:02 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Katsumi Yamaoka <yamaoka> 08/12/04 01:58:02
Modified files:
lisp/gnus : mm-view.el gnus-art.el ChangeLog
Log message:
* mm-view.el (mm-inline-text-html-render-with-w3m): Put special keymap
on links.
* gnus-art.el (gnus-article-wash-html-with-w3m): Ditto.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mm-view.el?cvsroot=emacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-art.el?cvsroot=emacs&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.772&r2=1.773
Patches:
Index: mm-view.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mm-view.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- mm-view.el 25 Sep 2008 15:38:30 -0000 1.39
+++ mm-view.el 4 Dec 2008 01:58:01 -0000 1.40
@@ -261,11 +261,37 @@
(when (and mm-inline-text-html-with-w3m-keymap
(boundp 'w3m-minor-mode-map)
w3m-minor-mode-map)
+ (if (and (boundp 'w3m-link-map)
+ w3m-link-map)
+ (let ((begin (point-min))
+ (map (copy-keymap w3m-link-map))
+ end)
+ (set-keymap-parent map w3m-minor-mode-map)
+ (while (setq end (next-single-property-change
+ begin 'w3m-href-anchor))
+ (add-text-properties
+ begin end
+ (list 'keymap (if (get-text-property begin 'w3m-href-anchor)
+ map
+ w3m-minor-mode-map)
+ ;; Put the mark meaning this part was rendered
+ ;; by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t))
+ (setq begin end))
+ (add-text-properties
+ begin (point-max)
+ (list 'keymap (if (get-text-property begin 'w3m-href-anchor)
+ map
+ w3m-minor-mode-map)
+ ;; Put the mark meaning this part was rendered
+ ;; by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t)))
(add-text-properties
(point-min) (point-max)
(list 'keymap w3m-minor-mode-map
- ;; Put the mark meaning this part was rendered by emacs-w3m.
- 'mm-inline-text-html-with-w3m t)))
+ ;; Put the mark meaning this part was rendered
+ ;; by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t))))
(mm-handle-set-undisplayer
handle
`(lambda ()
Index: gnus-art.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- gnus-art.el 30 Sep 2008 00:48:03 -0000 1.170
+++ gnus-art.el 4 Dec 2008 01:58:01 -0000 1.171
@@ -2731,11 +2731,34 @@
(when (and mm-inline-text-html-with-w3m-keymap
(boundp 'w3m-minor-mode-map)
w3m-minor-mode-map)
+ (if (and (boundp 'w3m-link-map)
+ w3m-link-map)
+ (let ((begin (point-min))
+ (map (copy-keymap w3m-link-map))
+ end)
+ (set-keymap-parent map w3m-minor-mode-map)
+ (while (setq end (next-single-property-change begin
+ 'w3m-href-anchor))
+ (add-text-properties
+ begin end
+ (list 'keymap (if (get-text-property begin 'w3m-href-anchor)
+ map
+ w3m-minor-mode-map)
+ ;; Put the mark meaning this part was rendered by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t))
+ (setq begin end))
+ (add-text-properties
+ begin (point-max)
+ (list 'keymap (if (get-text-property begin 'w3m-href-anchor)
+ map
+ w3m-minor-mode-map)
+ ;; Put the mark meaning this part was rendered by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t)))
(add-text-properties
(point-min) (point-max)
(list 'keymap w3m-minor-mode-map
;; Put the mark meaning this part was rendered by emacs-w3m.
- 'mm-inline-text-html-with-w3m t))))
+ 'mm-inline-text-html-with-w3m t)))))
(defvar charset) ;; Bound by `article-wash-html'.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -b -r1.772 -r1.773
--- ChangeLog 3 Dec 2008 03:00:41 -0000 1.772
+++ ChangeLog 4 Dec 2008 01:58:01 -0000 1.773
@@ -1,3 +1,10 @@
+2008-12-04 Naohiro Aota <address@hidden>
+
+ * mm-view.el (mm-inline-text-html-render-with-w3m): Put special keymap
+ on links.
+
+ * gnus-art.el (gnus-article-wash-html-with-w3m): Ditto.
+
2008-12-03 Katsumi Yamaoka <address@hidden>
* message.el (message-idna-to-ascii-rhs-1): Protect against local
- [Emacs-diffs] emacs/lisp/gnus mm-view.el gnus-art.el ChangeLog,
Katsumi Yamaoka <=