[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el

[Carsten Dominik]

Index: emacs/lisp/textmodes/org.el
diff -c emacs/lisp/textmodes/org.el:1.44 emacs/lisp/textmodes/org.el:1.45
*** emacs/lisp/textmodes/org.el:1.44    Mon Oct 24 19:37:30 2005
--- emacs/lisp/textmodes/org.el Fri Nov  4 09:25:17 2005
***************
*** 5,11 ****
  ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
  ;; Keywords: outlines, hypermedia, calendar
  ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
! ;; Version: 3.18
  ;;
  ;; This file is part of GNU Emacs.
  ;;
--- 5,11 ----
  ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
  ;; Keywords: outlines, hypermedia, calendar
  ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
! ;; Version: 3.19
  ;;
  ;; This file is part of GNU Emacs.
  ;;
***************
*** 80,85 ****
--- 80,88 ----
  ;;
  ;; Changes:
  ;; -------
+ ;; Version 3.19
+ ;;    - Bug fixes
+ ;;
  ;; Version 3.18
  ;;    - Export of calendar information in the standard iCalendar format.
  ;;    - Some bug fixes.
***************
*** 217,223 ****
  
  ;;; Customization variables
  
! (defvar org-version "3.18"
    "The version number of the file org.el.")
  (defun org-version ()
    (interactive)
--- 220,226 ----
  
  ;;; Customization variables
  
! (defvar org-version "3.19"
    "The version number of the file org.el.")
  (defun org-version ()
    (interactive)
***************
*** 781,787 ****
  (defcustom org-level-color-stars-only nil
    "Non-nil means fontify only the stars in each headline.
  When nil, the entire headline is fontified.
! After changing this, requires restart of Emacs to become effective."
    :group 'org-structure
    :type 'boolean)
  
--- 784,790 ----
  (defcustom org-level-color-stars-only nil
    "Non-nil means fontify only the stars in each headline.
  When nil, the entire headline is fontified.
! After changin this, requires restart of Emacs to become effective."
    :group 'org-structure
    :type 'boolean)
  
***************
*** 2865,2871 ****
             (message "Making completion list...")
             (let ((list (sort (all-completions pattern table) 'string<)))
               (with-output-to-temp-buffer "*Completions*"
!                (display-completion-list list pattern)))
             (message "Making completion list...%s" "done"))))))
  
  ;;; Comments, TODO and DEADLINE
--- 2868,2874 ----
             (message "Making completion list...")
             (let ((list (sort (all-completions pattern table) 'string<)))
               (with-output-to-temp-buffer "*Completions*"
!                (display-completion-list list)))
             (message "Making completion list...%s" "done"))))))
  
  ;;; Comments, TODO and DEADLINE
***************
*** 3189,3194 ****
--- 3192,3199 ----
                (mapcar (lambda(x) (or x 0))  ;; FIXME: Problem with timezone?
                        (parse-time-string (match-string 1))))
             (current-time)))
+        (calendar-move-hook nil)
+        (view-diary-entries-initially nil)
         (timestr (format-time-string
                   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
         (prompt (format "YYYY-MM-DD [%s]: " timestr))
***************
*** 3200,3207 ****
        ;; Copied (with modifications) from planner.el by John Wiegley
        (save-excursion
          (save-window-excursion
!           (let ((view-diary-entries-initially nil))
!             (calendar))
            (calendar-forward-day (- (time-to-days default-time)
                                     (calendar-absolute-from-gregorian
                                      (calendar-current-date))))
--- 3205,3211 ----
        ;; Copied (with modifications) from planner.el by John Wiegley
        (save-excursion
          (save-window-excursion
!           (calendar)
            (calendar-forward-day (- (time-to-days default-time)
                                     (calendar-absolute-from-gregorian
                                      (calendar-current-date))))
***************
*** 3524,3530 ****
  (defun org-recenter-calendar (date)
    "If the calendar is visible, recenter it to DATE."
    (let* ((win (selected-window))
!        (cwin (get-buffer-window "*Calendar*" t)))
      (when cwin
        (select-window cwin)
        (calendar-goto-date (if (listp date) date
--- 3528,3535 ----
  (defun org-recenter-calendar (date)
    "If the calendar is visible, recenter it to DATE."
    (let* ((win (selected-window))
!        (cwin (get-buffer-window "*Calendar*" t))
!        (calendar-move-hook nil))
      (when cwin
        (select-window cwin)
        (calendar-goto-date (if (listp date) date
***************
*** 3536,3542 ****
  If there is a time stamp in the current line, go to that date.
  A prefix ARG can be used force the current date."
    (interactive "P")
!   (let ((tsr org-ts-regexp) diff)
      (if (or (org-at-timestamp-p)
            (save-excursion
              (beginning-of-line 1)
--- 3541,3549 ----
  If there is a time stamp in the current line, go to that date.
  A prefix ARG can be used force the current date."
    (interactive "P")
!   (let ((tsr org-ts-regexp) diff
!       (calendar-move-hook nil)
!       (view-diary-entries-initially nil))
      (if (or (org-at-timestamp-p)
            (save-excursion
              (beginning-of-line 1)
***************
*** 3545,3552 ****
              (d2 (time-to-days
                   (org-time-string-to-time (match-string 1)))))
          (setq diff (- d2 d1))))
!     (let ((view-diary-entries-initially nil))
!       (calendar))
      (calendar-goto-today)
      (if (and diff (not arg)) (calendar-forward-day diff))))
  
--- 3552,3558 ----
              (d2 (time-to-days
                   (org-time-string-to-time (match-string 1)))))
          (setq diff (- d2 d1))))
!     (calendar)
      (calendar-goto-today)
      (if (and diff (not arg)) (calendar-forward-day diff))))
  
***************
*** 5248,5256 ****
    (interactive)
    (let* ((day (or (get-text-property (point) 'day)
                  (error "Don't know which date to open in calendar")))
!        (date (calendar-gregorian-from-absolute day)))
!     (let ((view-diary-entries-initially nil))
!       (calendar))
      (calendar-goto-date date)))
  
  (defun org-calendar-goto-agenda ()
--- 5254,5263 ----
    (interactive)
    (let* ((day (or (get-text-property (point) 'day)
                  (error "Don't know which date to open in calendar")))
!        (date (calendar-gregorian-from-absolute day))
!        (calendar-move-hook nil)
!        (view-diary-entries-initially nil))
!     (calendar)
      (calendar-goto-date date)))
  
  (defun org-calendar-goto-agenda ()
***************
*** 9574,9586 ****
    (let ((user user-full-name)
        (calname "something")
        (name (or name "unknown"))
!       (timezone "Europe/Amsterdam")) ;; FIXME:  How to get the real timezone?
      (princ
       (format "BEGIN:VCALENDAR
  VERSION:2.0
  X-WR-CALNAME:%s
  PRODID:-//%s//Emacs with Org-mode//EN
! X-WR-TIMEZONE:Europe/%s
  CALSCALE:GREGORIAN\n" name user timezone))))
  
  (defun org-finish-icalendar-file ()
--- 9581,9593 ----
    (let ((user user-full-name)
        (calname "something")
        (name (or name "unknown"))
!       (timezone "FIXME"))
      (princ
       (format "BEGIN:VCALENDAR
  VERSION:2.0
  X-WR-CALNAME:%s
  PRODID:-//%s//Emacs with Org-mode//EN
! X-WR-TIMEZONE:Europe/Amsterdam
  CALSCALE:GREGORIAN\n" name user timezone))))
  
  (defun org-finish-icalendar-file ()