From a52fcbf9882c3e61e1c786e11cfe01878b456e65 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 2 May 2014 15:30:46 +0200 Subject: [PATCH 1/2] org-agenda.el: Fix some type strings * org-agenda.el (org-agenda-max-todos, org-agenda-max-tags) (org-agenda-max-effort): Fix type strings. --- lisp/org-agenda.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index c0c87530c..fe3220259 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2604,7 +2604,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) @@ -2612,7 +2612,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. @@ -2623,7 +2623,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) @@ -2631,7 +2631,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. @@ -2642,7 +2642,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) @@ -2650,7 +2650,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) From 063c8b03b733371ebae473225e0526c905264b4e Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 3 May 2014 10:12:10 +0200 Subject: [PATCH 2/2] ob-tangle: do not run make-directory with nil argument * lisp/ob-tangle.el (org-babel-tangle): When `file-name-directory' returns nil, do not run make-directory. Remove superfluous when clauses by using short-circuiting `and' instead. Thanks to R. Michael Weylandt for reporting the problem and offering a patch. http://permalink.gmane.org/gmane.emacs.orgmode/85749 http://permalink.gmane.org/gmane.emacs.orgmode/85774 --- lisp/ob-tangle.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 37b2d92a8..3a43b42e3 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -225,13 +225,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)))