Commit ae489445 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(calc-embedded-close-formula, calc-embedded-open-formula,

font-lock-unfontify-region-function): Add defvars.
parent c5309fd6
......@@ -193,6 +193,10 @@
(require 'time-date)
(require 'easymenu)
(defvar calc-embedded-close-formula)
(defvar calc-embedded-open-formula)
(defvar font-lock-unfontify-region-function)
;;; Customization variables
(defvar org-version "3.15"
......@@ -1955,7 +1959,7 @@ The following commands are available:
;; (3 'underline))
; (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
; '(1 'org-warning t))
(list (concat "^\\*+[ \t]*\\<\\(" org-comment-string
(list (concat "^\\*+[ \t]*\\<\\(" org-comment-string
"\\|" org-quote-string "\\)\\>")
'(1 'org-special-keyword t))
'("^#.*" (0 'font-lock-comment-face t))
......@@ -7036,7 +7040,7 @@ If NLAST is a number, only the NLAST fields will actually be summed."
(t n))))
(defun org-table-get-vertical-vector (desc &optional tbeg col)
"Get a calc vector from a column, accorting to desctiptor DESC.
"Get a calc vector from a column, accorting to desctiptor DESC.
Optional arguments TBEG and COL can give the beginning of the table and
the current column, to avoid unnecessary parsing."
(save-excursion
......@@ -7086,7 +7090,7 @@ the current column, to avoid unnecessary parsing."
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))))))))
......@@ -7182,7 +7186,7 @@ the current column, to avoid unnecessary parsing."
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)
......@@ -7261,7 +7265,7 @@ expected, for the other action only a single column number is needed."
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)))
......@@ -7661,7 +7665,7 @@ Parameters get priority."
(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")
......@@ -7699,7 +7703,7 @@ Parameters get priority."
(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))
......@@ -7754,7 +7758,7 @@ With prefix ARG, apply the new formulas to the table."
(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."))))
......@@ -8700,7 +8704,7 @@ this line is also exported in fixed-width font."
(if (looking-at outline-regexp)
(progn
(goto-char (match-end 0))
(insert " " org-quote-string))))))))
(insert " " org-quote-string))))))))
(defun org-export-as-html-and-open (arg)
"Export the outline as HTML and immediately open it with a browser.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment