summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-05-20 11:34:59 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2013-05-20 11:34:59 +0200
commit419b69a43562fc68b5ab58a5038003397665fbc7 (patch)
treeaade88138bb5abb4b56a88a2e6bfe603be03eae8
parent6e6b1044dc65e5d30515b6801e15ef283129dc6f (diff)
parent4daf9d60d913da6d4d086b05b38974779859a52d (diff)
downloadorg-mode-419b69a43562fc68b5ab58a5038003397665fbc7.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox.el40
1 files changed, 20 insertions, 20 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index b087921..08d2cd8 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4481,26 +4481,26 @@ same column as TABLE-CELL, or nil."
(plist-put info :table-cell-width-cache
(make-hash-table :test 'equal)))
:table-cell-width-cache)))
- (key (cons table column)))
- (or (let ((cached (gethash key cache 'no-result)))
- (and (not (eq cached 'no-result)) cached))
- (let (cookie-width)
- (dolist (row (org-element-contents table)
- (puthash key cookie-width cache))
- (when (org-export-table-row-is-special-p row info)
- ;; In a special row, try to find a width cookie at COLUMN.
- (let* ((value (org-element-contents
- (elt (org-element-contents row) column)))
- (cookie (car value)))
- ;; The following checks avoid expanding unnecessarily the
- ;; cell with `org-export-data'
- (when (and value
- (not (cdr value))
- (stringp cookie)
- (string-match "\\`<[lrc]?\\([0-9]+\\)?>\\'" cookie)
- (match-string 1 cookie))
- (setq cookie-width
- (string-to-number (match-string 1 cookie)))))))))))
+ (key (cons table column))
+ (value (gethash key cache 'no-result)))
+ (if (not (eq value 'no-result)) value
+ (let (cookie-width)
+ (dolist (row (org-element-contents table)
+ (puthash key cookie-width cache))
+ (when (org-export-table-row-is-special-p row info)
+ ;; In a special row, try to find a width cookie at COLUMN.
+ (let* ((value (org-element-contents
+ (elt (org-element-contents row) column)))
+ (cookie (car value)))
+ ;; The following checks avoid expanding unnecessarily
+ ;; the cell with `org-export-data'.
+ (when (and value
+ (not (cdr value))
+ (stringp cookie)
+ (string-match "\\`<[lrc]?\\([0-9]+\\)?>\\'" cookie)
+ (match-string 1 cookie))
+ (setq cookie-width
+ (string-to-number (match-string 1 cookie)))))))))))
(defun org-export-table-cell-alignment (table-cell info)
"Return TABLE-CELL contents alignment.