[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/org.el
diff -c emacs/lisp/textmodes/org.el:1.34 emacs/lisp/textmodes/org.el:1.35
*** emacs/lisp/textmodes/org.el:1.34    Tue Aug 30 12:06:14 2005
--- emacs/lisp/textmodes/org.el Wed Aug 31 10:28:38 2005
***************
*** 193,198 ****
--- 193,202 ----
  (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,1961 ****
          ;; (3 'underline))
  ;       (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
  ;             '(1 'org-warning t))
!         (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string 
                        "\\|" org-quote-string "\\)\\>")
                '(1 'org-special-keyword t))
          '("^#.*" (0 'font-lock-comment-face t))
--- 1959,1965 ----
          ;; (3 'underline))
  ;       (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
  ;             '(1 'org-warning t))
!         (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string
                        "\\|" org-quote-string "\\)\\>")
                '(1 'org-special-keyword t))
          '("^#.*" (0 'font-lock-comment-face t))
***************
*** 7036,7042 ****
       (t n))))
  
  (defun org-table-get-vertical-vector (desc &optional tbeg col)
!   "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
--- 7040,7046 ----
       (t n))))
  
  (defun org-table-get-vertical-vector (desc &optional tbeg col)
!   "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,7092 ****
                     l ",") "]"))
         ((string-match "\\([0-9]+\\)" desc)
        (beginning-of-line 1)
!       (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))))))))
--- 7090,7096 ----
                     l ",") "]"))
         ((string-match "\\([0-9]+\\)" desc)
        (beginning-of-line 1)
!       (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,7188 ****
  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 
                       (buffer-substring (point-at-bol) (point-at-eol))
                       "|")))
        col col1 col2 scol si sc1 sc2)
--- 7186,7192 ----
  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
                       (buffer-substring (point-at-bol) (point-at-eol))
                       "|")))
        col col1 col2 scol si sc1 sc2)
***************
*** 7261,7267 ****
              fields (org-split-string (match-string 2) " *| *"))
        (save-excursion
          (beginning-of-line (if (equal c "_") 2 0))
!         (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)))
--- 7265,7271 ----
              fields (org-split-string (match-string 2) " *| *"))
        (save-excursion
          (beginning-of-line (if (equal c "_") 2 0))
!         (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,7667 ****
      (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'. 
  # 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")
--- 7665,7671 ----
      (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'.
  # 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,7705 ****
        (switch-to-buffer-other-window (marker-buffer pos))
        (goto-char pos)
        (goto-char (org-table-begin))
!       (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") 
                             (org-table-end) t)
          (progn
            (goto-char (match-beginning 1))
--- 7703,7709 ----
        (switch-to-buffer-other-window (marker-buffer pos))
        (goto-char pos)
        (goto-char (org-table-begin))
!       (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|")
                             (org-table-end) t)
          (progn
            (goto-char (match-beginning 1))
***************
*** 7754,7760 ****
      (org-table-store-formulas eql)
      (move-marker pos nil)
      (kill-buffer "*Edit Formulas*")
!     (if arg 
        (org-table-recalculate 'all)
        (message "New formulas installed - press C-u C-c C-c to apply."))))
  
--- 7758,7764 ----
      (org-table-store-formulas eql)
      (move-marker pos nil)
      (kill-buffer "*Edit Formulas*")
!     (if arg
        (org-table-recalculate 'all)
        (message "New formulas installed - press C-u C-c C-c to apply."))))
  
***************
*** 8700,8706 ****
          (if (looking-at outline-regexp)
              (progn
                (goto-char (match-end 0))
!               (insert " " org-quote-string))))))))  
  
  (defun org-export-as-html-and-open (arg)
    "Export the outline as HTML and immediately open it with a browser.
--- 8704,8710 ----
          (if (looking-at outline-regexp)
              (progn
                (goto-char (match-end 0))
!               (insert " " org-quote-string))))))))
  
  (defun org-export-as-html-and-open (arg)
    "Export the outline as HTML and immediately open it with a browser.