[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117902: Allow users to specify `shr-width'
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] trunk r117902: Allow users to specify `shr-width' |
Date: |
Thu, 18 Sep 2014 19:18:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117902
revision-id: address@hidden
parent: address@hidden
author: Ivan Kanis <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2014-09-18 21:18:34 +0200
message:
Allow users to specify `shr-width'
* net/shr.el, net/eww.el: Don't override `shr-width', but
introduce a new variable `shr-internal-width'. This allows users
to specify a width themselves.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/eww.el eww.el-20130610114603-80ap3gwnw4x4m5ix-1
lisp/net/shr.el shr.el-20101002102929-yfzewk55rsg0mn93-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-18 18:38:05 +0000
+++ b/lisp/ChangeLog 2014-09-18 19:18:34 +0000
@@ -1,3 +1,9 @@
+2014-09-18 Ivan Kanis <address@hidden>
+
+ * net/shr.el, net/eww.el: Don't override `shr-width', but
+ introduce a new variable `shr-internal-width'. This allows users
+ to specify a width themselves.
+
2014-09-18 Lars Magne Ingebrigtsen <address@hidden>
* image-mode.el (image-toggle-display-image): If we have a
=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el 2014-08-05 18:15:52 +0000
+++ b/lisp/net/eww.el 2014-09-18 19:18:34 +0000
@@ -270,7 +270,6 @@
(setq eww-current-dom document)
(let ((inhibit-read-only t)
(after-change-functions nil)
- (shr-width nil)
(shr-target-id (url-target (url-generic-parse-url url)))
(shr-external-rendering-functions
'((title . eww-tag-title)
=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el 2014-08-28 01:59:29 +0000
+++ b/lisp/net/shr.el 2014-09-18 19:18:34 +0000
@@ -130,6 +130,7 @@
(defvar shr-start nil)
(defvar shr-indentation 0)
(defvar shr-inhibit-images nil)
+(defvar shr-internal-width (or shr-width (1- (window-width))))
(defvar shr-list-mode nil)
(defvar shr-content-cache nil)
(defvar shr-kinsoku-shorten nil)
@@ -197,7 +198,7 @@
(shr-state nil)
(shr-start nil)
(shr-base nil)
- (shr-width (or shr-width (1- (window-width)))))
+ (shr-internal-width (or shr-width (1- (window-width)))))
(shr-descend (shr-transform-dom dom))
(shr-remove-trailing-whitespace start (point))))
@@ -471,8 +472,8 @@
(insert elem)
(setq shr-state nil)
(let (found)
- (while (and (> (current-column) shr-width)
- (> shr-width 0)
+ (while (and (> (current-column) shr-internal-width)
+ (> shr-internal-width 0)
(progn
(setq found (shr-find-fill-point))
(not (eolp))))
@@ -486,10 +487,10 @@
(when (> shr-indentation 0)
(shr-indent))
(end-of-line))
- (if (<= (current-column) shr-width)
+ (if (<= (current-column) shr-internal-width)
(insert " ")
;; In case we couldn't get a valid break point (because of a
- ;; word that's longer than `shr-width'), just break anyway.
+ ;; word that's longer than `shr-internal-width'), just break anyway.
(insert "\n")
(when (> shr-indentation 0)
(shr-indent)))))
@@ -497,7 +498,7 @@
(delete-char -1)))))
(defun shr-find-fill-point ()
- (when (> (move-to-column shr-width) shr-width)
+ (when (> (move-to-column shr-internal-width) shr-internal-width)
(backward-char 1))
(let ((bp (point))
failed)
@@ -537,7 +538,7 @@
;; so we look for the second best position.
(while (and (progn
(forward-char 1)
- (<= (current-column) shr-width))
+ (<= (current-column) shr-internal-width))
(progn
(setq bp (point))
(shr-char-kinsoku-eol-p (following-char)))))
@@ -1344,7 +1345,7 @@
(defun shr-tag-hr (_cont)
(shr-ensure-newline)
- (insert (make-string shr-width shr-hr-line) "\n"))
+ (insert (make-string shr-internal-width shr-hr-line) "\n"))
(defun shr-tag-title (cont)
(shr-heading cont 'bold 'underline))
@@ -1637,7 +1638,7 @@
(setq style (nconc (list (cons 'color fgcolor)) style)))
(when style
(setq shr-stylesheet (append style shr-stylesheet)))
- (let ((shr-width width)
+ (let ((shr-internal-width width)
(shr-indentation 0))
(shr-descend (cons 'td cont)))
;; Delete padding at the bottom of the TDs.
@@ -1709,7 +1710,8 @@
(dotimes (i (length columns))
(aset widths i (max (truncate (* (aref columns i)
total-percentage
- (- shr-width (1+ (length columns)))))
+ (- shr-internal-width
+ (1+ (length columns)))))
10)))
widths))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117902: Allow users to specify `shr-width',
Lars Ingebrigtsen <=