diff options
| author | Eric Schulte <eric.schulte@gmx.com> | 2012-03-14 09:56:52 -0400 |
|---|---|---|
| committer | Eric Schulte <eric.schulte@gmx.com> | 2012-03-14 09:56:52 -0400 |
| commit | 07ac15ef72c1a52fccc6e4218a64e2bc63291693 (patch) | |
| tree | 15555e9577a64675dad4b53458c106a6acb654b6 | |
| parent | 1dd3180480d9cc30f2002409759999c090ff654a (diff) | |
| parent | 4542824f2c746baad9f19340c46204a9ec1b00f9 (diff) | |
| download | org-mode-07ac15ef72c1a52fccc6e4218a64e2bc63291693.tar.gz | |
Merge branch 'origin-maint'
Conflicts:
lisp/org-src.el
| -rw-r--r-- | lisp/ob.el | 1 | ||||
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org-footnote.el | 1 | ||||
| -rw-r--r-- | lisp/org-mobile.el | 2 | ||||
| -rw-r--r-- | lisp/org-src.el | 3 |
5 files changed, 7 insertions, 2 deletions
@@ -59,6 +59,7 @@ (declare-function org-cycle "org" (&optional arg)) (declare-function org-uniquify "org" (list)) (declare-function org-current-level "org" ()) +(declare-function org-strip-protective-commas "org" (beg end)) (declare-function org-table-import "org-table" (file arg)) (declare-function org-add-hook "org-compat" (hook function &optional append local)) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 5152f05..4dac97a 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6213,7 +6213,7 @@ When this is the global TODO list, a prefix argument will be interpreted." (defvar org-global-tags-completion-table nil) (defvar org-agenda-filtered-by-category nil) (defvar org-agenda-filter-form nil) - +(defvar org-agenda-filtered-by-category nil) (defun org-agenda-filter-by-category (strip) "Keep only those lines in the agenda buffer that have a specific category. The category is that of the current line." diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 196dd99..3be853e 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -57,6 +57,7 @@ (declare-function org-mark-ring-push "org" (&optional pos buffer)) (declare-function org-show-context "org" (&optional key)) (declare-function org-trim "org" (s)) +(declare-function org-skip-whitespace "org" ()) (declare-function outline-next-heading "outline") (defvar org-outline-regexp-bol) ; defined in org.el diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index 3bd9a7c..48253f7 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -300,6 +300,8 @@ Also exclude files matching `org-mobile-files-exclude-regexp'." (push (cons file link-name) rtn))) (nreverse rtn))) +(defvar org-agenda-filter) + ;;;###autoload (defun org-mobile-push () "Push the current state of Org affairs to the WebDAV directory. diff --git a/lisp/org-src.el b/lisp/org-src.el index 9cd56d2..88217cd 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -41,7 +41,8 @@ (declare-function org-at-table.el-p "org" ()) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-switch-to-buffer-other-window "org" (&rest args)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-strip-protective-commas "org" (beg end)) +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defcustom org-edit-src-region-extra nil |