[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102031: shr.el (shr-tag-table): Simp
|
From: |
Katsumi Yamaoka |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102031: shr.el (shr-tag-table): Simplify. |
|
Date: |
Thu, 21 Oct 2010 05:36:36 +0000 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102031
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-21 05:36:36 +0000
message:
shr.el (shr-tag-table): Simplify.
modified:
lisp/gnus/ChangeLog
lisp/gnus/shr.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-21 03:48:01 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-21 05:36:36 +0000
@@ -1,3 +1,7 @@
+2010-10-21 Katsumi Yamaoka <address@hidden>
+
+ * shr.el (shr-tag-table): Simplify.
+
2010-10-21 Lars Magne Ingebrigtsen <address@hidden>
* gnus-html.el (gnus-html-prefetch-images): Only prefetch http images
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2010-10-21 01:49:12 +0000
+++ b/lisp/gnus/shr.el 2010-10-21 05:36:36 +0000
@@ -642,92 +642,43 @@
(nbody (if body (shr-max-columns body)))
(nfooter (if footer (shr-max-columns footer))))
(shr-tag-table-1
- (if caption
- (if header
- (if footer
- ;; caption + hader + body + footer
- (if (= nheader nbody)
- (if (= nbody nfooter)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body))))
- ,@footer)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- (if (= nbody nfooter)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- ,@footer)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer))))))))
- ;; caption + header + body
- (if (= nheader nbody)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body)))))
- (if (= nheader 1)
- `((tr (td ,@caption))
- ,@header (tr (td (table (tbody ,@body)))))
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))))))
- (if footer
- ;; caption + body + footer
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@body)))) ,@footer)
- `((tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- ;; caption + body
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@body)))))))
- (if header
- (if footer
- ;; header + body + footer
- (if (= nheader nbody)
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@header ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@header ,@body))))
- ,@footer)
- `((tr (td (table (tbody ,@header ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- ,@footer)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer))))))))
- ;; header + body
- (if (= nheader nbody)
- `((tr (td (table (tbody ,@header ,@body)))))
- (if (= nheader 1)
- `(,@header (tr (td (table (tbody ,@body)))))
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))))))
- (if footer
- ;; body + footer
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@body)))) ,@footer)
- `((tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- body))))))
+ (nconc
+ (if caption `((tr (td ,@caption))))
+ (if header
+ (if footer
+ ;; hader + body + footer
+ (if (= nheader nbody)
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@header ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@header ,@body)))))
+ (if (= nfooter 1)
+ footer
+ `((tr (td (table (tbody ,@footer))))))))
+ (nconc `((tr (td (table (tbody ,@header)))))
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@body)))))
+ (if (= nfooter 1)
+ footer
+ `((tr (td (table (tbody ,@footer))))))))))
+ ;; header + body
+ (if (= nheader nbody)
+ `((tr (td (table (tbody ,@header ,@body)))))
+ (if (= nheader 1)
+ `(,@header (tr (td (table (tbody ,@body)))))
+ `((tr (td (table (tbody ,@header))))
+ (tr (td (table (tbody ,@body))))))))
+ (if footer
+ ;; body + footer
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@body)))))
+ (if (= nfooter 1)
+ footer
+ `((tr (td (table (tbody ,@footer))))))))
+ (if caption
+ `((tr (td (table (tbody ,@body)))))
+ body)))))))
(defun shr-find-elements (cont type)
(let (result)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102031: shr.el (shr-tag-table): Simplify.,
Katsumi Yamaoka <=