From 0d0b2a3744257a274f6e102d9c2dc65dfbf09a1c Mon Sep 17 00:00:00 2001 From: Nathaniel Flath Date: Sun, 19 Oct 2014 21:55:05 -0400 Subject: [PATCH 2/2] org-table.el: Print far fewer messages when recalculating tables. * lisp/org-table.el (org-table-recalculate): Removed message for start of processing. When ALL is t, messages are printed at most once per second. --- lisp/org-table.el | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 816709e..e5a8ce7 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3013,6 +3013,19 @@ list, 'literal is for the format specifier L." (push (cons (match-string 1 e) (match-string 2 e)) cst))) (setq org-table-formula-constants-local cst))))))) +(defmacro org-table-execute-once-per-second (t1 &rest body) + "If there has been more than one second since T1, execute BODY. +Updates T1 to 'current-time' if this condition is met. If T1 is +nil, always execute body." + `(if ,t1 + (let ((curtime (current-time))) + (when (< 0 (nth 1 (time-subtract curtime ,t1))) + (setq ,t1 curtime) + ,@body)) + ,@body)) + +(def-edebug-spec org-table-execute-once-per-second (form body)) + ;;;###autoload (defun org-table-recalculate (&optional all noalign) "Recalculate the current table line by applying all stored formulas. @@ -3037,6 +3050,8 @@ known that the table will be realigned a little later anyway." (line-re org-table-dataline-regexp) (thisline (org-current-line)) (thiscol (org-table-current-column)) + (log-first-time (current-time)) + (log-last-time log-first-time) seen-fields lhs1 beg end entry eqlnum eqlname eqlname1 eql (cnt 0) eq a name name1) ;; Insert constants in all formulas @@ -3086,7 +3101,6 @@ known that the table will be realigned a little later anyway." (setq beg (point-at-bol) end (move-marker (make-marker) (1+ (point-at-eol))))) (goto-char beg) - (and all (message "Re-applying formulas to full table...")) ;; First find the named fields, and mark them untouchable. ;; Also check if several field/range formulas try to set the same field. @@ -3111,7 +3125,9 @@ known that the table will be realigned a little later anyway." name))) (string-to-number (match-string 2 name))))) (when (and a (or all (equal (nth 1 a) thisline))) - (message "Re-applying formula to field: %s" name) + (org-table-execute-once-per-second + (when all log-last-time) + (message "Re-applying formula to field: %s" name)) (org-goto-line (nth 1 a)) (org-table-goto-column (nth 2 a)) (push (append a (list (cdr eq))) eqlname1) @@ -3124,8 +3140,11 @@ known that the table will be realigned a little later anyway." (while (re-search-forward line-re end t) (unless (string-match "^ *[_^!$/] *$" (org-table-get-field 1)) ;; Unprotected line, recalculate - (and all (message "Re-applying formulas to full table...(line %d)" - (setq cnt (1+ cnt)))) + (and all (org-table-execute-once-per-second + log-last-time + (message + "Re-applying formulas to full table...(line %d)" + (setq cnt (1+ cnt))))) (setq org-last-recalc-line (org-current-line)) (setq eql eqlnum) (while (setq entry (pop eql)) @@ -3138,7 +3157,10 @@ known that the table will be realigned a little later anyway." ;; Now evaluate the field formulas (while (setq eq (pop eqlname1)) - (message "Re-applying formula to field: %s" (car eq)) + (org-table-execute-once-per-second + (when all log-last-time) + (message "Re-applying formula to field: %s" (car eq))) + (org-goto-line (nth 1 eq)) (let ((column-target (nth 2 eq))) (when (> column-target 1000) @@ -3167,14 +3189,18 @@ known that the table will be realigned a little later anyway." (org-table-goto-column thiscol) (remove-text-properties (point-min) (point-max) '(org-untouchable t)) (or noalign (and org-table-may-need-update (org-table-align)) - (and all (message "Re-applying formulas to %d lines...done" cnt))) + (and all (org-table-execute-once-per-second + log-first-time + (message "Re-applying formulas to %d lines...done" cnt)))) + + (org-table-execute-once-per-second + log-first-time + (message "Re-applying formulas...done" cnt)) ;; back to initial position - (message "Re-applying formulas...done") (org-goto-line thisline) (org-table-goto-column thiscol) - (or noalign (and org-table-may-need-update (org-table-align)) - (and all (message "Re-applying formulas...done"))))))) + (or noalign (and org-table-may-need-update (org-table-align))))))) ;;;###autoload (defun org-table-iterate (&optional arg) -- 1.8.5.2 (Apple Git-48)