diff options
| author | Achim Gratz <Stromeko@Stromeko.DE> | 2014-05-03 10:15:42 +0200 |
|---|---|---|
| committer | Achim Gratz <Stromeko@Stromeko.DE> | 2014-05-03 10:15:42 +0200 |
| commit | e8e8f6738a8284c63c648928419a6d1d69b3e348 (patch) | |
| tree | 4bb3cd4ca49fff41a7996dd2d4ab7aebe07b2ff7 | |
| parent | 9efbfb34cb29ca3168f2677ef6d41cfdd4477f3e (diff) | |
| parent | 063c8b03b733371ebae473225e0526c905264b4e (diff) | |
| download | org-mode-e8e8f6738a8284c63c648928419a6d1d69b3e348.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-tangle.el | 13 | ||||
| -rw-r--r-- | lisp/org-agenda.el | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index be7e9a6..2bb7e2d 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -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))) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ea6c912..576d5b9 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -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) |