Release 6.02.

ORGWEBPAGE/Changes.org

@@ -10,55 +10,17 @@
 
 * Version 6.02
 
-** Details
-
-*** Search commands can now include archive files.
-
-    If the value of the customization variable
-    =org-agenda-text-search-extra-files= contains the symbol
-    =agenda-archives= as the first element in the list, all
-    archive files of all agenda files will be added to the list
-    of files to search.  This is relevant for the search view
-    =C-c a s=, as well as for the agenda files multi-occur
-    command =C-c a /=.
-
-*** Clock tables can include the archive files
-
-    There are new values for the =:scope= parameter of a clock
-    table.  This can now be =file-with-archives= and
-    =agenda-with-archives=, in order to collect information not
-    only from the current file or all agenda files, but also from
-    all archive files that are currently used by these files.
-
-*** New operators for property searches
-
-    Property searches can now choose a number of different
-    operators for comparing values.  These operators are `=',
-    `<>', `<', `<=', `>', and `>='.
-
-    When the search term uses the operator with plain number like
-    =+Effort>=2.7=, then the property value is converted to a
-    number and a numerical comparison takes place.
-
-    When the search term uses a string on the right hand side of
-    the operator, a string comparison is done: =+PRIORITY<"C".=
-
-    Finally, if the right hand side is enclosed in curly braces,
-    a regexp match is done: =aaa={regexp}=.  In this case you
-    should use only the `=' or `<>' operators, meaning "does
-    match" or "does not match", respectively.
-
-    This was a triggered with a request by Dan Davison.
+** Overview
 
-*** Orgtbl radio tables generalized.
+   - Column view (mostly) works now in XEmacs
+   - Summaries for columns in the agenda
+   - The special property Effort can be used for effort estimates
+   - New operators for property searches
+   - Search commands can now include archive files.
+   - Clock tables can include the archive files
+   - Orgtbl radio tables generalized.
 
-    The options available for radio tables using orgtbl-mode have
-    been expanded.  You may use several reception points and
-    formats for the same table, you may have special formatting
-    in the last line of the table,  and many table parameters may
-    be functions, so that more general transformations are
-    possible.  Jason Riedy provided a patch for this, and he will
-    hopefully come up with some examples.  Thanks!
+** Details
 
 *** Column view works now in XEmacs
 
@@ -98,6 +60,54 @@
     and also be summed over a day, in order to show the planned
     work load of a day.  See the manual for more details.
 
+*** New operators for property searches
+
+    Property searches can now choose a number of different
+    operators for comparing values.  These operators are `=',
+    `<>', `<', `<=', `>', and `>='.
+
+    When the search term uses the operator with plain number like
+    =+Effort>=2.7=, then the property value is converted to a
+    number and a numerical comparison takes place.
+
+    When the search term uses a string on the right hand side of
+    the operator, a string comparison is done: =+PRIORITY<"C".=
+
+    Finally, if the right hand side is enclosed in curly braces,
+    a regexp match is done: =aaa={regexp}=.  In this case you
+    should use only the `=' or `<>' operators, meaning "does
+    match" or "does not match", respectively.
+
+    This was a triggered with a request by Dan Davison.
+
+*** Search commands can now include archive files.
+
+    If the value of the customization variable
+    =org-agenda-text-search-extra-files= contains the symbol
+    =agenda-archives= as the first element in the list, all
+    archive files of all agenda files will be added to the list
+    of files to search.  This is relevant for the search view
+    =C-c a s=, as well as for the agenda files multi-occur
+    command =C-c a /=.
+
+*** Clock tables can include the archive files
+
+    There are new values for the =:scope= parameter of a clock
+    table.  This can now be =file-with-archives= and
+    =agenda-with-archives=, in order to collect information not
+    only from the current file or all agenda files, but also from
+    all archive files that are currently used by these files.
+
+*** Orgtbl radio tables generalized.
+
+    The options available for radio tables using orgtbl-mode have
+    been expanded.  You may use several reception points and
+    formats for the same table, you may have special formatting
+    in the last line of the table,  and many table parameters may
+    be functions, so that more general transformations are
+    possible.  Jason Riedy provided a patch for this, and he will
+    hopefully come up with some examples.  Thanks!
+
 * Version 6.01
 
 This is a new major release, mostly because of structural changes

ORGWEBPAGE/index.org

@@ -22,9 +22,9 @@ messages, BBDB entries, and any files related to the projects.  For
 printing and sharing of notes, an Org-mode file can be exported as a
 structured ASCII file, HTML, and LaTeX.
 
-* Current Version (6.01d) and Compatibility
+* Current Version (6.02) and Compatibility
 
-The current version is 6.01d.  To see what has changed in recent
+The current version is 6.02.  To see what has changed in recent
 releases, check this [[file:Changes.html][list of user-visible changes]].  These descriptions
 are extensive, to avoid that people will be printing the manual after
 each incremental release.  If you have an older version of the manual,
@@ -40,7 +40,7 @@ but may lag a bit behind the website release.
 
 **** Distribution
 
-Download as [[file:org-6.01d.zip][zip file]] or [[file:org-6.01d.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-6.02.zip][zip file]] or [[file:org-6.02.tar.gz][gzipped tar archive]].  These archives contain
 both the Lisp file org.el and the documentation in PDF and (TeX)Info
 formats.  A shell script to simplify upgrading to the newest release
 has been posted [[http://www.philfam.co.uk/pete/GTD/org-mode/update-org.sh][here]].

README_DIST

@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 6.02pre-06
+The version of this release is: 6.02
 
 The homepage of Org is at http://orgmode.org
 

doc/org.texi

@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.02pre-06
+@set VERSION 6.02
 @set DATE April 2008
 
 @dircategory Emacs
@@ -4724,7 +4724,7 @@ absolute path, it will be interpreted relative to @code{org-directory}.
 An optional sixth element specifies the contexts in which the user can
 select the template.  This element can be either a list of major modes
 or a function.  @code{org-remember} will first check whether the function
-returns @code{t} or if we are in any of the listed major mode, and select 
+returns @code{t} or if we are in any of the listed major mode, and select
 the template accordingly.
 
 So for example:
@@ -8927,8 +8927,7 @@ let me know.
 @item
 @i{Russel Adams} came up with the idea for drawers.
 @item
-@i{Thomas Baumann} contributed the code for links to the MH-E email
-system.
+@i{Thomas Baumann} wrote @file{org-bbdb.el} and @file{org-mhe.el}.
 @item
 @i{Alex Bochannek} provided a patch for rounding time stamps.
 @item
@@ -8967,8 +8966,8 @@ around a match in a hidden outline tree.
 @item
 @i{Niels Giesen} had the idea to automatically archive DONE trees.
 @item
-@i{Bastien Guerry} wrote the La@TeX{} exporter and has been prolific
-with patches, ideas, and bug reports.
+@i{Bastien Guerry} wrote the La@TeX{} exporter and @file{org-bibtex.el}, and
+has been prolific with patches, ideas, and bug reports.
 @item
 @i{Kai Grossjohann} pointed out key-binding conflicts with other packages.
 @item
@@ -8976,9 +8975,13 @@ with patches, ideas, and bug reports.
 task state change logging, and the clocktable.  His clear explanations have
 been critical when we started to adopt the GIT version control system.
 @item
+@i{Phil Jackson} wrote @file{org-irc.el}.
+@item
 @i{Scott Jaderholm} proposed footnotes, control over whitespace between
 folded entries, and column view for properties.
 @item
+@i{Tokuya Kameshima} wrote @file{org-wl.el} and @file{org-mew.el}.
+@item
 @i{Shidai Liu} ("Leo") asked for embedded La@TeX{} and tested it.  He also
 provided frequent feedback and some patches.
 @item
@@ -9059,12 +9062,13 @@ keyword.
 system.
 @item
 @i{John Wiegley} wrote @file{emacs-wiki.el} and @file{planner.el}.  The
-development of Org was fully independent, and both systems are
-really different beasts in their basic ideas and implementation details.
-I later looked at John's code, however, and learned from his
-implementation of (i) links where the link itself is hidden and only a
-description is shown, and (ii) popping up a calendar to select a date.
-John has also contributed a number of great ideas directly to Org.
+development of Org was fully independent, and both systems are really
+different beasts in their basic ideas and implementation details.  I later
+looked at John's code, however, and learned from his implementation of (i)
+links where the link itself is hidden and only a description is shown, and
+(ii) popping up a calendar to select a date.  John has also contributed a
+number of great ideas and patches directly to Org, including the file
+@code{org-mac-message.el}'
 @item
 @i{Carsten Wimmer} suggested some changes and helped fix a bug in
 linking to Gnus.

doc/orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.02pre-06}
+\def\orgversionnumber{6.02}
 \def\versionyear{2008}          % latest update
 \def\year{2008}                 % latest copyright year
 

lisp/org-agenda.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -3964,7 +3964,7 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
 	 (not (eq org-agenda-window-setup 'other-frame))
 	 org-pre-agenda-window-conf
 	 (set-window-configuration org-pre-agenda-window-conf))))
