Bug fixes after reports on the 5.20 release.

This commit is contained in:
Carsten Dominik 2008-02-07 10:28:38 +01:00
parent e88e88b2fa
commit 1baeff6216
3 changed files with 44 additions and 26 deletions

View File

@ -1,3 +1,15 @@
2008-02-07 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-version): With refix argument, insert `org-version'
at point.
(org-agenda-goto): Recenter the window after finding the target
location, to make sure the correct position will be displayed.
2008-02-06 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-agenda-get-deadlines): Allow
`org-deadline-warning-days' to be 0.
2008-02-05 Carsten Dominik <dominik@science.uva.nl> 2008-02-05 Carsten Dominik <dominik@science.uva.nl>
* org-publish.el (org-publish-timestamp-filename): Protect ":" in * org-publish.el (org-publish-timestamp-filename): Protect ":" in
@ -5,7 +17,7 @@
* org.el (org-update-checkbox-count): Revamped to deal with * org.el (org-update-checkbox-count): Revamped to deal with
hierarchical beckboxes. This was a patch from Miguel hierarchical beckboxes. This was a patch from Miguel
A. Figueroa-Villanueva. A. Figueroa-Villanueva.
2008-02-04 Carsten Dominik <dominik@science.uva.nl> 2008-02-04 Carsten Dominik <dominik@science.uva.nl>

View File

@ -3,7 +3,7 @@
This is the GIT repository for the development of Org-mode, an This is the GIT repository for the development of Org-mode, an
Emacs mode for organizing your life. Emacs mode for organizing your life.
This file explains the rules for participating in Org-mode The text below explains the rules for participating in Org-mode
development. development.
@ -16,24 +16,24 @@ development.
git clone git://repo.or.cz/org-mode.git git clone git://repo.or.cz/org-mode.git
Having a clone is sufficient to start hacking and to produce Having a clone is sufficient to start hacking and to produce
patches that can be easily and consistently be applied to the patches that can easily and consistently be applied to the
main repository. main repository.
2. People who are interested to participate in the Org-mode 2. People who are interested to participate in the Org-mode
development can do so by sending patches to development can do so by sending patches to
emacs-orgmode@gnu.org. emacs-orgmode@gnu.org.
3. Any interested developer can request push access to the 3. An interested developer can also request push access to the
repository by sending their repo.or.cz user information to the central repository by sending his/her user-info at repo.or.cz
maintainer of Org-mode. By requesting push access, you the maintainer of Org-mode. By requesting push access, you
acknowledge that you have read and agreed with the following acknowledge that you have read and agreed with the following
rules: rules:
- Org-mode is part of Emacs. Therefore we need to be very - Org-mode is part of Emacs. Therefore we need to be very
conscious that any changes moving into the Org-mode core are conscious about changes moving into the Org-mode core.
done only by people who have signed the appropriate papers These can originate only from people who have signed the
with the free software foundation. The files to which this appropriate papers with the free software foundation. The
applies are: files to which this applies are:
- all *.el files in the root directory of the repository - all *.el files in the root directory of the repository
- org.texi, orgcard.tex, and ChangeLog. - org.texi, orgcard.tex, and ChangeLog.
@ -41,18 +41,15 @@ development.
- Before making any significant changes, please explain and - Before making any significant changes, please explain and
discuss them on the mailing list emacs-orgmode@gnu.org. discuss them on the mailing list emacs-orgmode@gnu.org.
This does obviously not apply to people like Bastien Guerry, This does obviously not apply to people who are maintaining
David O'Toole, Piotr Zielinski, or anyone else who has their own contributions to Org-mode. Please, just use the
contributed and still maintains a file that is part of new mechanism to make sure all changes end up in the right
Org-mode. Please, just use the new mechanism to make sure place.
all changes end in the right place.
- Making and pushing a change to the Org-mode core requires - Creating and pushing a change to the Org-mode core requires
you also to provide ChangeLog entries. Just press `C-x 4 a' you also to provide ChangeLog entries. Just press `C-x 4 a'
in each function or variable you have modified and describe in each function or variable you have modified and describe
the change you made in the ChangeLog buffer/file. This is the change you made in the ChangeLog buffer/file.
important, because these entries will be required when
uploading any new version into the Emacs CVS tree.
- Among other things, Org-mode is widely appreciated because - Among other things, Org-mode is widely appreciated because
if its simplicity, cleanness and consistency. We should try if its simplicity, cleanness and consistency. We should try

