ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-08-26 23:44:57 +02:00
parent 7f01035de0 3404ac84ec
commit 2d40aca20c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

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

1
lisp/org.el
View File

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