Release 5.06e
This commit is contained in:
parent
49a33577a2
commit
f0c766122d
10
org.el
10
org.el
|
@ -5,7 +5,7 @@
|
||||||
;; Author: Carsten Dominik <dominik at science dot uva dot nl>
|
;; Author: Carsten Dominik <dominik at science dot uva dot nl>
|
||||||
;; Keywords: outlines, hypermedia, calendar, wp
|
;; Keywords: outlines, hypermedia, calendar, wp
|
||||||
;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
|
;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
|
||||||
;; Version: 5.06d
|
;; Version: 5.06e
|
||||||
;;
|
;;
|
||||||
;; This file is part of GNU Emacs.
|
;; This file is part of GNU Emacs.
|
||||||
;;
|
;;
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
|
|
||||||
;;; Version
|
;;; Version
|
||||||
|
|
||||||
(defconst org-version "5.06d"
|
(defconst org-version "5.06e"
|
||||||
"The version number of the file org.el.")
|
"The version number of the file org.el.")
|
||||||
(defun org-version ()
|
(defun org-version ()
|
||||||
(interactive)
|
(interactive)
|
||||||
|
@ -18321,7 +18321,8 @@ the documentation of `org-diary'."
|
||||||
(point))))
|
(point))))
|
||||||
(setq donep (string-match org-looking-at-done-regexp head))
|
(setq donep (string-match org-looking-at-done-regexp head))
|
||||||
(if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
|
(if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
|
||||||
(setq timestr (concat (match-string 1 s) " "))
|
(setq timestr
|
||||||
|
(concat (substring s (match-beginning 1)) " "))
|
||||||
(setq timestr nil))
|
(setq timestr nil))
|
||||||
(if (and donep
|
(if (and donep
|
||||||
(or org-agenda-skip-deadline-if-done
|
(or org-agenda-skip-deadline-if-done
|
||||||
|
@ -18396,7 +18397,8 @@ FRACTION is what fraction of the head-warning time has passed."
|
||||||
(progn (skip-chars-forward "^\r\n") (point))))
|
(progn (skip-chars-forward "^\r\n") (point))))
|
||||||
(setq donep (string-match org-looking-at-done-regexp head))
|
(setq donep (string-match org-looking-at-done-regexp head))
|
||||||
(if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
|
(if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
|
||||||
(setq timestr (concat (match-string 1 s) " "))
|
(setq timestr
|
||||||
|
(concat (substring s (match-beginning 1)) " "))
|
||||||
(setq timestr nil))
|
(setq timestr nil))
|
||||||
(if (and donep
|
(if (and donep
|
||||||
(or org-agenda-skip-scheduled-if-done
|
(or org-agenda-skip-scheduled-if-done
|
||||||
|
|
Loading…
Reference in New Issue