diff options
author | krick <antipin.konstantin@googlemail.com> | 2009-05-28 11:17:13 +0200 |
---|---|---|
committer | krick <antipin.konstantin@googlemail.com> | 2009-05-28 11:17:13 +0200 |
commit | e17fdc3aa9dd94252cea8ffe66126c2d29a3bf52 (patch) | |
tree | d268811e01b599bfefd05ee9dc3351613812b722 | |
parent | 59c6574c0519178a2a17fdbe043493542bee69dd (diff) | |
parent | f3953d3b153feb21620e891b3bc955a8a36cd43f (diff) | |
download | org-mode-e17fdc3aa9dd94252cea8ffe66126c2d29a3bf52.tar.gz |
Merge branch 'origin' into clock-effort-notify
47 files changed, 167 insertions, 64 deletions
diff --git a/README_DIST b/README_DIST index a45b76c..0102079 100644 --- a/README_DIST +++ b/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.27a +The version of this release is: 6.27trans The homepage of Org is at http://orgmode.org diff --git a/doc/ChangeLog b/doc/ChangeLog index c5d9c26..c3b37f8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2009-05-27 Carsten Dominik <carsten.dominik@gmail.com> + + * org.texi (Structure editing, TODO basics): Document new + variables. + 2009-05-21 Carsten Dominik <carsten.dominik@gmail.com> * org.texi (Column attributes): Document new colciew operators. diff --git a/doc/org.texi b/doc/org.texi index 1149acb..61c0210 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -3,7 +3,7 @@ @setfilename ../../info/org @settitle The Org Manual -@set VERSION 6.27a +@set VERSION 6.27trans @set DATE May 2009 @c Version and Contact Info @@ -958,7 +958,9 @@ current heading, the new heading is placed after the body instead of before it. This command works from anywhere in the entry. @kindex M-S-@key{RET} @item M-S-@key{RET} -Insert new TODO entry with same level as current heading. +@vindex org-treat-insert-todo-heading-as-state-change +Insert new TODO entry with same level as current heading. See also the +variable @code{org-treat-insert-todo-heading-as-state-change}. @kindex C-S-@key{RET} @item C-S-@key{RET} Insert new TODO entry with same level as current heading. Like @@ -3193,12 +3195,14 @@ more information. @kindex S-@key{right} @kindex S-@key{left} +@vindex org-treat-S-cursor-todo-selection-as-state-change @item S-@key{right} @itemx S-@key{left} Select the following/preceding TODO state, similar to cycling. Useful mostly if more than two TODO states are possible (@pxref{TODO extensions}). See also @ref{Conflicts} for a discussion of the interaction -with @code{shift-selection-mode}. +with @code{shift-selection-mode}. See also the variable +@code{org-treat-S-cursor-todo-selection-as-state-change}. @kindex C-c C-v @kindex C-c / t @cindex sparse tree, for TODO diff --git a/doc/orgcard.tex b/doc/orgcard.tex index 9fa1c11..73b4c34 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{6.27a} +\def\orgversionnumber{6.27trans} \def\versionyear{2009} % latest update \def\year{2009} % latest copyright year @@ -453,6 +453,7 @@ formula, \kbd{:=} a field formula. \key{find next link}{C-c C-x C-n} \key{find previous link}{C-c C-x C-p} \key{edit code snippet of file at point}{C-c '} + {\bf Internal Links} \key{\kbd{<<My Target>>}}{\rm target} @@ -555,11 +556,10 @@ after ``{\tt :}'', and dictionary words elsewhere. \key{capture columns view in dynamic block}{C-c C-x i} \key{quit column view}{q} -\key{next/previous allowed value}{S-left/right} -\key{next/previous allowed value}{n / p} +\key{show full value}{v} \key{edit value}{e} +\metax{next/previous allowed value}{n/p or S-left/right} \key{edit allowed values list}{a} -\key{show value}{v} \key{make column wider/narrower}{> / <} \key{move column left/right}{M-left/right} \key{add new column}{M-S-right} @@ -699,7 +699,7 @@ some other place. \key{export/publish dispatcher}{C-c C-e} \key{export visible part only}{C-c C-e v} -\key{insert template of export options}{C-c C-x t} +\key{insert template of export options}{C-c C-e t} \key{toggle fixed width for entry or region}{C-c :} %{\bf HTML formatting} diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dad4a2d..7ac6578 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2009-05-27 Carsten Dominik <carsten.dominik@gmail.com> + + * org.el (org-treat-insert-todo-heading-as-state-change) + (org-treat-S-cursor-todo-selection-as-state-change): New + variables. + (org-insert-todo-heading): Honor + `org-treat-insert-todo-heading-as-state-change'. + (org-shiftright, org-shiftleft): Honor + `org-treat-S-cursor-todo-selection-as-state-change'. + (org-inhibit-logging): New variable. + 2009-05-23 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-remove-subtree-entries-from-agenda): Reduce diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 9ec2042..51f9fab 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 8bebb71..ef66560 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el index e0eab6e..5870d1b 100644 --- a/lisp/org-ascii.el +++ b/lisp/org-ascii.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 5f439da..836409c 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -4,7 +4,7 @@ ;; Author: John Wiegley <johnw@newartisans.com> ;; Keywords: org data task -;; Version: 6.27a +;; Version: 6.27trans ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index 34b9204..81c4f1b 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -7,7 +7,7 @@ ;; Thomas Baumann <thomas dot baumann at ch dot tum dot de> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index ca6bf95..2d243a2 100644 --- a/lisp/org-bibtex.el +++ b/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.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-clock.el b/lisp/org-clock.el index ab60117..d602005 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el index af12cfd..118e61a 100644 --- a/lisp/org-colview-xemacs.el +++ b/lisp/org-colview-xemacs.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-colview.el b/lisp/org-colview.el index cbc6dc0..c8910f4 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 8d382b1..f04ad0f 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el index 050cb07..a9e56e2 100644 --- a/lisp/org-docbook.el +++ b/lisp/org-docbook.el @@ -4,7 +4,7 @@ ;; ;; Emacs Lisp Archive Entry ;; Filename: org-docbook.el -;; Version: 6.27a +;; Version: 6.27trans ;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com> ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com> ;; Keywords: org, wp, docbook diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 9ce591a..7a28dd3 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 119cbbc..b85b118 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-feed.el b/lisp/org-feed.el index 67bebc4..50f0745 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index d202e81..9556a0d 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el index 71cfdb8..e1783d6 100644 --- a/lisp/org-gnus.el +++ b/lisp/org-gnus.el @@ -7,7 +7,7 @@ ;; Tassilo Horn <tassilo at member dot fsf dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-html.el b/lisp/org-html.el index 185cce6..46be66c 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; @@ -60,11 +60,18 @@ by the footnotes themselves." :type 'string) (defcustom org-export-html-xml-declaration - "<?xml version=\"1.0\" encoding=\"%s\"?>" + '(("html" . "<?xml version=\"1.0\" encoding=\"%s\"?>") + ("php" . "<?php echo '<?xml version=\"1.0\" encoding=\"%s\" ?>'; ?>")) "The extension for exported HTML files. -%s will be replaced with the charset of the exported file." +%s will be replaced with the charset of the exported file. +This may be a string, or an alist with export extensions +and corresponding declarations." :group 'org-export-html - :type 'string) + :type '(choice + (string :tag "Single declaration") + (repeat :tag "Dependent on extension" + (cons (string :tag "Extension") + (string :tag "Declaration"))))) (defcustom org-export-html-style-include-scripts t "Non-nil means, include the javascript snippets in exported HTML files. @@ -696,8 +703,13 @@ lang=\"%s\" xml:lang=\"%s\"> <body> <div id=\"content\"> " - (format org-export-html-xml-declaration - (or charset "iso-8859-1")) + (format + (or (and (stringp org-export-html-xml-declaration) + org-export-html-xml-declaration) + (cdr (assoc html-extension org-export-html-xml-declaration)) + (cdr (assoc "html" org-export-html-xml-declaration)) + (t "")) + (or charset "iso-8859-1")) language language (org-html-expand title) (or charset "iso-8859-1") date author description keywords diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index eab97f4..776487f 100644 --- a/lisp/org-icalendar.el +++ b/lisp/org-icalendar.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-id.el b/lisp/org-id.el index 2e59d84..2aae795 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-info.el b/lisp/org-info.el index 50731e7..db0b52e 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index 5138031..86d0203 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is not yet part of GNU Emacs. ;; diff --git a/lisp/org-irc.el b/lisp/org-irc.el index 51b768a..030e114 100644 --- a/lisp/org-irc.el +++ b/lisp/org-irc.el @@ -4,7 +4,7 @@ ;; ;; Author: Philip Jackson <emacs@shellarchive.co.uk> ;; Keywords: erc, irc, link, org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el index 0291428..439fb88 100644 --- a/lisp/org-jsinfo.el +++ b/lisp/org-jsinfo.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-latex.el b/lisp/org-latex.el index 52e1d3a..0116e44 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -4,7 +4,7 @@ ;; ;; Emacs Lisp Archive Entry ;; Filename: org-latex.el -;; Version: 6.27a +;; Version: 6.27trans ;; Author: Bastien Guerry <bzg AT altern DOT org> ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com> ;; Keywords: org, wp, tex @@ -1549,9 +1549,13 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." ;; Protect LaTeX entities (goto-char (point-min)) - (while (re-search-forward org-latex-entities-regexp nil t) - (add-text-properties (match-beginning 0) (match-end 0) - '(org-protected t))) + (let (a) + (while (re-search-forward org-latex-entities-regexp nil t) + (if (setq a (assoc (match-string 0) org-latex-entities-exceptions)) + (replace-match (org-add-props (nth 1 a) nil 'org-protected t) + t t) + (add-text-properties (match-beginning 0) (match-end 0) + '(org-protected t))))) ;; Replace radio links (goto-char (point-min)) @@ -1731,6 +1735,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." "\\medskip" "\\multicolumn" "\\multiput" + ("\\nbsp" "~") "\\newcommand" "\\newcounter" "\\newenvironment" @@ -1802,9 +1807,14 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." "\\vspace") "A list of LaTeX commands to be protected when performing conversion.") +(defvar org-latex-entities-exceptions nil) + (defconst org-latex-entities-regexp (let (names rest) (dolist (x org-latex-entities) + (when (consp x) + (add-to-list 'org-latex-entities-exceptions x) + (setq x (car x))) (if (string-match "[a-z][A-Z]$" x) (push x names) (push x rest))) diff --git a/lisp/org-list.el b/lisp/org-list.el index 4550b5f..f3d77c2 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -7,7 +7,7 @@ ;; Bastien Guerry <bzg AT altern DOT org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el index db29fa1..17d142e 100644 --- a/lisp/org-mac-message.el +++ b/lisp/org-mac-message.el @@ -5,7 +5,7 @@ ;; Author: John Wiegley <johnw@gnu.org> ;; Christopher Suckling <suckling at gmail dot com> -;; Version: 6.27a +;; Version: 6.27trans ;; Keywords: outlines, hypermedia, calendar, wp ;; This file is part of GNU Emacs. diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 14e004d..9692d3f 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mew.el b/lisp/org-mew.el index 92c25b0..2bee4e1 100644 --- a/lisp/org-mew.el +++ b/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.27a +;; Version: 6.27trans ;; This file is part of GNU Emacs. diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el index 88010e8..daf91bc 100644 --- a/lisp/org-mhe.el +++ b/lisp/org-mhe.el @@ -6,7 +6,7 @@ ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 37452e8..9b1f456 100644 --- a/lisp/org-mouse.el +++ b/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.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-plot.el b/lisp/org-plot.el index 4441717..c7136ea 100644 --- a/lisp/org-plot.el +++ b/lisp/org-plot.el @@ -5,7 +5,7 @@ ;; Author: Eric Schulte <schulte dot eric at gmail dot com> ;; Keywords: tables, plotting ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index d036d0f..8f4fd46 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -10,7 +10,7 @@ ;; ;; ;; Filename: org-protocol.el -;; Version: 6.27a +;; Version: 6.27trans ;; Author: Bastien Guerry <bzg AT altern DOT org> ;; Author: Daniel M German <dmg AT uvic DOT org> ;; Author: Sebastian Rose <sebastian_rose AT gmx DOT de> diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 3eca824..53a6e02 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -4,7 +4,7 @@ ;; Author: David O'Toole <dto@gnu.org> ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com> ;; Keywords: hypermedia, outlines, wp -;; Version: 6.27a +;; Version: 6.27trans ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-remember.el b/lisp/org-remember.el index df6fcf1..b0039fa 100644 --- a/lisp/org-remember.el +++ b/lisp/org-remember.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el index 71148ba..7327c2e 100644 --- a/lisp/org-rmail.el +++ b/lisp/org-rmail.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-table.el b/lisp/org-table.el index 5712c67..414e863 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 82d0536..2683b6f 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-vm.el b/lisp/org-vm.el index 0f9b350..6eab6f3 100644 --- a/lisp/org-vm.el +++ b/lisp/org-vm.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el index 06300f0..3effbf4 100644 --- a/lisp/org-w3m.el +++ b/lisp/org-w3m.el @@ -5,7 +5,7 @@ ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-wl.el b/lisp/org-wl.el index 1bac3e4..6e9b5e1 100644 --- a/lisp/org-wl.el +++ b/lisp/org-wl.el @@ -6,7 +6,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.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-xoxo.el b/lisp/org-xoxo.el index 1358d37..ed73bdb 100644 --- a/lisp/org-xoxo.el +++ b/lisp/org-xoxo.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org.el b/lisp/org.el index 93c7d8a..bc81a95 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.27a +;; Version: 6.27trans ;; ;; This file is part of GNU Emacs. ;; @@ -94,7 +94,7 @@ ;;; Version -(defconst org-version "6.27a" +(defconst org-version "6.27trans" "The version number of the file org.el.") (defun org-version (&optional here) @@ -1817,6 +1817,22 @@ to change is while Emacs is running is through the customize interface." :group 'org-todo :type 'boolean) +(defcustom org-treat-insert-todo-heading-as-state-change nil + "Non-nil means, inserting a TODO heading is treated as state change. +So when the command \\[org-insert-todo-heading] is used, state change +logging will apply if appropriate. When nil, the new TODO item will +be inserted directly, and no logging will take place." + :group 'org-todo + :type 'boolean) + +(defcustom org-treat-S-cursor-todo-selection-as-state-change t + "Non-nil means, switching TODO states with S-cursor counts as state change. +This is the default behavior. However, setting this to nil allows a +convenient way to select a TODO state and bypass any logging associated +with that." + :group 'org-todo + :type 'boolean) + (defcustom org-todo-state-tags-triggers nil "Tag changes that should be triggered by TODO state changes. This is a list. Each entry is @@ -3811,6 +3827,7 @@ This variable is set by `org-before-change-function'. "Mode hook for Org-mode, run after the mode was turned on.") (defvar org-inhibit-startup nil) ; Dynamically-scoped param. (defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. +(defvar org-inhibit-logging nil) ; Dynamically-scoped param. (defvar org-table-buffer-is-an nil) (defconst org-outline-regexp "\\*+ ") @@ -5495,7 +5512,9 @@ state (TODO by default). Also with prefix arg, force first state." new-mark-x))) (beginning-of-line 1) (and (looking-at "\\*+ ") (goto-char (match-end 0)) - (insert new-mark " "))) + (if org-treat-insert-todo-heading-as-state-change + (org-todo new-mark) + (insert new-mark " ")))) (when org-provide-todo-statistics (org-update-parent-todo-statistics)))) @@ -6815,6 +6834,14 @@ major mode, for example with \[normal-mode]." '([(meta shift down)] org-shiftmetadown) '([(meta shift left)] org-shiftmetaleft) '([(meta shift right)] org-shiftmetaright) + '([?\e (up)] org-metaup) + '([?\e (down)] org-metadown) + '([?\e (left)] org-metaleft) + '([?\e (right)] org-metaright) + '([?\e (shift up)] org-shiftmetaup) + '([?\e (shift down)] org-shiftmetadown) + '([?\e (shift left)] org-shiftmetaleft) + '([?\e (shift right)] org-shiftmetaright) '([(shift up)] org-shiftup) '([(shift down)] org-shiftdown) '([(shift left)] org-shiftleft) @@ -6848,6 +6875,16 @@ major mode, for example with \[normal-mode]." (orgstruct-make-binding 'org-insert-todo-heading 107 [(meta return)] "\M-\C-m")) + (org-defkey orgstruct-mode-map "\e\C-m" + (orgstruct-make-binding 'org-insert-heading 108 + "\e\C-m" [?\e (return)])) + (org-defkey orgstruct-mode-map [?\e (return)] + (orgstruct-make-binding 'org-insert-heading 109 + [?\e (return)] "\e\C-m")) + (org-defkey orgstruct-mode-map [?\e (shift return)] + (orgstruct-make-binding 'org-insert-todo-heading 110 + [?\e (return)] "\e\C-m")) + (unless org-local-vars (setq org-local-vars (org-get-local-variables))) @@ -9120,6 +9157,7 @@ Each function takes arguments (NEW-MARK OLD-MARK) and returns either `nil' or a string to be used for the todo mark." ) (defvar org-agenda-headline-snapshot-before-repeat) + (defun org-todo (&optional arg) "Change the TODO state of an item. The state of an item is given by a keyword at the start of the heading, @@ -9278,6 +9316,7 @@ For calling through lisp, arg is also interpreted in the following way: (not (member this org-done-keywords)))) (and logging (org-local-logging logging)) (when (and (or org-todo-log-states org-log-done) + (not org-inhibit-logging) (not (memq arg '(nextset previousset)))) ;; we need to look at recording a time and note (setq dolog (or (nth 1 (assoc state org-todo-log-states)) @@ -12231,6 +12270,18 @@ user." (org-defkey minibuffer-local-map [(meta shift down)] (lambda () (interactive) (org-eval-in-calendar '(calendar-forward-year 1)))) + (org-defkey minibuffer-local-map [?\e (shift left)] + (lambda () (interactive) + (org-eval-in-calendar '(calendar-backward-month 1)))) + (org-defkey minibuffer-local-map [?\e (shift right)] + (lambda () (interactive) + (org-eval-in-calendar '(calendar-forward-month 1)))) + (org-defkey minibuffer-local-map [?\e (shift up)] + (lambda () (interactive) + (org-eval-in-calendar '(calendar-backward-year 1)))) + (org-defkey minibuffer-local-map [?\e (shift down)] + (lambda () (interactive) + (org-eval-in-calendar '(calendar-forward-year 1)))) (org-defkey minibuffer-local-map [(shift up)] (lambda () (interactive) (org-eval-in-calendar '(calendar-backward-week 1)))) @@ -13952,7 +14003,13 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." (org-defkey org-mode-map [?\C-c (left)] 'org-shiftleft) (org-defkey org-mode-map [?\C-c (right)] 'org-shiftright) (org-defkey org-mode-map [?\C-c ?\C-x (right)] 'org-shiftcontrolright) - (org-defkey org-mode-map [?\C-c ?\C-x (left)] 'org-shiftcontrolleft)) + (org-defkey org-mode-map [?\C-c ?\C-x (left)] 'org-shiftcontrolleft) + (org-defkey org-mode-map [?\e (tab)] 'org-complete) + (org-defkey org-mode-map [?\e (shift return)] 'org-insert-todo-heading) + (org-defkey org-mode-map [?\e (shift left)] 'org-shiftmetaleft) + (org-defkey org-mode-map [?\e (shift right)] 'org-shiftmetaright) + (org-defkey org-mode-map [?\e (shift up)] 'org-shiftmetaup) + (org-defkey org-mode-map [?\e (shift down)] 'org-shiftmetadown)) ;; All the other keys @@ -14475,7 +14532,9 @@ Depending on context, this does one of the following: ((org-at-timestamp-p t) (call-interactively 'org-timestamp-up-day)) ((and (not (eq org-support-shift-select 'always)) (org-on-heading-p)) - (org-call-with-arg 'org-todo 'right)) + (let ((org-inhibit-logging + (not org-treat-S-cursor-todo-selection-as-state-change))) + (org-call-with-arg 'org-todo 'right))) ((or (and org-support-shift-select (not (eq org-support-shift-select 'always)) (org-at-item-bullet-p)) @@ -14505,7 +14564,9 @@ Depending on context, this does one of the following: ((org-at-timestamp-p t) (call-interactively 'org-timestamp-down-day)) ((and (not (eq org-support-shift-select 'always)) (org-on-heading-p)) - (org-call-with-arg 'org-todo 'left)) + (let ((org-inhibit-logging + (not org-treat-S-cursor-todo-selection-as-state-change))) + (org-call-with-arg 'org-todo 'left))) ((or (and org-support-shift-select (not (eq org-support-shift-select 'always)) (org-at-item-bullet-p)) |