procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further shr quotation mark fill fixes

Browse source 
(shr-char-kinsoku-bol-p): The quotation mark isn't a kinsoky BOL char.
(shr-find-fill-point): Remove the special checks for the quotation
mark, since `shr-char-kinsoku-bol-p' should now return the right
thing.
This commit is contained in:
Lars Ingebrigtsen 2013-12-25 19:14:49 +01:00
parent 0137922173
commit c6c2058404
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -17,6 +17,10 @@
* net/shr.el (shr-find-fill-point): Don't break lines before a
quotation mark.
(shr-char-kinsoku-bol-p): The quotation mark isn't a kinsoky BOL char.
(shr-find-fill-point): Remove the special checks for the quotation
mark, since `shr-char-kinsoku-bol-p' should now return the right
thing.
2013-12-25 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>

30
lisp/net/shr.el
View file

@ -414,7 +414,9 @@ size, and full-buffer size."
;; of a line or the end of a line.
(defmacro shr-char-kinsoku-bol-p (char)
"Return non-nil if a line ought not to begin with CHAR."
`(aref (char-category-set ,char) ?>))
`(let ((char ,char))
(and (not (eq char ?'))
(aref (char-category-set char) ?>))))
(defmacro shr-char-kinsoku-eol-p (char)
"Return non-nil if a line ought not to end with CHAR."
`(aref (char-category-set ,char) ?<))
@ -489,30 +491,19 @@ size, and full-buffer size."
(eq (following-char) ? )
(shr-char-breakable-p (preceding-char))
(shr-char-breakable-p (following-char))
(if (eq (preceding-char) ?')
(not (memq (char-after (- (point) 2))
(list nil ?\n ? )))
(and (shr-char-kinsoku-bol-p (preceding-char))
(shr-char-breakable-p (following-char))
(not (shr-char-kinsoku-bol-p (following-char)))))
(and (shr-char-kinsoku-bol-p (preceding-char))
(shr-char-breakable-p (following-char))
(not (shr-char-kinsoku-bol-p (following-char))))
(shr-char-kinsoku-eol-p (following-char))))
(backward-char 1))
(if (and (not (or failed (eolp)))
(eq (preceding-char) ?'))
(while (not (or (setq failed (eolp))
(eq (following-char) ? )
(shr-char-breakable-p (following-char))
(shr-char-kinsoku-eol-p (following-char))))
(forward-char 1)))
(if failed
;; There's no breakable point, so we give it up.
(let (found)
(goto-char bp)
(unless shr-kinsoku-shorten
(while (and (setq found (re-search-forward
"\\(\\c>\\)\\| \\|\\c<\\|\\c|"
(line-end-position) 'move))
(eq (preceding-char) ?')))
(while (setq found (re-search-forward
"\\(\\c>\\)\\| \\|\\c<\\|\\c|"
(line-end-position) 'move)))
(if (and found (not (match-beginning 1)))
(goto-char (match-beginning 0)))))
(or
@ -550,8 +541,7 @@ size, and full-buffer size."
(if (looking-at "\\(\\c<+\\)\\c<")
(goto-char (match-end 1))
(forward-char 1))))
((and (shr-char-kinsoku-bol-p (following-char))
(not (eq (following-char) ?')))
((shr-char-kinsoku-bol-p (following-char))
;; Find forward the point where kinsoku-bol characters end.
(let ((count 4))
(while (progn