diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-03-20 13:06:26 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-03-20 13:06:26 +0100 |
| commit | 44bf4de900f4e0d2c8e9ed392db05d2d55ae2d16 (patch) | |
| tree | 4b9000e106f0cb456c35560ee5ded82ae7e68b6b | |
| parent | 05ca3731f2352153bd2e83f52e23fac8201fc879 (diff) | |
| parent | fc717f3eb70072e44a07ac9cb22ad6c052cc8bd2 (diff) | |
| download | org-mode-44bf4de900f4e0d2c8e9ed392db05d2d55ae2d16.tar.gz | |
Merge branch 'hotfix-7.8.06'
Conflicts:
lisp/org-agenda.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-src.el | 2 |
4 files changed, 5 insertions, 1 deletions
@@ -82,6 +82,7 @@ (declare-function org-list-struct "org-list" ()) (declare-function org-list-prevs-alist "org-list" (struct)) (declare-function org-list-get-list-end "org-list" (item struct prevs)) +(declare-function org-strip-protective-commas "org" (beg end)) (defgroup org-babel nil "Code block evaluation and management in `org-mode' documents." diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 1b033e8..399dfd0 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6211,9 +6211,9 @@ When this is the global TODO list, a prefix argument will be interpreted." (recenter window-line))) (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 3be853e..bb67836 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -59,6 +59,7 @@ (declare-function org-trim "org" (s)) (declare-function org-skip-whitespace "org" ()) (declare-function outline-next-heading "outline") +(declare-function org-skip-whitespace "org" ()) (defvar org-outline-regexp-bol) ; defined in org.el (defvar org-odd-levels-only) ; defined in org.el diff --git a/lisp/org-src.el b/lisp/org-src.el index 37985b6..b765040 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -44,6 +44,8 @@ (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)) +(declare-function org-strip-protective-commas "org" (beg end)) +(declare-function org-base-buffer "org" (buffer)) (defcustom org-edit-src-region-extra nil "Additional regexps to identify regions for editing with `org-edit-src-code'. |