-  
+
 (defun org-agenda-exit ()
   "Exit agenda by removing the window or the buffer.
 Also kill all Org-mode buffers which have been loaded by `org-agenda'.

lisp/org-archive.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -123,7 +123,7 @@ archive file is."
     (save-excursion
       (save-restriction
 	(goto-char (point-min))
-	(while (re-search-forward 
+	(while (re-search-forward
 		"^\\(#\\+\\|[ \t]*:\\)ARCHIVE:[ \t]+\\(.*\\)"
 		nil t)
 	  (setq file (org-extract-archive-file
@@ -139,7 +139,7 @@ archive file is."
 (defun org-extract-archive-file (&optional location)
   (setq location (or location org-archive-location))
   (if (string-match "\\(.*\\)::\\(.*\\)" location)
-      (expand-file-name 
+      (expand-file-name
        (format (match-string 1 location) buffer-file-name))))
 
 (defun org-extract-archive-heading (&optional location)
@@ -262,7 +262,7 @@ this heading."
 	    (goto-char (point-max)) (insert "\n"))
 	  ;; Paste
 	  (org-paste-subtree (org-get-valid-level level 1))
-	  
+
 	  ;; Mark the entry as done
 	  (when (and org-archive-mark-done
 		     (looking-at org-todo-line-regexp)
@@ -272,7 +272,7 @@ this heading."
 	      (org-todo
 	       (car (or (member org-archive-mark-done org-done-keywords)
 			org-done-keywords)))))
-	  
+
 	  ;; Add the context info
 	  (when org-archive-save-context-info
 	    (let ((l org-archive-save-context-info) e n v)
@@ -281,7 +281,7 @@ this heading."
 			   (stringp v) (string-match "\\S-" v))
 		  (setq n (concat "ARCHIVE_" (upcase (symbol-name e))))
 		  (org-entry-put (point) n v)))))
-	  
+
 	  ;; Save and kill the buffer, if it is not the same buffer.
 	  (if (not (eq this-buffer buffer))
 	      (progn (save-buffer) (kill-buffer buffer)))))
@@ -335,7 +335,7 @@ sibling does not exist, it will be created at the end of the subtree."
 	(org-cut-subtree))
       (org-paste-subtree (org-get-valid-level level 1))
       (org-set-property
-       "ARCHIVE_TIME" 
+       "ARCHIVE_TIME"
        (format-time-string
 	(substring (cdr org-time-stamp-formats) 1 -1)
 	(current-time)))

lisp/org-bbdb.el

@@ -6,7 +6,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -39,7 +39,7 @@
 ;; into the org-agenda.  If you already include the `diary' into the
 ;; agenda, you might want to prefer to include the anniversaries in
 ;; the diary using bbdb-anniv.el.
-;; 
+;;
 ;; Put the following in /somewhere/at/home/diary.org and make sure
 ;; that this file is in `org-agenda-files`
 ;;
@@ -249,7 +249,7 @@ Argument STR is the anniversary field in BBDB."
           (setq split (org-bbdb-anniv-split (pop annivs)))
           (multiple-value-bind (m d y)
               (funcall org-bbdb-extract-date-fun (car split))
-            
+
             (when (and (or (setq date (assoc (cons m d) dates))
                            (and (= d 29)
                                 (= m 2)
@@ -274,7 +274,7 @@ Argument STR is the anniversary field in BBDB."
               )))))
     (when text
       (mapconcat 'identity text "; "))))
-  
+
 (provide 'org-bbdb)
 
 ;;; org-bbdb.el ends here

lisp/org-bibtex.el

@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -42,16 +42,16 @@
 ;; :title         :year           :series      :address
 ;; :booktitle     :month          :annote      :abstract
 ;; :key           :btype
-;; 
+;;
 ;; Here is an example of a remember template that use some of this
 ;; information (:author :year :title :journal :pages):
-;; 
-;; (setq org-remember-templates 
+;;
+;; (setq org-remember-templates
 ;;   '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n   \
 ;;          In %:journal, %:pages.")))
-;; 
+;;
 ;; Let's say you want to remember this BibTeX entry:
-;; 
+;;
 ;; @Article{dolev83,
 ;;   author = 	 {Danny Dolev and Andrew C. Yao},
 ;;   title = 	 {On the security of public-key protocols},
@@ -62,22 +62,22 @@
 ;;   pages =	 {198--208},
 ;;   month =	 {Mars}
 ;; }
-;; 
+;;
 ;; M-x `org-remember' on this entry will produce this buffer:
-;; 
+;;
 ;; =====================================================================
 ;; * READ <== [point here]
-;; 
+;;
 ;; [[file:/file.bib::dolev83][Dolev & Yao 1983: security of public key protocols]]
-;; 
+;;
 ;; Danny Dolev and Andrew C. Yao (1983): On the security of public-key protocols
 ;; In IEEE Transaction on Information Theory, 198--208.
 ;; =====================================================================
 ;;
 ;;; History:
-;; 
+;;
 ;; The link creation part has been part of Org-mode for a long time.
-;; 
+;;
 ;; Creating better remember template information was inspired by a request
 ;; of Austin Frank: http://article.gmane.org/gmane.emacs.orgmode/4112
 ;; and then imlemented by Bastien Guerry.

lisp/org-clock.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-colview-xemacs.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -39,7 +39,7 @@
 (when (featurep 'xemacs)
 
   (defface org-columns-level-1;; font-lock-function-name-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-1
       '((((class color) (min-colors 88) (background light)) (:foreground "Blue1" :background "grey90"))
         (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue" :background "grey30"))
@@ -49,9 +49,9 @@
         (t (:bold t))))
     "Face used for columns-level 1 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-2;; font-lock-variable-name-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-2
       '((((class color) (min-colors 16) (background light)) (:foreground "DarkGoldenrod" :background "grey90"))
         (((class color) (min-colors 16) (background dark))  (:foreground "LightGoldenrod" :background "grey30"))
@@ -60,9 +60,9 @@
         (t (:bold t))))
     "Face used for columns-level 2 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-3;; font-lock-keyword-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-3
       '((((class color) (min-colors 88) (background light)) (:foreground "Purple" :background "grey90"))
         (((class color) (min-colors 88) (background dark))  (:foreground "Cyan1" :background "grey30"))
@@ -73,9 +73,9 @@
         (t (:bold t))))
     "Face used for columns-level 3 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-4;; font-lock-comment-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-4
       '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick" :background "grey90"))
         (((class color) (min-colors 88) (background dark))  (:foreground "chocolate1" :background "grey30"))
@@ -86,27 +86,27 @@
         (t (:bold t))))
     "Face used for columns-level 4 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-5;; font-lock-type-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-5
       '((((class color) (min-colors 16) (background light)) (:foreground "ForestGreen" :background "grey90"))
         (((class color) (min-colors 16) (background dark)) (:foreground "PaleGreen" :background "grey30"))
         (((class color) (min-colors 8)) (:foreground "green"))))
     "Face used for columns-level 5 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-6;; font-lock-constant-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-6
       '((((class color) (min-colors 16) (background light)) (:foreground "CadetBlue" :background "grey90"))
         (((class color) (min-colors 16) (background dark)) (:foreground "Aquamarine" :background "grey30"))
         (((class color) (min-colors 8)) (:foreground "magenta"))))
     "Face used for columns-level 6 headlines."
     :group 'org-faces)
-    
+
   (defface org-columns-level-7;; font-lock-builtin-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-7
       '((((class color) (min-colors 16) (background light)) (:foreground "Orchid" :background "grey90"))
         (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue" :background "grey30"))
@@ -115,17 +115,17 @@
     :group 'org-faces)
 
   (defface org-columns-level-8;; font-lock-string-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-8
       '((((class color) (min-colors 16) (background light)) (:foreground "RosyBrown" :background "grey90"))
         (((class color) (min-colors 16) (background dark)) (:foreground "LightSalmon" :background "grey30"))
         (((class color) (min-colors 8)) (:foreground "green"))))
     "Face used for columns-level 8 headlines."
     :group 'org-faces)
-    
+
 
   (defface org-columns-space;; font-lock-function-name-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-1
       '((((class color) (min-colors 88) (background light)) (:background "grey90"))
         (((class color) (min-colors 88) (background dark))  (:background "grey30"))
@@ -136,7 +136,7 @@
     :group 'org-faces)
 
   (defface org-columns-space1;; font-lock-function-name-face
-    (org-compatible-face 
+    (org-compatible-face
         'outline-1
       '((((class color) (min-colors 88) (background light)) (:background "grey90"))
         (((class color) (min-colors 88) (background dark))  (:background "grey30"))
@@ -149,8 +149,8 @@
 
 (when (featurep 'xemacs)
   (defconst org-columns-level-faces
-    '(org-columns-level-1 
-      org-columns-level-2 org-columns-level-3 
+    '(org-columns-level-1
+      org-columns-level-2 org-columns-level-3
       org-columns-level-4 org-columns-level-5 org-columns-level-6
       org-columns-level-7 org-columns-level-8
       ))
@@ -445,8 +445,8 @@ This is the compiled version of the format.")
     (with-current-buffer (marker-buffer org-columns-begin-marker)
       (when (local-variable-p 'org-previous-header-line-format (current-buffer))
 	(if (featurep 'xemacs)
-	    (set-specifier top-gutter 
-			   (make-gutter-specifier 
+	    (set-specifier top-gutter
+			   (make-gutter-specifier
 			    (cons (current-buffer)
 				  (cdar org-previous-header-line-format))))
 	  (setq header-line-format org-previous-header-line-format)

lisp/org-colview.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -209,7 +209,7 @@ This is the compiled version of the format.")
 (defvar org-columns-flyspell-was-active nil
   "Remember the state of `flyspell-mode' before column view.
 Flyspell-mode can cause problems in columns view, so it is turned off
-for the duration of the command."
+for the duration of the command.")
 
 (defvar header-line-format)
 (defvar org-columns-previous-hscroll 0)

lisp/org-compat.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-exp.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -431,12 +431,12 @@ Org-mode file."
   :type 'string)
 
 (defcustom org-export-html-link-up ""
-  "Where should the \"UP\" link of exported HTML pages lead?" 
+  "Where should the \"UP\" link of exported HTML pages lead?"
   :group 'org-export-html
   :type '(string :tag "File or URL"))
 
 (defcustom org-export-html-link-home ""
-  "Where should the \"HOME\" link of exported HTML pages lead?" 
+  "Where should the \"HOME\" link of exported HTML pages lead?"
   :group 'org-export-html
   :type '(string :tag "File or URL"))
 
@@ -1243,7 +1243,7 @@ on this string to produce the exported version."
 	;; Check if the line before or after is a headline with a target
 	(if (setq target (or (get-text-property (point-at-bol 0) 'target)
 			     (get-text-property (point-at-bol 2) 'target)))
-	    (progn 
+	    (progn
 	      ;; use the existing target in a neighboring line
 	      (setq tmp (match-string 2))
 	      (replace-match "")
@@ -1380,7 +1380,7 @@ on this string to produce the exported version."
 		 (or (cdr (assoc slink target-alist))
 		     (save-excursion
 		       (unless (string-match org-link-types-re link)
-			 (setq found (condition-case nil (org-link-search link) 
+			 (setq found (condition-case nil (org-link-search link)
 				       (error nil)))
 			 (when (and found
 				    (or (org-on-heading-p)
@@ -1400,7 +1400,7 @@ on this string to produce the exported version."
 	     (insert target)
 	     (unless desc (insert "][" link))
 	     (add-text-properties pos (point) props)))))
-      
+
       ;; Normalize links: Convert angle and plain links into bracket links
       ;; Expand link abbreviations
       (goto-char (point-min))
@@ -1989,7 +1989,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
 #+ARCHIVE:   %s
 #+LINK:      %s
 "
-   (buffer-name) (user-full-name) user-mail-address 
+   (buffer-name) (user-full-name) user-mail-address
    (format-time-string (car org-time-stamp-formats))
    org-export-default-language
    org-export-headline-levels

lisp/org-export-latex.el

@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, wp, tex

lisp/org-faces.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-gnus.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-info.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-infojs.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -77,7 +77,8 @@ line in the buffer.  See also the variable `org-infojs-options'."
     (home LINK_HOME :link-home))
   "JavaScript options, long form for script, default values.")
 
-(when (and (boundp org-infojs-options)
+(defvar org-infojs-options)
+(when (and (boundp 'org-infojs-options)
 	   (assq 'runs org-infojs-options))
   (setq org-infojs-options (delq (assq 'runs org-infojs-options)
 				 org-infojs-options)))

lisp/org-irc.el

@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mac-message.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.

lisp/org-macs.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mew.el

@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 
 ;; This file is part of GNU Emacs.
 
@@ -102,8 +102,8 @@
  "Follow the Mew message link specified by PATH."
  (let (folder msgnum)
    (cond ((string-match "\\`\\(+.*\\)+\\+\\([0-9]+\\)\\'" path) ; for Bastien's
-	   (setq folder (match-string 1 link))
-	   (setq msgnum (match-string 2 link)))
+	   (setq folder (match-string 1 path))
+	   (setq msgnum (match-string 2 path)))
 	  ((string-match "\\`\\(\\(%#\\)?[^#]+\\)\\(#\\(.*\\)\\)?" path)
 	   (setq folder (match-string 1 path))
 	   (setq msgnum (match-string 4 path)))

lisp/org-mhe.el

@@ -5,7 +5,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mouse.el

@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -42,7 +42,7 @@
 ;;    + tags
 ;; * promoting/demoting/moving subtrees with mouse-3
 ;;    + if the drag starts and ends in the same line then promote/demote
-;;    + otherwise move the subtree 
+;;    + otherwise move the subtree
 ;;
 ;; Use
 ;; ---
@@ -93,7 +93,7 @@
 ;; + shift-middleclick or right-drag inserts the text from the clipboard in the form of a link
 ;;
 ;; Version 0.20
-;; + the new "TODO Status" submenu replaces the "Cycle TODO" menu item 
+;; + the new "TODO Status" submenu replaces the "Cycle TODO" menu item
 ;; + the TODO menu can now list occurrences of a specific TODO keyword
 ;; + #+STARTUP line is now recognized
 ;;
@@ -115,10 +115,10 @@
 ;; Version 0.14
 ;; + added a menu option that converts plain list items to outline items
 ;;
-;; Version 0.13 
+;; Version 0.13
 ;; + "Insert Heading" now inserts a sibling heading if the point is
 ;;   on "***" and a child heading otherwise
-;; 
+;;
 ;; Version 0.12
 ;; + compatible with Emacs 21
 ;; + custom agenda commands added to the main menu
@@ -132,7 +132,7 @@
 ;; + added a menu option to remove highlights
 ;; + compatible with org-mode 4.21 now
 ;;
-;; Version 0.08: 
+;; Version 0.08:
 ;; + trees can be moved/promoted/demoted by dragging with the right
 ;;   mouse button (mouse-3)
 ;; + small changes in the above function
@@ -193,10 +193,10 @@ The value of this variable is the function invoked by
   "Invoke the context menu.
 
 If the value of `org-mouse-context-menu-function' is a function, then
-this function is called.  Otherwise, the current major mode menu is used."  
+this function is called.  Otherwise, the current major mode menu is used."
   (interactive "@e \nP")
   (if (and (= (event-click-count event) 1)
-	   (or (not mark-active) 
+	   (or (not mark-active)
 	       (sit-for (/ double-click-time 1000.0))))
       (progn
  	(select-window (posn-window (event-start event)))
@@ -250,8 +250,8 @@ after the current heading."
     (t (org-mouse-next-heading)
        (org-insert-heading))))
 
-(defun org-mouse-timestamp-today (&optional shift units) 
-  "Change the timestamp into SHIFT UNITS in the future.  
+(defun org-mouse-timestamp-today (&optional shift units)
+  "Change the timestamp into SHIFT UNITS in the future.
 
 For the acceptable UNITS, see `org-timestamp-change'."
   (interactive)
@@ -272,29 +272,29 @@ SELECTED is a function, then each item is a checkbox, which is
 enabled for a given keyword iff (funcall SELECTED keyword) return
 non-nil.  If SELECTED is neither nil nor a function, then the
 items are radio buttons.  A radio button is enabled for the
-keyword `equal' to SELECTED. 
+keyword `equal' to SELECTED.
 
 ITEMFORMAT governs formatting of the elements of KEYWORDS.  If it
 is a function, it is invoked with the keyword as the only
 argument.  If it is a string, it is interpreted as the format
 string to (format ITEMFORMAT keyword).  If it is neither a string
 nor a function, elements of KEYWORDS are used directly. "
-  (mapcar 
-   `(lambda (keyword) 
+  (mapcar
+   `(lambda (keyword)
      (vector (cond
 	      ((functionp ,itemformat) (funcall ,itemformat keyword))
 	      ((stringp ,itemformat) (format ,itemformat keyword))
 	      (t keyword))
 	     (list 'funcall ,function keyword)
-	     :style (cond 
+	     :style (cond
 		     ((null ,selected) t)
 		     ((functionp ,selected) 'toggle)
 		     (t 'radio))
-	     :selected (if (functionp ,selected) 
+	     :selected (if (functionp ,selected)
 			   (and (funcall ,selected keyword) t)
 			 (equal ,selected keyword))))
     keywords))
-     
+
 (defun org-mouse-remove-match-and-spaces ()
   "Remove the match, make just one space around the point."
   (interactive)
@@ -302,16 +302,16 @@ nor a function, elements of KEYWORDS are used directly. "
   (just-one-space))
 
 (defvar rest)
-(defun org-mouse-replace-match-and-surround (newtext &optional fixedcase 
+(defun org-mouse-replace-match-and-surround (newtext &optional fixedcase
 						     literal string subexp)
   "The same as `replace-match', but surrounds the replacement with spaces."
   (apply 'replace-match rest)
   (save-excursion
-    (goto-char (match-beginning (or subexp 0))) 
+    (goto-char (match-beginning (or subexp 0)))
     (just-one-space)
-    (goto-char (match-end (or subexp 0))) 
+    (goto-char (match-end (or subexp 0)))
     (just-one-space)))
-  
+
 
 (defun org-mouse-keyword-replace-menu (keywords &optional group itemformat
 						nosurround)
@@ -330,26 +330,26 @@ ITEMFORMAT governs formatting of the elements of KEYWORDS.  If it
 is a function, it is invoked with the keyword as the only
 argument.  If it is a string, it is interpreted as the format
 string to (format ITEMFORMAT keyword).  If it is neither a string
-nor a function, elements of KEYWORDS are used directly. 
+nor a function, elements of KEYWORDS are used directly.
 "
   (setq group (or group 0))
-  (let ((replace (org-mouse-match-closure 
+  (let ((replace (org-mouse-match-closure
 		  (if nosurround 'replace-match
 		    'org-mouse-replace-match-and-surround))))
     (append
-     (org-mouse-keyword-menu 
+     (org-mouse-keyword-menu
       keywords
       `(lambda (keyword) (funcall ,replace keyword t t nil ,group))
       (match-string group)
       itemformat)
-     `(["None" org-mouse-remove-match-and-spaces 
+     `(["None" org-mouse-remove-match-and-spaces
 	:style radio
 	:selected ,(not (member (match-string group) keywords))]))))
-     
+
 (defun org-mouse-show-headlines ()
   "Change the visibility of the current org buffer to only show headlines."
-  (interactive) 
-  (let ((this-command 'org-cycle) 
+  (interactive)
+  (let ((this-command 'org-cycle)
 	(last-command 'org-cycle)
 	(org-cycle-global-status nil))
     (org-cycle '(4))
@@ -357,7 +357,7 @@ nor a function, elements of KEYWORDS are used directly.
 
 (defun org-mouse-show-overview ()
   "Change visibility of current org buffer to first-level headlines only."
-  (interactive) 
+  (interactive)
   (let ((org-cycle-global-status nil))
     (org-cycle '(4))))
 
@@ -374,7 +374,7 @@ leading '.*?'.")
 (defun org-mouse-get-priority (&optional default)
   "Return the priority of the current headline.
 DEFAULT is returned if no priority is given in the headline."
-  (save-excursion 
+  (save-excursion
     (if (org-mouse-re-search-line org-mouse-priority-regexp)
 	(match-string 1)
       (when default (char-to-string org-default-priority)))))
@@ -397,7 +397,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
     (when (looking-at " *[A-Z][A-Z]+:")
       (replace-match ""))))
 
-(defun org-mouse-looking-at (regexp skipchars &optional movechars) 
+(defun org-mouse-looking-at (regexp skipchars &optional movechars)
   (save-excursion
     (let ((point (point)))
       (if (looking-at regexp) t
@@ -405,19 +405,19 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	(forward-char (or movechars 0))
 	(when (looking-at regexp)
 	  (> (match-end 0) point))))))
-	      
+
 (defun org-mouse-priority-list ()
-   (loop for priority from ?A to org-lowest-priority 
+   (loop for priority from ?A to org-lowest-priority
 	 collect (char-to-string priority)))
 
 (defun org-mouse-tag-menu ()		;todo
   (append
    (let ((tags (org-split-string (org-get-tags) ":")))
-     (org-mouse-keyword-menu 
+     (org-mouse-keyword-menu
       (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp)
-      `(lambda (tag) 
-	 (org-mouse-set-tags 
-	  (sort (if (member tag (quote ,tags)) 
+      `(lambda (tag)
+	 (org-mouse-set-tags
+	  (sort (if (member tag (quote ,tags))
 		    (delete tag (quote ,tags))
 		  (cons tag (quote ,tags)))
 		'string-lessp)))
@@ -427,7 +427,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ["Align Tags Here" (org-set-tags nil t) t]
      ["Align Tags in Buffer" (org-set-tags t t) t]
      ["Set Tags ..." (org-set-tags) t])))
-   
+
 
 
 (defun org-mouse-set-tags (tags)
@@ -442,7 +442,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
       (end-of-line)
       (insert " :" (mapconcat 'identity tags ":") ":")
       (org-set-tags nil t))))
-			  
+
 (defun org-mouse-insert-checkbox ()
   (interactive)
   (and (org-at-item-p)
@@ -462,15 +462,15 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 
 
 (defun org-mouse-list-options-menu (alloptions &optional function)
-  (let ((options (save-match-data 
+  (let ((options (save-match-data
 		   (split-string (match-string-no-properties 1)))))
     (print options)
     (loop for name in alloptions
-	  collect 
-	  (vector name 
+	  collect
+	  (vector name
 		  `(progn
-		     (replace-match 
-		      (mapconcat 'identity 
+		     (replace-match
+		      (mapconcat 'identity
 				 (sort (if (member ',name ',options)
 					   (delete ',name ',options)
 					 (cons ',name ',options))
@@ -487,7 +487,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
     text))
 
 (defun org-mouse-popup-global-menu ()
-  (popup-menu  
+  (popup-menu
    `("Main Menu"
      ["Show Overview" org-mouse-show-overview t]
      ["Show Headlines" org-mouse-show-headlines t]
@@ -495,13 +495,13 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ["Remove Highlights" org-remove-occur-highlights
       :visible org-occur-highlights]
      "--"
-     ["Check Deadlines" 
+     ["Check Deadlines"
       (if (functionp 'org-check-deadlines-and-todos)
 	  (org-check-deadlines-and-todos org-deadline-warning-days)
 	(org-check-deadlines org-deadline-warning-days)) t]
      ["Check TODOs" org-show-todo-tree t]
-     ("Check Tags" 
-      ,@(org-mouse-keyword-menu 
+     ("Check Tags"
+      ,@(org-mouse-keyword-menu
 	 (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp)
 	 '(lambda (tag) (org-tags-sparse-tree nil tag)))
       "--"
@@ -511,55 +511,55 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ["Display Agenda" org-agenda-list t]
      ["Display Timeline" org-timeline t]
      ["Display TODO List" org-todo-list t]
-     ("Display Tags" 
-      ,@(org-mouse-keyword-menu 
+     ("Display Tags"
+      ,@(org-mouse-keyword-menu
 	 (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp)
 	 '(lambda (tag) (org-tags-view nil tag)))
       "--"
       ["Custom Tag ..." org-tags-view t])
      ["Display Calendar" org-goto-calendar t]
      "--"
-     ,@(org-mouse-keyword-menu 
+     ,@(org-mouse-keyword-menu
 	(mapcar 'car org-agenda-custom-commands)
-	'(lambda (key) 
-	   (eval `(flet ((read-char-exclusive () (string-to-char ,key))) 
+	'(lambda (key)
+	   (eval `(flet ((read-char-exclusive () (string-to-char ,key)))
 		      (org-agenda nil))))
-	nil 
+	nil
 	'(lambda (key)
 	   (let ((entry (assoc key org-agenda-custom-commands)))
-	     (org-mouse-clip-text 
+	     (org-mouse-clip-text
 	      (cond
 	       ((stringp (nth 1 entry)) (nth 1 entry))
-	       ((stringp (nth 2 entry)) 
+	       ((stringp (nth 2 entry))
 		(concat (org-mouse-agenda-type (nth 1 entry))
 			(nth 2 entry)))
 	       (t "Agenda Command '%s'"))
 	      30))))
      "--"
-     ["Delete Blank Lines" delete-blank-lines 
+     ["Delete Blank Lines" delete-blank-lines
       :visible (org-mouse-empty-line)]
      ["Insert Checkbox" org-mouse-insert-checkbox
       :visible (and (org-at-item-p) (not (org-at-item-checkbox-p)))]
-     ["Insert Checkboxes" 
+     ["Insert Checkboxes"
       (org-mouse-for-each-item 'org-mouse-insert-checkbox)
       :visible (and (org-at-item-p) (not (org-at-item-checkbox-p)))]
      ["Plain List to Outline" org-mouse-transform-to-outline
       :visible (org-at-item-p)])))
 
-			      
+
 (defun org-mouse-get-context (contextlist context)
   (let ((contextdata (assq context contextlist)))
     (when contextdata
-      (save-excursion 
+      (save-excursion
 	(goto-char (second contextdata))
 	(re-search-forward ".*" (third contextdata))))))
 
 (defun org-mouse-for-each-item (function)
-  (save-excursion 
-    (ignore-errors 
+  (save-excursion
+    (ignore-errors
       (while t (org-previous-item)))
-    (ignore-errors 
-      (while t 
+    (ignore-errors
+      (while t
 	(funcall function)
 	(org-next-item)))))
 
@@ -567,28 +567,28 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
   "Returns true if there only spaces, tabs, and '*',  between the beginning of line and the point"
   (save-excursion
     (skip-chars-backward " \t*") (bolp)))
-  
+
 (defun org-mouse-insert-item (text)
   (case (org-mouse-line-position)
-    (:beginning			; insert before 
-     (beginning-of-line) 
+    (:beginning			; insert before
+     (beginning-of-line)
      (looking-at "[ \t]*")
      (open-line 1)
      (indent-to (- (match-end 0) (match-beginning 0)))
      (insert "+ "))
-	 
+
     (:middle			; insert after
-     (end-of-line) 
-     (newline t) 
+     (end-of-line)
+     (newline t)
      (indent-relative)
      (insert "+ "))
 
     (:end				; insert text here
-     (skip-chars-backward " \t") 
+     (skip-chars-backward " \t")
      (kill-region (point) (point-at-eol))
-     (unless (looking-back org-mouse-punctuation) 
+     (unless (looking-back org-mouse-punctuation)
        (insert (concat org-mouse-punctuation " ")))))
-    
+
   (insert text)
   (beginning-of-line))
 
@@ -604,7 +604,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 
 (defun org-mouse-match-closure (function)
   (let ((match (match-data t)))
-    `(lambda (&rest rest) 
+    `(lambda (&rest rest)
       (save-match-data
 	(set-match-data ',match)
 	(apply ',function rest)))))
@@ -639,28 +639,28 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
        `(nil
 	 ["Sparse Tree" (org-occur ',region-string)]
 	 ["Find in Buffer" (occur ',region-string)]
-	 ["Grep in Current Dir" 
+	 ["Grep in Current Dir"
 	  (grep (format "grep -rnH -e '%s' *" ',region-string))]
-	 ["Grep in Parent Dir" 
+	 ["Grep in Parent Dir"
 	  (grep (format "grep -rnH -e '%s' ../*" ',region-string))]
 	 "--"
-	 ["Convert to Link" 
+	 ["Convert to Link"
 	  (progn (save-excursion (goto-char (region-beginning)) (insert "[["))
 		 (save-excursion (goto-char (region-end)) (insert "]]")))]
 	 ["Insert Link Here" (org-mouse-yank-link ',event)]))))
 
    ((save-excursion (beginning-of-line) (looking-at "#\\+STARTUP: \\(.*\\)"))
-    (popup-menu 
-     `(nil 
+    (popup-menu
+     `(nil
        ,@(org-mouse-list-options-menu (mapcar 'car org-startup-options)
 				      'org-mode-restart))))
-   ((or (eolp) 
+   ((or (eolp)
 	(and (looking-at "\\(  \\|\t\\)\\(+:[0-9a-zA-Z_:]+\\)?\\(  \\|\t\\)+$")
 	     (looking-back "  \\|\t")))
     (org-mouse-popup-global-menu))
    ((get-context :checkbox)
-    (popup-menu 
-     '(nil 
+    (popup-menu
+     '(nil
        ["Toggle" org-toggle-checkbox t]
        ["Remove" org-mouse-remove-match-and-spaces t]
        ""
@@ -680,25 +680,25 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
        )))
    ((and (org-mouse-looking-at "\\b\\w+" "a-zA-Z0-9_")
  	 (member (match-string 0) (org-mouse-todo-keywords)))
-    (popup-menu 
+    (popup-menu
      `(nil
        ,@(org-mouse-keyword-replace-menu (org-mouse-todo-keywords))
-       "--" 
+       "--"
        ["Check TODOs" org-show-todo-tree t]
        ["List all TODO keywords" org-todo-list t]
-       [,(format "List only %s" (match-string 0)) 
+       [,(format "List only %s" (match-string 0))
 	(org-todo-list (match-string 0)) t]
        )))
    ((and (org-mouse-looking-at "\\b[A-Z]+:" "A-Z")
 	 (member (match-string 0) stamp-prefixes))
-    (popup-menu 
-     `(nil 
-       ,@(org-mouse-keyword-replace-menu stamp-prefixes) 
+    (popup-menu
+     `(nil
+       ,@(org-mouse-keyword-replace-menu stamp-prefixes)
        "--"
        ["Check Deadlines" org-check-deadlines t]
        )))
    ((org-mouse-looking-at org-mouse-priority-regexp "[]A-Z#") ; priority
-    (popup-menu `(nil ,@(org-mouse-keyword-replace-menu 
+    (popup-menu `(nil ,@(org-mouse-keyword-replace-menu
 			 (org-mouse-priority-list) 1 "Priority %s" t))))
    ((get-context :link)
     (popup-menu
@@ -707,8 +707,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
        ["Open in Emacs" (org-open-at-point t) t]
        "--"
        ["Copy link" (kill-new (match-string 0))]
-       ["Cut link" 
-	(progn 
+       ["Cut link"
+	(progn
 	  (kill-region (match-beginning 0) (match-end 0))
 	  (just-one-space))]
        "--"
@@ -717,8 +717,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 ;       ["Paste file link" ((insert "file:") (yank))]
        )))
    ((org-mouse-looking-at ":\\([A-Za-z0-9_]+\\):" "A-Za-z0-9_" -1) ;tags
-    (popup-menu 
-     `(nil 
+    (popup-menu
+     `(nil
        [,(format "Display '%s'" (match-string 1))
 	(org-tags-view nil ,(match-string 1))]
        [,(format "Sparse Tree '%s'" (match-string 1))
@@ -726,7 +726,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
        "--"
        ,@(org-mouse-tag-menu))))
    ((org-at-timestamp-p)
-    (popup-menu 
+    (popup-menu
      '(nil
        ["Show Day" org-open-at-point t]
        ["Change Timestamp" org-time-stamp t]
@@ -751,8 +751,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
       (incf (car mdata) 2)
       (store-match-data mdata))
     (message "match: %S" (match-string 0))
-    (popup-menu `(nil ,@(org-mouse-keyword-replace-menu 
-			 '(" " "!" "^" "_" "$" "#" "*" "'") 0 
+    (popup-menu `(nil ,@(org-mouse-keyword-replace-menu
+			 '(" " "!" "^" "_" "$" "#" "*" "'") 0
 			 (lambda (mark)
 			   (case (string-to-char mark)
 			     (?  "( ) Nothing Special")
@@ -811,10 +811,10 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
     (let ((priority (org-mouse-get-priority t)))
       (popup-menu
        `("Headline Menu"
-	 ("Tags and Priorities" 
-	  ,@(org-mouse-keyword-menu 
-	     (org-mouse-priority-list) 
-	     '(lambda (keyword) 
+	 ("Tags and Priorities"
+	  ,@(org-mouse-keyword-menu
+	     (org-mouse-priority-list)
+	     '(lambda (keyword)
 		(org-mouse-set-priority (string-to-char keyword)))
 	     priority "Priority %s")
 	  "--"
@@ -823,23 +823,23 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	  ,@(progn (org-mouse-match-todo-keyword)
 		   (org-mouse-keyword-replace-menu (org-mouse-todo-keywords)
 						   1)))
-	 ["Show Tags" 
+	 ["Show Tags"
 	  (with-current-buffer org-mouse-main-buffer (org-agenda-show-tags))
 	  :visible (not org-mouse-direct)]
-	 ["Show Priority" 
+	 ["Show Priority"
 	  (with-current-buffer org-mouse-main-buffer (org-agenda-show-priority))
 	  :visible (not org-mouse-direct)]
 	 ,@(if org-mouse-direct '("--") nil)
 	 ["New Heading" org-mouse-insert-heading :visible org-mouse-direct]
-	 ["Set Deadline" 
-	  (progn (org-mouse-end-headline) (insert " ") (org-deadline)) 
-	  :active (not (save-excursion 
+	 ["Set Deadline"
+	  (progn (org-mouse-end-headline) (insert " ") (org-deadline))
+	  :active (not (save-excursion
 			 (org-mouse-re-search-line org-deadline-regexp)))]
-	 ["Schedule Task" 
-	  (progn (org-mouse-end-headline) (insert " ") (org-schedule)) 
-	  :active (not (save-excursion 
+	 ["Schedule Task"
+	  (progn (org-mouse-end-headline) (insert " ") (org-schedule))
+	  :active (not (save-excursion
 			 (org-mouse-re-search-line org-scheduled-regexp)))]
-	 ["Insert Timestamp" 
+	 ["Insert Timestamp"
 	  (progn (org-mouse-end-headline) (insert " ") (org-time-stamp nil)) t]
 ;	 ["Timestamp (inactive)" org-time-stamp-inactive t]
 	 "--"
@@ -847,7 +847,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	 ["Cut Subtree"  org-cut-special]
 	 ["Copy Subtree"  org-copy-special]
 	 ["Paste Subtree"  org-paste-special :visible org-mouse-direct]
-	 ("Sort Children" 
+	 ("Sort Children"
 	  ["Alphabetically" (org-sort-entries nil ?a)]
 	  ["Numerically" (org-sort-entries nil ?n)]
 	  ["By Time/Date" (org-sort-entries nil ?t)]
@@ -858,7 +858,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	 "--"
 	 ["Move Trees" org-mouse-move-tree :active nil]
 	 ))))
-   (t 
+   (t
     (org-mouse-popup-global-menu))))))
 
 ;; (defun org-mouse-at-regexp (regexp)
@@ -877,8 +877,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
   (and mark-active transient-mark-mode))
 
 (defun org-mouse-in-region-p (pos)
-  (and (org-mouse-mark-active) 
-       (>= pos (region-beginning)) 
+  (and (org-mouse-mark-active)
+       (>= pos (region-beginning))
        (<  pos (region-end))))
 
 (defun org-mouse-down-mouse (event)
@@ -903,19 +903,19 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      (define-key org-mouse-map [drag-mouse-3] 'org-mouse-move-tree)
      (define-key org-mouse-map [down-mouse-3] 'org-mouse-move-tree-start)
 
-     (font-lock-add-keywords nil 
-	`((,outline-regexp 
-	   0 `(face org-link mouse-face highlight keymap ,org-mouse-map)  
+     (font-lock-add-keywords nil
+	`((,outline-regexp
+	   0 `(face org-link mouse-face highlight keymap ,org-mouse-map)
 	   'prepend)
-	  ("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +" 
+	  ("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +"
 	   (1 `(face org-link keymap ,org-mouse-map mouse-face highlight) 'prepend))
-	  ("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +\\(\\[[ X]\\]\\)" 
+	  ("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +\\(\\[[ X]\\]\\)"
 	   (2 `(face bold keymap ,org-mouse-map mouse-face highlight) t)))
  	t)
 
      (defadvice org-open-at-point (around org-mouse-open-at-point activate)
        (let ((context (org-context)))
-	 (cond 
+	 (cond
 	  ((assq :headline-stars context) (org-cycle))
 	  ((assq :checkbox context) (org-toggle-checkbox))
 	  ((assq :item-bullet context)
@@ -945,26 +945,26 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
       (goto-char start)
       (org-back-to-heading)
       (if (and (eq sbuf ebuf)
-	       (equal 
+	       (equal
 		(point)
 		(save-excursion (goto-char end) (org-back-to-heading) (point))))
 	;; if the same line then promote/demote
 	(if (>= end start) (org-demote-subtree) (org-promote-subtree))
       ;; if different lines then move
       (org-cut-subtree)
-      
+
       (set-buffer ebuf)
       (goto-char end)
       (org-back-to-heading)
       (when  (and (eq sbuf ebuf)
-		  (equal 
+		  (equal
 		   (point)
-		   (save-excursion (goto-char start) 
+		   (save-excursion (goto-char start)
 				   (org-back-to-heading) (point))))
 	(outline-end-of-subtree)
 	(end-of-line)
 	(if (eobp) (newline) (forward-char)))
-      
+
       (when (looking-at outline-regexp)
 	(let ((level (- (match-end 0) (match-beginning 0))))
 	  (when (> end (match-end 0))
@@ -1010,9 +1010,9 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	   (org-mouse-direct nil)
 	   (org-mouse-main-buffer (current-buffer)))
       (when (eq (with-current-buffer buffer major-mode) 'org-mode)
-	(let ((endmarker (save-excursion 
-			  (set-buffer buffer) 
-			  (outline-end-of-subtree) 
+	(let ((endmarker (save-excursion
+			  (set-buffer buffer)
+			  (outline-end-of-subtree)
 			  (forward-char 1)
 			  (copy-marker (point)))))
 	  (org-with-remote-undo buffer
@@ -1031,7 +1031,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 	      (message "this-command: %S" this-command)
 	      (unless (eq (marker-position marker) (marker-position endmarker))
 		(setq newhead (org-get-heading))))
-	    
+
 	    (beginning-of-line 1)
 	    (save-excursion
 	      (org-agenda-change-all-lines newhead hdmarker 'fixface))))
@@ -1039,46 +1039,46 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 
 (defun org-mouse-agenda-context-menu (&optional event)
   (or (org-mouse-do-remotely 'org-mouse-context-menu)
-      (popup-menu  
+      (popup-menu
        '("Agenda"
 	 ("Agenda Files")
 	 "--"
 	 ["Undo" (progn (message "last command: %S" last-command) (setq this-command 'org-agenda-undo) (org-agenda-undo))
-	  :visible (if (eq last-command 'org-agenda-undo) 
+	  :visible (if (eq last-command 'org-agenda-undo)
 		       org-agenda-pending-undo-list
 		     org-agenda-undo-list)]
 	 ["Rebuild Buffer" org-agenda-redo t]
-	 ["New Diary Entry" 
+	 ["New Diary Entry"
 	  org-agenda-diary-entry (org-agenda-check-type nil 'agenda 'timeline) t]
 	 "--"
-	 ["Goto Today" org-agenda-goto-today 
+	 ["Goto Today" org-agenda-goto-today
 	  (org-agenda-check-type nil 'agenda 'timeline) t]
-	 ["Display Calendar" org-agenda-goto-calendar 
+	 ["Display Calendar" org-agenda-goto-calendar
 	  (org-agenda-check-type nil 'agenda 'timeline) t]
 	 ("Calendar Commands"
-	  ["Phases of the Moon" org-agenda-phases-of-moon 
+	  ["Phases of the Moon" org-agenda-phases-of-moon
 	   (org-agenda-check-type nil 'agenda 'timeline)]
-	  ["Sunrise/Sunset" org-agenda-sunrise-sunset 
+	  ["Sunrise/Sunset" org-agenda-sunrise-sunset
 	   (org-agenda-check-type nil 'agenda 'timeline)]
-	  ["Holidays" org-agenda-holidays 
+	  ["Holidays" org-agenda-holidays
 	   (org-agenda-check-type nil 'agenda 'timeline)]
-	  ["Convert" org-agenda-convert-date 
+	  ["Convert" org-agenda-convert-date
 	   (org-agenda-check-type nil 'agenda 'timeline)]
 	  "--"
 	  ["Create iCalendar file" org-export-icalendar-combine-agenda-files t])
 	 "--"
-	 ["Day View" org-agenda-day-view 
+	 ["Day View" org-agenda-day-view
 	  :active (org-agenda-check-type nil 'agenda)
 	  :style radio :selected (equal org-agenda-ndays 1)]
-	 ["Week View" org-agenda-week-view 
+	 ["Week View" org-agenda-week-view
 	  :active (org-agenda-check-type nil 'agenda)
 	  :style radio :selected (equal org-agenda-ndays 7)]
 	 "--"
 	 ["Show Logbook entries" org-agenda-log-mode
-	  :style toggle :selected org-agenda-show-log 
+	  :style toggle :selected org-agenda-show-log
 	  :active (org-agenda-check-type nil 'agenda 'timeline)]
 	 ["Include Diary" org-agenda-toggle-diary
-	  :style toggle :selected org-agenda-include-diary 
+	  :style toggle :selected org-agenda-include-diary
 	  :active (org-agenda-check-type nil 'agenda)]
 	 ["Use Time Grid" org-agenda-toggle-time-grid
 	  :style toggle :selected org-agenda-use-time-grid
@@ -1097,11 +1097,11 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 
 
 ; (setq org-agenda-mode-hook nil)
-(add-hook 'org-agenda-mode-hook 
+(add-hook 'org-agenda-mode-hook
    '(lambda ()
      (setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu)
-     (define-key org-agenda-keymap 
-       (if (featurep 'xemacs) [button3] [mouse-3]) 
+     (define-key org-agenda-keymap
+       (if (featurep 'xemacs) [button3] [mouse-3])
        'org-mouse-show-context-menu)
      (define-key org-agenda-keymap [down-mouse-3] 'org-mouse-move-tree-start)
      (define-key org-agenda-keymap [C-mouse-4] 'org-agenda-earlier)

lisp/org-publish.el

@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.02pre-06
+;; Version: 6.02
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -423,7 +423,7 @@ non-nil, restrict this list to the files matching the regexp
 MATCH.  If SKIP-FILE is non-nil, skip file matching the regexp
 SKIP-FILE.  If SKIP-DIR is non-nil, don't check directories
 matching the regexp SKIP-DIR when recursiing through BASE-DIR."
-  (mapc (lambda (f) 
+  (mapc (lambda (f)
 	  (let ((fd-p (car (file-attributes f)))
 		(fnd (file-name-nondirectory f)))
 	    (if (and fd-p recurse
@@ -448,7 +448,7 @@ matching filenames."
  	 (extension (or (plist-get project-plist :base-extension) "org"))
  	 (match (concat "^[^\\.].*\\.\\(" extension "\\)$")))
     (setq org-publish-temp-files nil)
-    (org-publish-get-base-files-1 base-dir recurse match 
+    (org-publish-get-base-files-1 base-dir recurse match
 				  ;; FIXME distinguish exclude regexp
 				  ;; for skip-file and skip-dir?
 				  exclude-regexp exclude-regexp)
@@ -536,7 +536,7 @@ See `org-publish-org-to' to the list of arguments."
 					  (abbreviate-file-name filename))))
 		      (error "Can't publish file outside of a project")))))
 	   (project-plist (cdr project))
-	   (publishing-function 
+	   (publishing-function
 	    (or (plist-get project-plist :publishing-function)
 		'org-publish-org-to-html))
 	   (base-dir (file-name-as-directory

lisp/org-remember.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -92,7 +92,7 @@ When nil, just let remember make the buffer.
 When not nil, this is a list of 5-element lists.  In each entry, the first
 element is the name of the template, which should be a single short word.
 The second element is a character, a unique key to select this template.
-The third element is the template.  
+The third element is the template.
 
 The fourth element is optional and can specify a destination file for
 remember items created with this template.  The default file is given

lisp/org-rmail.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-table.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -454,7 +454,7 @@ property, locally or anywhere up in the hierarchy."
 		(y-or-n-p (format "Overwrite file %s? " file)))
       (error "Abort"))
     (message format)
-    
+
     (if (string-match "\\([^ \t\r\n]+\\)\\( +.*\\)?" format)
 	(let* ((transform (intern (match-string 1 format)))
 	       (params (if (match-end 2)
@@ -479,11 +479,11 @@ property, locally or anywhere up in the hierarchy."
 	       (org-table-last-column-widths
 		(org-remove-by-index (funcall fun org-table-last-column-widths)
 				     skipcols i0)))
-	  
+
 	  (unless (fboundp transform)
 	    (error "No such transformation function %s" transform))
 	  (setq txt (funcall transform table params))
-	  
+
 	  (with-current-buffer (find-file-noselect file)
 	    (setq buf (current-buffer))
 	    (erase-buffer)
@@ -3793,14 +3793,14 @@ directly by `orgtbl-send-table'.  See manual."
 	    (orgtbl-format-section 'hline))
 	  (if hline (push hline *orgtbl-rtn*))
 	  (pop *orgtbl-table*)))
-    
+
     ;; Now format the main section.
     (orgtbl-format-section nil)
-    
-    (unless splicep 
+
+    (unless splicep
       (push (or (orgtbl-eval-str (plist-get params :tend))
 		"ERROR: no :tend") *orgtbl-rtn*))
-    
+
     (mapconcat 'identity (nreverse (if remove-nil-linesp
 				       (remq nil *orgtbl-rtn*)
 				     *orgtbl-rtn*)) "\n")))

lisp/org-vm.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-wl.el

@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre-06
+;; Version: 6.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -93,7 +93,7 @@
 
 ;;; Version
 
-(defconst org-version "6.02pre-06"
+(defconst org-version "6.02"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)
@@ -2185,7 +2185,7 @@ Normal means, no org-mode-specific context."
 (declare-function cdlatex-tab "ext:cdlatex" ())
 (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
 (defvar font-lock-unfontify-region-function)
-(declare-function iswitchb-mode "iswitchb" (&optional arg)) 
+(declare-function iswitchb-mode "iswitchb" (&optional arg))
 (declare-function iswitchb-read-buffer (prompt &optional default require-match start matches-set))
 (defvar iswitchb-temp-buflist)
 (declare-function org-gnus-follow-link "org-gnus" (&optional group article))
@@ -8705,7 +8705,7 @@ are included in the output."
 	       (lambda (x) (if (string-match org-use-tag-inheritance x) x nil))
 	       tags)))
    ((listp org-use-tag-inheritance)
-    (org-delete-all org-use-tag-inheritance tags))))	   
+    (org-delete-all org-use-tag-inheritance tags))))
 
 (defvar todo-only) ;; dynamically scoped
 
@@ -8767,7 +8767,7 @@ also TODO lines."
 	(re (org-re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL\\([<=>]\\{1,2\\}\\)\\([0-9]+\\)\\|\\([[:alnum:]_]+\\)\\([<>=]\\{1,2\\}\\)\\({[^}]+}\\|\"[^\"]*\"\\|-?[.0-9]+\\(?:[eE][-+]?[0-9]+\\)?\\)\\|[[:alnum:]_@]+\\)"))
 	minus tag mm
 	tagsmatch todomatch tagsmatcher todomatcher kwd matcher
-	orterms term orlist re-p str-p level-p level-op 
+	orterms term orlist re-p str-p level-p level-op
 	prop-p pn pv po cat-p gv)
     (if (string-match "/+" match)
 	;; match contains also a todo-matching request
@@ -8867,7 +8867,7 @@ also TODO lines."
   (setq op
 	(cond
 	 ((equal  op   "<"       ) '(<     string<      ))
-	 ((equal  op   ">"       ) '(>     string>      ))
+	 ((equal  op   ">"       ) '(>     org-string>  ))
 	 ((member op '("<=" "=<")) '(<=    org-string<= ))
 	 ((member op '(">=" "=>")) '(>=    org-string>= ))
 	 ((member op '("="  "==")) '(=     string=      ))
@@ -8876,7 +8876,8 @@ also TODO lines."
 
 (defun org<> (a b) (not (= a b)))
 (defun org-string<= (a b) (or (string= a b) (string< a b)))
-(defun org-string>= (a b) (or (string= a b) (string> a b)))
+(defun org-string>= (a b) (not (string< a b)))
+(defun org-string>  (a b) (and (not (string= a b)) (not (string< a b))))
 (defun org-string<> (a b) (not (string= a b)))
 
 (defun org-match-any-p (re list)
@@ -11094,12 +11095,12 @@ PREDICATE can be either 'export, 'files or 'agenda.
 
 If TMP is non-nil, don't include temporary buffers."
   (let (filter blist)
-    (setq filter 
+    (setq filter
 	  (cond ((eq predicate 'files) "\.org$")
 		((eq predicate 'export) "\*Org .*Export")
 		(t "\*Org \\|\.org$")))
     (setq blist
-	  (mapcar 
+	  (mapcar
 	   (lambda(b)
 	     (let ((bname (buffer-name b))
 		   (bfile (buffer-file-name b)))
@@ -11588,7 +11589,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
 	 (texfile (concat texfilebase ".tex"))
 	 (dvifile (concat texfilebase ".dvi"))
 	 (pngfile (concat texfilebase ".png"))
-	 (fnh (if (featurep 'xemacs) 
+	 (fnh (if (featurep 'xemacs)
                   (font-height (get-face-font 'default))
                 (face-attribute 'default :height nil)))
 	 (scale (or (plist-get options (if buffer :scale :html-scale)) 1.0))