diff options
| author | Juanma Barranquero | 2005-07-19 23:37:03 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-07-19 23:37:03 +0000 |
| commit | 41bfd17eff307782f8914b5f18a228cb82edbabe (patch) | |
| tree | 8d6ae58e51d5005218bdf22beaf9aedabb48df4c | |
| parent | fb1556f06ebdf9227bd107b67a14d69eac586231 (diff) | |
| download | emacs-41bfd17eff307782f8914b5f18a228cb82edbabe.tar.gz emacs-41bfd17eff307782f8914b5f18a228cb82edbabe.zip | |
(org-table-formula-substitute-names, org-table-get-vertical-vector): Doc fixes.
(org-table-recalculate): Remove unused argument to `message'.
| -rw-r--r-- | lisp/textmodes/org.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 7517162cc8d..26708deefe2 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -6996,9 +6996,9 @@ If NLAST is a number, only the NLAST fields will actually be summed." | |||
| 6996 | (t n)))) | 6996 | (t n)))) |
| 6997 | 6997 | ||
| 6998 | (defun org-table-get-vertical-vector (desc &optional tbeg col) | 6998 | (defun org-table-get-vertical-vector (desc &optional tbeg col) |
| 6999 | "Get a calc vector from a column, accorting to desctiptor | 6999 | "Get a calc vector from a column, according to descriptor DESC. |
| 7000 | Optional arguments TBEG and COL can give the beginning of the table and | 7000 | Optional arguments TBEG and COL can give the beginning of the table |
| 7001 | the current column, to avoid unnecessary parsing." | 7001 | and the current column, to avoid unnecessary parsing." |
| 7002 | (save-excursion | 7002 | (save-excursion |
| 7003 | (or tbeg (setq tbeg (org-table-begin))) | 7003 | (or tbeg (setq tbeg (org-table-begin))) |
| 7004 | (or col (setq col (org-table-current-column))) | 7004 | (or col (setq col (org-table-current-column))) |
| @@ -7046,7 +7046,7 @@ the current column, to avoid unnecessary parsing." | |||
| 7046 | l ",") "]")) | 7046 | l ",") "]")) |
| 7047 | ((string-match "\\([0-9]+\\)" desc) | 7047 | ((string-match "\\([0-9]+\\)" desc) |
| 7048 | (beginning-of-line 1) | 7048 | (beginning-of-line 1) |
| 7049 | (when (re-search-backward org-table-dataline-regexp tbeg t | 7049 | (when (re-search-backward org-table-dataline-regexp tbeg t |
| 7050 | (string-to-number (match-string 0 desc))) | 7050 | (string-to-number (match-string 0 desc))) |
| 7051 | (org-table-goto-column col) | 7051 | (org-table-goto-column col) |
| 7052 | (org-trim (org-table-get-field)))))))) | 7052 | (org-trim (org-table-get-field)))))))) |
| @@ -7142,7 +7142,7 @@ the current column, to avoid unnecessary parsing." | |||
| 7142 | ACTION can be `remove', `insert', `swap'. For `swap', two column numbers are | 7142 | ACTION can be `remove', `insert', `swap'. For `swap', two column numbers are |
| 7143 | expected, for the other action only a single column number is needed." | 7143 | expected, for the other action only a single column number is needed." |
| 7144 | (let ((list (org-table-get-stored-formulas)) | 7144 | (let ((list (org-table-get-stored-formulas)) |
| 7145 | (nmax (length (org-split-string | 7145 | (nmax (length (org-split-string |
| 7146 | (buffer-substring (point-at-bol) (point-at-eol)) | 7146 | (buffer-substring (point-at-bol) (point-at-eol)) |
| 7147 | "|"))) | 7147 | "|"))) |
| 7148 | col col1 col2 scol si sc1 sc2) | 7148 | col col1 col2 scol si sc1 sc2) |
| @@ -7221,7 +7221,7 @@ expected, for the other action only a single column number is needed." | |||
| 7221 | fields (org-split-string (match-string 2) " *| *")) | 7221 | fields (org-split-string (match-string 2) " *| *")) |
| 7222 | (save-excursion | 7222 | (save-excursion |
| 7223 | (beginning-of-line (if (equal c "_") 2 0)) | 7223 | (beginning-of-line (if (equal c "_") 2 0)) |
| 7224 | (setq line (org-current-line) col 1) | 7224 | (setq line (org-current-line) col 1) |
| 7225 | (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)") | 7225 | (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)") |
| 7226 | (setq fields1 (org-split-string (match-string 1) " *| *")))) | 7226 | (setq fields1 (org-split-string (match-string 1) " *| *")))) |
| 7227 | (while (and fields1 (setq field (pop fields))) | 7227 | (while (and fields1 (setq field (pop fields))) |
| @@ -7557,10 +7557,10 @@ $1-> %s\n" orig formula form)) | |||
| 7557 | (goto-line thisline) | 7557 | (goto-line thisline) |
| 7558 | (org-table-goto-column thiscol) | 7558 | (org-table-goto-column thiscol) |
| 7559 | (or noalign (and org-table-may-need-update (org-table-align)) | 7559 | (or noalign (and org-table-may-need-update (org-table-align)) |
| 7560 | (and all (message "Re-applying formulas...done" cnt))))) | 7560 | (and all (message "Re-applying formulas...done"))))) |
| 7561 | 7561 | ||
| 7562 | (defun org-table-formula-substitute-names (f) | 7562 | (defun org-table-formula-substitute-names (f) |
| 7563 | "Replace $const with values in stirng F." | 7563 | "Replace $const with values in string F." |
| 7564 | (let ((start 0) a n1 n2 nn1 nn2 s (f1 f)) | 7564 | (let ((start 0) a n1 n2 nn1 nn2 s (f1 f)) |
| 7565 | ;; First, check for column names | 7565 | ;; First, check for column names |
| 7566 | (while (setq start (string-match org-table-column-name-regexp f start)) | 7566 | (while (setq start (string-match org-table-column-name-regexp f start)) |
| @@ -7621,7 +7621,7 @@ Parameters get priority." | |||
| 7621 | (set (make-local-variable 'org-pos) pos) | 7621 | (set (make-local-variable 'org-pos) pos) |
| 7622 | (set (make-local-variable 'org-window-configuration) wc) | 7622 | (set (make-local-variable 'org-window-configuration) wc) |
| 7623 | (use-local-map org-edit-formulas-map) | 7623 | (use-local-map org-edit-formulas-map) |
| 7624 | (setq s "# Edit formulas and finish with `C-c C-c'. | 7624 | (setq s "# Edit formulas and finish with `C-c C-c'. |
| 7625 | # Use `C-u C-c C-c' to also appy them immediately to the entire table. | 7625 | # Use `C-u C-c C-c' to also appy them immediately to the entire table. |
| 7626 | # Use `C-c ?' to get information about $name at point. | 7626 | # Use `C-c ?' to get information about $name at point. |
| 7627 | # To cancel editing, press `C-c C-q'.\n") | 7627 | # To cancel editing, press `C-c C-q'.\n") |
| @@ -7659,7 +7659,7 @@ Parameters get priority." | |||
| 7659 | (switch-to-buffer-other-window (marker-buffer pos)) | 7659 | (switch-to-buffer-other-window (marker-buffer pos)) |
| 7660 | (goto-char pos) | 7660 | (goto-char pos) |
| 7661 | (goto-char (org-table-begin)) | 7661 | (goto-char (org-table-begin)) |
| 7662 | (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") | 7662 | (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") |
| 7663 | (org-table-end) t) | 7663 | (org-table-end) t) |
| 7664 | (progn | 7664 | (progn |
| 7665 | (goto-char (match-beginning 1)) | 7665 | (goto-char (match-beginning 1)) |
| @@ -7714,7 +7714,7 @@ With prefix ARG, apply the new formulas to the table." | |||
| 7714 | (org-table-store-formulas eql) | 7714 | (org-table-store-formulas eql) |
| 7715 | (move-marker pos nil) | 7715 | (move-marker pos nil) |
| 7716 | (kill-buffer "*Edit Formulas*") | 7716 | (kill-buffer "*Edit Formulas*") |
| 7717 | (if arg | 7717 | (if arg |
| 7718 | (org-table-recalculate 'all) | 7718 | (org-table-recalculate 'all) |
| 7719 | (message "New formulas installed - press C-u C-c C-c to apply.")))) | 7719 | (message "New formulas installed - press C-u C-c C-c to apply.")))) |
| 7720 | 7720 | ||