# HG changeset patch # User Juanma Barranquero # Date 1121816223 0 # Node ID 7b82147924c70140b3072671e33adbfffc187374 # Parent 098497d516e88a477a71783499079d6531e03760 (org-table-formula-substitute-names, org-table-get-vertical-vector): Doc fixes. (org-table-recalculate): Remove unused argument to `message'. diff -r 098497d516e8 -r 7b82147924c7 lisp/textmodes/org.el --- a/lisp/textmodes/org.el Tue Jul 19 17:00:20 2005 +0000 +++ b/lisp/textmodes/org.el Tue Jul 19 23:37:03 2005 +0000 @@ -6996,9 +6996,9 @@ (t n)))) (defun org-table-get-vertical-vector (desc &optional tbeg col) - "Get a calc vector from a column, accorting to desctiptor -Optional arguments TBEG and COL can give the beginning of the table and -the current column, to avoid unnecessary parsing." + "Get a calc vector from a column, according to descriptor DESC. +Optional arguments TBEG and COL can give the beginning of the table +and the current column, to avoid unnecessary parsing." (save-excursion (or tbeg (setq tbeg (org-table-begin))) (or col (setq col (org-table-current-column))) @@ -7046,7 +7046,7 @@ l ",") "]")) ((string-match "\\([0-9]+\\)" desc) (beginning-of-line 1) - (when (re-search-backward org-table-dataline-regexp tbeg t + (when (re-search-backward org-table-dataline-regexp tbeg t (string-to-number (match-string 0 desc))) (org-table-goto-column col) (org-trim (org-table-get-field)))))))) @@ -7142,7 +7142,7 @@ ACTION can be `remove', `insert', `swap'. For `swap', two column numbers are expected, for the other action only a single column number is needed." (let ((list (org-table-get-stored-formulas)) - (nmax (length (org-split-string + (nmax (length (org-split-string (buffer-substring (point-at-bol) (point-at-eol)) "|"))) col col1 col2 scol si sc1 sc2) @@ -7221,7 +7221,7 @@ fields (org-split-string (match-string 2) " *| *")) (save-excursion (beginning-of-line (if (equal c "_") 2 0)) - (setq line (org-current-line) col 1) + (setq line (org-current-line) col 1) (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)") (setq fields1 (org-split-string (match-string 1) " *| *")))) (while (and fields1 (setq field (pop fields))) @@ -7557,10 +7557,10 @@ (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" cnt))))) + (and all (message "Re-applying formulas...done"))))) (defun org-table-formula-substitute-names (f) - "Replace $const with values in stirng F." + "Replace $const with values in string F." (let ((start 0) a n1 n2 nn1 nn2 s (f1 f)) ;; First, check for column names (while (setq start (string-match org-table-column-name-regexp f start)) @@ -7621,7 +7621,7 @@ (set (make-local-variable 'org-pos) pos) (set (make-local-variable 'org-window-configuration) wc) (use-local-map org-edit-formulas-map) - (setq s "# Edit formulas and finish with `C-c C-c'. + (setq s "# Edit formulas and finish with `C-c C-c'. # Use `C-u C-c C-c' to also appy them immediately to the entire table. # Use `C-c ?' to get information about $name at point. # To cancel editing, press `C-c C-q'.\n") @@ -7659,7 +7659,7 @@ (switch-to-buffer-other-window (marker-buffer pos)) (goto-char pos) (goto-char (org-table-begin)) - (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") + (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") (org-table-end) t) (progn (goto-char (match-beginning 1)) @@ -7714,7 +7714,7 @@ (org-table-store-formulas eql) (move-marker pos nil) (kill-buffer "*Edit Formulas*") - (if arg + (if arg (org-table-recalculate 'all) (message "New formulas installed - press C-u C-c C-c to apply."))))