From f24ef5c57743555cbb147210511fddb0bb5dd732 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 13 Nov 2009 07:09:47 +0100 Subject: [PATCH] Keep byte compiler happy --- ORGWEBPAGE/index.org | 1 + lisp/org-colview.el | 1 + lisp/org-exp.el | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index 12cf53456..46a734076 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -93,6 +93,7 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O #+ATTR_HTML: style="float:right;" [[http://mobileorg.ncogni.to/][http://mobileorg.ncogni.to/images/screenshot-browse.png]] +- <2009-11-13 Fri>: Release 6.33 - <2009-11-03 Tue>: iPhone App [[http://mobileorg.ncogni.to/][MobileOrg]] available in the AppStore - <2009-10-26 Mon>: Release 6.32 - <2009-09-30 Wed>: Release 6.31 diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 096db55f4..41b4c05d8 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -34,6 +34,7 @@ (require 'org) (declare-function org-agenda-redo "org-agenda" ()) +(declare-function org-agenda-show "org-agenda" (&optional full-entry)) ;;; Column View diff --git a/lisp/org-exp.el b/lisp/org-exp.el index cd183fb7c..2ff43ccef 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1535,6 +1535,15 @@ the current file." (unless desc (insert "][" link)) (add-text-properties pos (point) props)))))) +(defvar org-export-format-drawer-function nil + "Function to be called to format the contents of a drawer. +The function must accept three parameters: + BACKEND one of the symbols html, docbook, latex, ascii, xoxo + NAME the drawer name, like \"PROPERTIES\" + CONTENT the content of the drawer. +The function should return the text to be inserted into the buffer. +If this is nil, `org-export-format-drawer' is used as a default.") + (defun org-export-remove-or-extract-drawers (all-drawers exp-drawers backend) "Remove drawers, or extract and format the content. ALL-DRAWERS is a list of all drawer names valid in the current buffer. @@ -1546,7 +1555,7 @@ BACKEND is the current export backend." (let ((re (concat "^[ \t]*:\\(" (mapconcat 'identity all-drawers "\\|") "\\):[ \t]*$")) - name beg beg-content eol) + name beg beg-content eol content) (while (re-search-forward re nil t) (org-if-unprotected (setq name (match-string 1)) @@ -1568,21 +1577,12 @@ BACKEND is the current export backend." name content backend)) (insert content))))))) -(defvar org-export-format-drawer-function nil - "Function to be called to format the contents of a drawer. -The function must accept three parameters: - BACKEND one of the symbols html, docbook, latex, ascii, xoxo - NAME the drawer name, like \"PROPERTIES\" - CONTENT the content of the drawer. -The function should return the text to be inserted into the buffer. -If this is nil, `org-export-format-drawer' is used as a default.") - (defun org-export-format-drawer (name content backend) "Format the content of a drawer as a colon example." (if (string-match "[ \t]+\\'" content) (setq content (substring content (match-beginning 0)))) (while (string-match "\\`[ \t]*\n" content) - (steq content (substring content (match-end 0)))) + (setq content (substring content (match-end 0)))) (setq content (org-remove-indentation content)) (setq content (concat ": " (mapconcat 'identity (org-split-string content "\n")