浏览代码

Stop table mapping from emitting messages

Carsten Dominik 15 年之前
父节点
当前提交
da775ffebf
共有 3 个文件被更改,包括 13 次插入7 次删除
  1. 6 0
      lisp/ChangeLog
  2. 2 3
      lisp/org-ascii.el
  3. 5 4
      lisp/org.el

+ 6 - 0
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.
 

+ 2 - 3
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)

+ 5 - 4
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)