Browse Source

Merge branch 'maint'

Bastien Guerry 13 years ago
parent
commit
2d40aca20c
2 changed files with 3 additions and 0 deletions
  1. 2 0
      lisp/org-agenda.el
  2. 1 0
      lisp/org.el

+ 2 - 0
lisp/org-agenda.el

@@ -1852,6 +1852,8 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
 
 
 ;;; Multiple agenda buffers support
+
+;;;###autoload
 (defun org-toggle-sticky-agenda (&optional arg)
   "Toggle `org-agenda-sticky'."
   (interactive "P")

+ 1 - 0
lisp/org.el

@@ -21009,6 +21009,7 @@ hierarchy of headlines by UP levels before marking the subtree."
 		    (regexp . "^#\\+[A-Z_]+:\\(\\s-*\\)\\S-+")
 		    (modes . '(org-mode))))))
 
+(defvar org-element-paragraph-separate) ; org-element.el
 (defun org-fill-paragraph-separate-nobreak-p ()
   "Non-nil when a line break at point would insert a new item."
   (looking-at (substring org-element-paragraph-separate 1)))