From c6b5e0daafb2f6e43ba936a85969b134037ff912 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 12 Jan 2013 08:55:07 +0100 Subject: [PATCH 1/3] Revert "org.el ("org-loaddefs.el"): use `load', not `org-load-noerror-mustsuffix'" This reverts commit db7ece9fa2e27944d9482961af9bfd9d08bb3b51. --- lisp/org.el | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 1c2ee9a..e979b35 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -78,11 +78,12 @@ (defvar org-table-formula-constants-local nil (require 'find-func) (require 'format-spec) -(load "org-loaddefs.el" t t t) - (require 'org-macs) (require 'org-compat) +(let ((load-suffixes (list ".el"))) + (org-load-noerror-mustsuffix "org-loaddefs")) + ;; `org-outline-regexp' ought to be a defconst but is let-binding in ;; some places -- e.g. see the macro org-with-limited-levels. ;; @@ -16901,27 +16902,6 @@ (defun org-date-from-calendar () (org-insert-time-stamp (encode-time 0 0 0 (nth 1 cal-date) (car cal-date) (nth 2 cal-date)))))) -(defcustom org-effort-durations - `(("h" . 60) - ("d" . ,(* 60 8)) - ("w" . ,(* 60 8 5)) - ("m" . ,(* 60 8 5 4)) - ("y" . ,(* 60 8 5 40))) - "Conversion factor to minutes for an effort modifier. - -Each entry has the form (MODIFIER . MINUTES). - -In an effort string, a number followed by MODIFIER is multiplied -by the specified number of MINUTES to obtain an effort in -minutes. - -For example, if the value of this variable is ((\"hours\" . 60)), then an -effort string \"2hours\" is equivalent to 120 minutes." - :group 'org-agenda - :version "24.1" - :type '(alist :key-type (string :tag "Modifier") - :value-type (number :tag "Minutes"))) - (defun org-minutes-to-clocksum-string (m) "Format number of minutes as a clocksum string. The format is determined by `org-time-clocksum-format', @@ -17031,6 +17011,27 @@ (defun org-hh:mm-string-to-minutes (s) (string-to-number (match-string 1 s))) (t 0))) +(defcustom org-effort-durations + `(("h" . 60) + ("d" . ,(* 60 8)) + ("w" . ,(* 60 8 5)) + ("m" . ,(* 60 8 5 4)) + ("y" . ,(* 60 8 5 40))) + "Conversion factor to minutes for an effort modifier. + +Each entry has the form (MODIFIER . MINUTES). + +In an effort string, a number followed by MODIFIER is multiplied +by the specified number of MINUTES to obtain an effort in +minutes. + +For example, if the value of this variable is ((\"hours\" . 60)), then an +effort string \"2hours\" is equivalent to 120 minutes." + :group 'org-agenda + :version "24.1" + :type '(alist :key-type (string :tag "Modifier") + :value-type (number :tag "Minutes"))) + (defcustom org-image-actual-width t "Should we use the actual width of images when inlining them? -- 1.8.1