tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Achim Gratz 2014-05-03 10:15:42 +02:00
parent 9efbfb34cb 063c8b03b7
commit e8e8f6738a
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/ob-tangle.el
View file

@ -232,13 +232,14 @@ used to limit the exported source code blocks by language."
(concat base-name "." ext) base-name))))
(when file-name
;; Possibly create the parent directories for file.
(when (let ((m (funcall get-spec :mkdirp)))
(and m (not (string= m "no"))))
(make-directory (file-name-directory file-name) 'parents))
(let ((m (funcall get-spec :mkdirp))
(fnd (file-name-directory file-name)))
(and m fnd (not (string= m "no"))
(make-directory fnd 'parents)))
;; delete any old versions of file
(when (and (file-exists-p file-name)
(not (member file-name (mapcar #'car path-collector))))
(delete-file file-name))
(and (file-exists-p file-name)
(not (member file-name (mapcar #'car path-collector)))
(delete-file file-name))
;; drop source-block to file
(with-temp-buffer
(when (fboundp lang-f) (ignore-errors (funcall lang-f)))

12
lisp/org-agenda.el
View file

@ -2609,7 +2609,7 @@ type."
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
:type '(choice (symbol :tag "No limit" nil)
(integer :tag "Max number of entries")
(integer :tag "Max number of TODOs")
(repeat
(cons (choice :tag "Agenda type"
(const agenda)
@ -2617,7 +2617,7 @@ type."
(const tags)
(const search)
(const timeline))
(integer :tag "Max number of entries")))))
(integer :tag "Max number of TODOs")))))
(defcustom org-agenda-max-tags nil
"Maximum number of tagged entries to display in an agenda.
@ -2628,7 +2628,7 @@ type."
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
:type '(choice (symbol :tag "No limit" nil)
(integer :tag "Max number of entries")
(integer :tag "Max number of tagged entries")
(repeat
(cons (choice :tag "Agenda type"
(const agenda)
@ -2636,7 +2636,7 @@ type."
(const tags)
(const search)
(const timeline))
(integer :tag "Max number of entries")))))
(integer :tag "Max number of tagged entries")))))
(defcustom org-agenda-max-effort nil
"Maximum cumulated effort duration for the agenda.
@ -2647,7 +2647,7 @@ to limit entries to in this type."
:package-version '(Org . "8.0")
:group 'org-agenda-custom-commands
:type '(choice (symbol :tag "No limit" nil)
(integer :tag "Max number of entries")
(integer :tag "Max number of minutes")
(repeat
(cons (choice :tag "Agenda type"
(const agenda)
@ -2655,7 +2655,7 @@ to limit entries to in this type."
(const tags)
(const search)
(const timeline))
(integer :tag "Max number of entries")))))
(integer :tag "Max number of minutes")))))
(defvar org-keys nil)
(defvar org-match nil)