[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master dc332c1 1/2: Fix links in tables in shr
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master dc332c1 1/2: Fix links in tables in shr |
Date: |
Fri, 01 May 2015 13:28:19 +0000 |
branch: master
commit dc332c12ffeea8d93b060b05ee8f97360076338b
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Fix links in tables in shr
* lisp/net/shr.el: Remove `shr-inhibit-decoration', because that
makes (some) links in tables not work.
---
lisp/net/shr.el | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 7763507..ec30d7e 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -152,7 +152,6 @@ cid: URL as the argument.")
(defvar shr-ignore-cache nil)
(defvar shr-external-rendering-functions nil)
(defvar shr-target-id nil)
-(defvar shr-inhibit-decoration nil)
(defvar shr-table-separator-length 1)
(defvar shr-table-separator-pixel-width 0)
(defvar shr-table-id nil)
@@ -783,16 +782,15 @@ size, and full-buffer size."
;; blank text at the start of the line, and the newline at the end, to
;; avoid ugliness.
(defun shr-add-font (start end type)
- (unless shr-inhibit-decoration
- (save-excursion
- (goto-char start)
- (while (< (point) end)
- (when (bolp)
- (skip-chars-forward " "))
- (add-face-text-property (point) (min (line-end-position) end) type t)
- (if (< (line-end-position) end)
- (forward-line 1)
- (goto-char end))))))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (when (bolp)
+ (skip-chars-forward " "))
+ (add-face-text-property (point) (min (line-end-position) end) type t)
+ (if (< (line-end-position) end)
+ (forward-line 1)
+ (goto-char end)))))
(defun shr-mouse-browse-url (ev)
"Browse the URL under the mouse cursor."
@@ -1041,8 +1039,7 @@ ones, in case fg and bg are nil."
(shr-color-visible bg fg)))))))
(defun shr-colorize-region (start end fg &optional bg)
- (when (and (not shr-inhibit-decoration)
- (or fg bg))
+ (when (or fg bg)
(let ((new-colors (shr-color-check fg bg)))
(when new-colors
(when fg
@@ -1212,8 +1209,7 @@ ones, in case fg and bg are nil."
(shr-ensure-newline)
(insert " "))
(put-text-property start (1+ start) 'shr-target-id shr-target-id))
- (when (and url
- (not shr-inhibit-decoration))
+ (when url
(shr-urlify (or shr-start start) (shr-expand-url url) title))))
(defun shr-tag-object (dom)
@@ -1805,7 +1801,6 @@ The preference is a float determined from
`shr-prefer-media-type'."
(defun shr-make-table-1 (dom widths &optional fill)
(let ((trs nil)
- (shr-inhibit-decoration (not fill))
(rowspans (make-vector (length widths) 0))
(colspan-remaining 0)
colspan-width colspan-count