From 89ee762af4a361d6bef8d41030766870e46a1e90 Mon Sep 17 00:00:00 2001 From: Naoya Yamashita Date: Thu, 3 Sep 2020 11:15:43 +0900 Subject: [PATCH] change uncommon prefix variable name --- ox-gfm.el | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ox-gfm.el b/ox-gfm.el index fa72700..0e73c7b 100644 --- a/ox-gfm.el +++ b/ox-gfm.el @@ -106,28 +106,28 @@ holding contextual information." ;;;; Table-Common -(defvar width-cookies nil) -(defvar width-cookies-table nil) +(defvar org-gfm-width-cookies nil) +(defvar org-gfm-width-cookies-table nil) -(defconst gfm-table-left-border "|") -(defconst gfm-table-right-border " |") -(defconst gfm-table-separator " |") +(defconst org-gfm-table-left-border "|") +(defconst org-gfm-table-right-border " |") +(defconst org-gfm-table-separator " |") (defun org-gfm-table-col-width (table column info) "Return width of TABLE at given COLUMN. INFO is a plist used as communication channel. -Width of a column is determined either by inquerying `width-cookies' +Width of a column is determined either by inquerying `org-gfm-width-cookies' in the column, or by the maximum cell with in the column." - (let ((cookie (when (hash-table-p width-cookies) - (gethash column width-cookies)))) - (if (and (eq table width-cookies-table) + (let ((cookie (when (hash-table-p org-gfm-width-cookies) + (gethash column org-gfm-width-cookies)))) + (if (and (eq table org-gfm-width-cookies-table) (not (eq nil cookie))) cookie (progn - (unless (and (eq table width-cookies-table) - (hash-table-p width-cookies)) - (setq width-cookies (make-hash-table)) - (setq width-cookies-table table)) + (unless (and (eq table org-gfm-width-cookies-table) + (hash-table-p org-gfm-width-cookies)) + (setq org-gfm-width-cookies (make-hash-table)) + (setq org-gfm-width-cookies-table table)) (let ((max-width 0) (specialp (org-export-table-has-special-column-p table))) (org-element-map @@ -144,7 +144,7 @@ in the column, or by the maximum cell with in the column." info)) max-width))) info) - (puthash column max-width width-cookies)))))) + (puthash column max-width org-gfm-width-cookies)))))) (defun org-gfm-make-hline-builder (table info char) @@ -193,11 +193,11 @@ INFO is a plist used as a communication channel." (build-rule (org-gfm-make-hline-builder table info ?-)) (cols (cdr (org-export-table-dimensions table info)))) (setq contents - (concat gfm-table-left-border + (concat org-gfm-table-left-border (mapconcat (lambda (col) (funcall build-rule col)) (number-sequence 0 (- cols 1)) - gfm-table-separator) - gfm-table-right-border)))) + org-gfm-table-separator) + org-gfm-table-right-border)))) contents)) @@ -217,15 +217,15 @@ INFO is a plist holding contextual information." (let ((build-empty-cell (org-gfm-make-hline-builder table info ?\s)) (build-rule (org-gfm-make-hline-builder table info ?-)) (columns (number-sequence 0 (- cols 1)))) - (concat gfm-table-left-border + (concat org-gfm-table-left-border (mapconcat (lambda (col) (funcall build-empty-cell col)) columns - gfm-table-separator) - gfm-table-right-border "\n" gfm-table-left-border + org-gfm-table-separator) + org-gfm-table-right-border "\n" org-gfm-table-left-border (mapconcat (lambda (col) (funcall build-rule col)) columns - gfm-table-separator) - gfm-table-right-border "\n")))))) + org-gfm-table-separator) + org-gfm-table-right-border "\n")))))) (concat (when no-header (funcall build-dummy-header)) (replace-regexp-in-string "\n\n" "\n" contents))))