summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-25 13:57:39 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-25 13:57:39 +0200
commitda775ffebf236aae7f3716acc341393424a0fc10 (patch)
tree75c634400228b098d80202e78993d6269207a91d
parentc370a5300bc4761b8f57dd38b37efbb873a65381 (diff)
downloadorg-mode-da775ffebf236aae7f3716acc341393424a0fc10.tar.gz
Stop table mapping from emitting messages
-rwxr-xr-xlisp/ChangeLog6
-rw-r--r--lisp/org-ascii.el5
-rw-r--r--lisp/org.el9
3 files changed, 13 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ba45d0..01f9646 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
2010-04-25 Carsten Dominik <carsten.dominik@gmail.com>
+ * org.el (org-mode): Make table mapping quiet.
+ (org-table-map-tables): New optional argument QUIETLY.
+
+ * org-ascii.el (org-export-ascii-preprocess): Make table
+ mapping quiet.
+
* org-html.el (org-export-as-html, org-html-level-start): Change
XHTML IDs to not use dots.
diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index e4ce86a..02578cc 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -550,9 +550,8 @@ publishing directory."
(org-ascii-replace-entities)
(goto-char (point-min))
(org-table-map-tables
- (lambda ()
- (org-if-unprotected
- (org-table-align))))))
+ (lambda () (org-if-unprotected (org-table-align)))
+ 'quietly)))
;; Put quotes around verbatim text
(goto-char (point-min))
(while (re-search-forward org-verbatim-re nil t)
diff --git a/lisp/org.el b/lisp/org.el
index fd6197b..9c2f848 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3402,21 +3402,22 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
(defvar org-table-clean-did-remove-column nil)
-(defun org-table-map-tables (function)
+(defun org-table-map-tables (function &optional quietly)
"Apply FUNCTION to the start of all tables in the buffer."
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
(while (re-search-forward org-table-any-line-regexp nil t)
- (message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
+ (unless quietly
+ (message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size))))
(beginning-of-line 1)
(when (looking-at org-table-line-regexp)
(save-excursion (funcall function))
(or (looking-at org-table-line-regexp)
(forward-char 1)))
(re-search-forward org-table-any-border-regexp nil 1))))
- (message "Mapping tables: done"))
+ (unless quietly (message "Mapping tables: done")))
;; Declare and autoload functions from org-exp.el & Co
@@ -4456,7 +4457,7 @@ The following commands are available:
(unless org-inhibit-startup
(when org-startup-align-all-tables
(let ((bmp (buffer-modified-p)))
- (org-table-map-tables 'org-table-align)
+ (org-table-map-tables 'org-table-align 'quietly)
(set-buffer-modified-p bmp)))
(when org-startup-indented
(require 'org-indent)