23
org.el
View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp ;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; Version: 5.20 ;; Version: 5.20a
;; ;;
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;
@ -84,11 +84,17 @@
;;; Version ;;; Version
(defconst org-version "5.20" (defconst org-version "5.20a"
"The version number of the file org.el.") "The version number of the file org.el.")
(defun org-version ()
(interactive) (defun org-version (&optional here)
(message "Org-mode version %s" org-version)) "Show the org-mode version in the echo area.
With prefix arg HERE, insert it at point."
(interactive "P")
(let ((version (format "Org-mode version %s" org-version)))
(message version)
(if here
(insert version))))
;;; Compatibility constants ;;; Compatibility constants
(defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself (defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
@ -6997,6 +7003,7 @@ This will find all statistic cookies like [57%] and [6/12] and update them
with the current numbers. With optional prefix argument ALL, do this for with the current numbers. With optional prefix argument ALL, do this for
the whole buffer." the whole buffer."
(interactive "P") (interactive "P")
(debug)
(save-excursion (save-excursion
(let* ((buffer-invisibility-spec (org-inhibit-invisibility)) ; Emacs 21 (let* ((buffer-invisibility-spec (org-inhibit-invisibility)) ; Emacs 21
(beg (condition-case nil (beg (condition-case nil
@ -7050,6 +7057,7 @@ the whole buffer."
(org-end-of-item) (org-end-of-item)
(setq next-ind (org-get-indentation)) (setq next-ind (org-get-indentation))
))) )))
(goto-char continue-from)
;; update cookie ;; update cookie
(when end-cookie (when end-cookie
(delete-region beg-cookie end-cookie) (delete-region beg-cookie end-cookie)
@ -14016,7 +14024,7 @@ At the target location, the entry is filed as a subitem of the target heading.
Depending on `org-reverse-note-order', the new subitem will either be the Depending on `org-reverse-note-order', the new subitem will either be the
first of the last subitem. first of the last subitem.
With prefix are GOTO, the command will only visit the target location, With prefix arg GOTO, the command will only visit the target location,
not actually move anything. not actually move anything.
With a double prefix `C-c C-c', go to the location where the last refiling With a double prefix `C-c C-c', go to the location where the last refiling
operation has put the subtree. operation has put the subtree.
@ -21407,7 +21415,7 @@ the documentation of `org-diary'."
d2 (org-time-string-to-absolute (match-string 1) d1 'past) d2 (org-time-string-to-absolute (match-string 1) d1 'past)
diff (- d2 d1) diff (- d2 d1)
wdays (org-get-wdays s) wdays (org-get-wdays s)
dfrac (/ (* 1.0 (- wdays diff)) wdays) dfrac (/ (* 1.0 (- wdays diff)) (max wdays 1))
upcomingp (and todayp (> diff 0))) upcomingp (and todayp (> diff 0)))
;; When to show a deadline in the calendar: ;; When to show a deadline in the calendar:
;; If the expiration is within wdays warning time. ;; If the expiration is within wdays warning time.
@ -22352,6 +22360,7 @@ and by additional input from the age of a schedules or deadline entry."
(save-excursion (save-excursion
(and (outline-next-heading) (and (outline-next-heading)
(org-flag-heading nil)))) ; show the next heading (org-flag-heading nil)))) ; show the next heading
(recenter (/ (window-height) 2))
(run-hooks 'org-agenda-after-show-hook) (run-hooks 'org-agenda-after-show-hook)
(and highlight (org-highlight (point-at-bol) (point-at-eol))))) (and highlight (org-highlight (point-at-bol) (point-at-eol)))))