Release 4.67release_4.67

6 files changed, 121 insertions, 112 deletions

diff --git a/org b/org
index 535eabf..0295353 100644
--- a/org
+++ b/org
@@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
 * Org Mode: (org).      Outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
-   This manual is for Org-mode (version 4.66).
+   This manual is for Org-mode (version 4.67).
 
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
 
@@ -27,7 +27,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org-mode (version 4.66).
+This manual is for Org-mode (version 4.67).
 
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
 
@@ -3113,7 +3113,9 @@ following keys:
      exception) assign several tags from such a group.
 
 `C-c'
-     Toggle auto-exit after the next change (see below).
+     Toggle auto-exit after the next change (see below).  If you are
+     using expert mode, the first `C-c' will display the selection
+     window.
 
 This method lets you assign tags to a headline with very few keys.  With
 the above setup, you could clear the current tags and set `@HOME',
@@ -3131,8 +3133,8 @@ first change.  If you then occasionally need more keys, press `C-c' to
 turn off auto-exit for the current tag selection process (in effect:
 start selection with `C-c C-c C-c' instead of `C-c C-c').  If you set
 the variable to the value `expert', the special window is not even
-shown for single-key tag selection, it comes up only when you press
-that extra `C-c'.
+shown for single-key tag selection, it comes up only when you press an
+extra `C-c'.
 
    ---------- Footnotes ----------
 
@@ -6843,94 +6845,94 @@ Ref: Clocking work time-Footnote-2122843
 Node: Tags122969
 Node: Tag inheritance123731
 Node: Setting tags124668
-Ref: Setting tags-Footnote-1129101
-Ref: Setting tags-Footnote-2129213
-Node: Tag searches129296
-Node: Agenda views132007
-Node: Agenda files133952
-Ref: Agenda files-Footnote-1134918
-Ref: Agenda files-Footnote-2135067
-Node: Agenda dispatcher135260
-Node: Built-in agenda views136951
-Node: Weekly/Daily agenda137529
-Node: Global TODO list139658
-Node: Matching headline tags141831
-Node: Timeline142902
-Node: Stuck projects143568
-Node: Presentation and sorting145267
-Node: Categories146058
-Node: Time-of-day specifications146722
-Node: Sorting of agenda items148693
-Node: Agenda commands149975
-Node: Custom agenda views156628
-Node: Storing searches157303
-Node: Block agenda159215
-Node: Setting Options160445
-Node: Batch processing163157
-Node: Embedded LaTeX164287
-Ref: Embedded LaTeX-Footnote-1165379
-Node: Math symbols165569
-Node: Subscripts and Superscripts166334
-Node: LaTeX fragments167178
-Ref: LaTeX fragments-Footnote-1169286
-Node: Processing LaTeX fragments169548
-Node: CDLaTeX mode170494
-Ref: CDLaTeX mode-Footnote-1172978
-Node: Exporting173126
-Node: ASCII export174440
-Node: HTML export175730
-Node: Export commands176349
-Node: Quoting HTML tags177073
-Node: Links177703
-Node: Images178400
-Ref: Images-Footnote-1179271
-Node: CSS support179332
-Ref: CSS support-Footnote-1180651
-Node: XOXO export180764
-Node: iCalendar export181203
-Node: Text interpretation182422
-Node: Comment lines182901
-Node: Enhancing text183372
-Node: Export options185190
-Node: Publishing186887
-Ref: Publishing-Footnote-1187683
-Node: Configuration187879
-Node: Project alist188597
-Node: Sources and destinations189663
-Node: Selecting files190393
-Node: Publishing action191141
-Node: Publishing options192374
-Node: Publishing links194526
-Node: Project page index196039
-Node: Sample configuration196817
-Node: Simple example197309
-Node: Complex example197982
-Node: Triggering publication200058
-Node: Miscellaneous200743
-Node: Completion201377
-Node: Customization202848
-Node: In-buffer settings203431
-Node: The very busy C-c C-c key207671
-Node: Clean view209315
-Node: TTY keys211892
-Node: Interaction213501
-Node: Cooperation213898
-Node: Conflicts216638
-Node: Bugs218230
-Node: Extensions and Hacking219726
-Node: Extensions220322
-Node: Tables in arbitrary syntax222269
-Node: Radio tables223346
-Node: A LaTeX example225849
-Ref: A LaTeX example-Footnote-1229495
-Ref: A LaTeX example-Footnote-2229643
-Node: Translator functions230078
-Ref: Translator functions-Footnote-1233187
-Node: Dynamic blocks233275
-Node: Special agenda views235247
-Ref: Special agenda views-Footnote-1237526
-Node: History and Acknowledgments237786
-Node: Index243575
-Node: Key Index274269
+Ref: Setting tags-Footnote-1129191
+Ref: Setting tags-Footnote-2129303
+Node: Tag searches129386
+Node: Agenda views132097
+Node: Agenda files134042
+Ref: Agenda files-Footnote-1135008
+Ref: Agenda files-Footnote-2135157
+Node: Agenda dispatcher135350
+Node: Built-in agenda views137041
+Node: Weekly/Daily agenda137619
+Node: Global TODO list139748
+Node: Matching headline tags141921
+Node: Timeline142992
+Node: Stuck projects143658
+Node: Presentation and sorting145357
+Node: Categories146148
+Node: Time-of-day specifications146812
+Node: Sorting of agenda items148783
+Node: Agenda commands150065
+Node: Custom agenda views156718
+Node: Storing searches157393
+Node: Block agenda159305
+Node: Setting Options160535
+Node: Batch processing163247
+Node: Embedded LaTeX164377
+Ref: Embedded LaTeX-Footnote-1165469
+Node: Math symbols165659
+Node: Subscripts and Superscripts166424
+Node: LaTeX fragments167268
+Ref: LaTeX fragments-Footnote-1169376
+Node: Processing LaTeX fragments169638
+Node: CDLaTeX mode170584
+Ref: CDLaTeX mode-Footnote-1173068
+Node: Exporting173216
+Node: ASCII export174530
+Node: HTML export175820
+Node: Export commands176439
+Node: Quoting HTML tags177163
+Node: Links177793
+Node: Images178490
+Ref: Images-Footnote-1179361
+Node: CSS support179422
+Ref: CSS support-Footnote-1180741
+Node: XOXO export180854
+Node: iCalendar export181293
+Node: Text interpretation182512
+Node: Comment lines182991
+Node: Enhancing text183462
+Node: Export options185280
+Node: Publishing186977
+Ref: Publishing-Footnote-1187773
+Node: Configuration187969
+Node: Project alist188687
+Node: Sources and destinations189753
+Node: Selecting files190483
+Node: Publishing action191231
+Node: Publishing options192464
+Node: Publishing links194616
+Node: Project page index196129
+Node: Sample configuration196907
+Node: Simple example197399
+Node: Complex example198072
+Node: Triggering publication200148
+Node: Miscellaneous200833
+Node: Completion201467
+Node: Customization202938
+Node: In-buffer settings203521
+Node: The very busy C-c C-c key207761
+Node: Clean view209405
+Node: TTY keys211982
+Node: Interaction213591
+Node: Cooperation213988
+Node: Conflicts216728
+Node: Bugs218320
+Node: Extensions and Hacking219816
+Node: Extensions220412
+Node: Tables in arbitrary syntax222359
+Node: Radio tables223436
+Node: A LaTeX example225939
+Ref: A LaTeX example-Footnote-1229585
+Ref: A LaTeX example-Footnote-2229733
+Node: Translator functions230168
+Ref: Translator functions-Footnote-1233277
+Node: Dynamic blocks233365
+Node: Special agenda views235337
+Ref: Special agenda views-Footnote-1237616
+Node: History and Acknowledgments237876
+Node: Index243665
+Node: Key Index274359
 
 End Tag Table
diff --git a/org.el b/org.el
index 00ec434..313748e 100644
--- a/org.el
+++ b/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.66
+;; Version: 4.67
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -83,7 +83,7 @@
 
 ;;; Version
 
-(defvar org-version "4.66"
+(defvar org-version "4.67"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -5479,6 +5479,7 @@ this heading. "
 	  (tr-org-done-string org-done-string)
 	  (tr-org-todo-regexp org-todo-regexp)
 	  (tr-org-todo-line-regexp org-todo-line-regexp)
+	  (tr-org-odd-levels-only org-odd-levels-only)
 	  (this-buffer (current-buffer))
 	  (org-archive-location org-archive-location)
 	  (re "^#\\+ARCHIVE:[ \t]+\\(\\S-.*\\S-\\)[ \t]*$")
@@ -5526,7 +5527,10 @@ this heading. "
 	      (org-todo-interpretation tr-org-todo-interpretation)
 	      (org-done-string tr-org-done-string)
 	      (org-todo-regexp tr-org-todo-regexp)
-	      (org-todo-line-regexp tr-org-todo-line-regexp))
+	      (org-todo-line-regexp tr-org-todo-line-regexp)
+	      (org-odd-levels-only (if (local-variable-p org-odd-levels-only)
+				       org-odd-levels-only
+				     tr-org-odd-levels-only)))
 	  (goto-char (point-min))
 	  (if heading
 	      (progn
@@ -5549,7 +5553,7 @@ this heading. "
 	    ;; No specific heading, just go to end of file.
 	    (goto-char (point-max)) (insert "\n"))
 	  ;; Paste
-	  (org-paste-subtree (1+ level))
+	  (org-paste-subtree (org-get-legal-level level 1))
 	  ;; Mark the entry as done, i.e. set to last work in org-todo-keywords
 	  (if org-archive-mark-done
 	      (let (org-log-done)
@@ -10613,12 +10617,12 @@ See also the variable `org-reverse-note-order'."
 					      ; not handle this note
 	    (goto-char spos)
 	    (cond ((and (bobp) (not reversed))
-		   ;; Put it at the end, as level 2
+		   ;; Put it at the end, one level below level 1
 		   (save-restriction
 		     (widen)
 		     (goto-char (point-max))
 		     (if (not (bolp)) (newline))
-		     (org-paste-subtree 2 txt)))
+		     (org-paste-subtree (org-get-legal-level 1 1) txt)))
 		  ((and (bobp) reversed)
 		   ;; Put it at the start, as level 1
 		   (save-restriction
@@ -11797,19 +11801,20 @@ Returns the new tags string, or nil to not change the current settings."
       (setq rtn
 	    (catch 'exit
 	      (while t
-		(message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free [C-c]: multi%s"
-			 (if groups "  [!] no groups" ""))
+		(message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free%s%s"
+			 (if groups " [!] no groups" " [!]groups")
+			 (if expert " [C-c]:window" (if exit-after-next " [C-c]:single" " [C-c]:multi")))
 		(setq c (let ((inhibit-quit t)) (read-char-exclusive)))
 		(cond
 		 ((= c ?\r) (throw 'exit t))
 		 ((= c ?!)
-		  (setq groups nil)
+		  (setq groups (not groups))
 		  (goto-char (point-min))
 		  (while (re-search-forward "[{}]" nil t) (replace-match " ")))
 		 ((= c ?\C-c)
-		  (org-fast-tag-show-exit
-		   (setq exit-after-next (not exit-after-next)))
-		  (when expert
+		  (if (not expert)
+		      (org-fast-tag-show-exit
+		       (setq exit-after-next (not exit-after-next)))
 		    (setq expert nil)
 		    (delete-other-windows)
 		    (split-window-vertically)
diff --git a/org.pdf b/org.pdf
index 08f9149..e402b15 100644
--- a/org.pdf
+++ b/org.pdf
diff --git a/org.texi b/org.texi
index da00710..4b484f2 100644
--- a/org.texi
+++ b/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.66
+@set VERSION 4.67
 @set DATE February 2007
 
 @dircategory Emacs
@@ -3441,6 +3441,8 @@ Turn off groups of mutually exclusive tags.  Use this to (as an
 exception) assign several tags from such a group.
 @item C-c
 Toggle auto-exit after the next change (see below).
+If you are using expert mode, the first @kbd{C-c} will display the
+selection window.
 @end table
 
 @noindent
@@ -3462,7 +3464,7 @@ after the first change.  If you then occasionally need more keys, press
 (in effect: start selection with @kbd{C-c C-c C-c} instead of @kbd{C-c
 C-c}).  If you set the variable to the value @code{expert}, the special
 window is not even shown for single-key tag selection, it comes up only
-when you press that extra @kbd{C-c}.
+when you press an extra @kbd{C-c}.
 
 @node Tag searches,  , Setting tags, Tags
 @section Tag searches
diff --git a/orgcard.pdf b/orgcard.pdf
index f5fb189..fe4cea5 100644
--- a/orgcard.pdf
+++ b/orgcard.pdf
diff --git a/orgcard.tex b/orgcard.tex
index 7b98484..d44689a 100644
--- a/orgcard.tex
+++ b/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.66}
+\def\orgversionnumber{4.67}
 \def\year{2007}
 %
 %**start of header
@@ -20,7 +20,7 @@
 
 \columnsperpage=3
 
-% Copyright (c) 2004 Philip Rooke, 2005, 2006 Free Software Foundation
+% Copyright (c) 2004, 2005, 2006, 2007 Free Software Foundation
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -61,14 +61,14 @@
 % for their many good ideas.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
-  \centerline{\small \copyright\ 2004, 2005, 2006\ Free Software Foundation, Inc.
+  \centerline{\small \copyright\ 2004, 2005, 2006, 2007\ Free Software Foundation, Inc.
   Permissions on back.  v\orgversionnumber}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 100 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \year}
-\centerline{Author: Philip Rooke}
+\centerline{Authors: Philip Rooke \& Carsten Dominik}
 \centerline{based on refcard design and format by Stephen Gildea}
 
 Permission is granted to make and distribute copies of