From c7cf0ebc24d66371c8d48ad72f65e72a2a027f06 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 15:27:18 +0100 Subject: Merge Org 7.9.3 (commit 31c1aea) --- doc/misc/ChangeLog | 12 ++++++++++++ doc/misc/org.texi | 57 +++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 51 insertions(+), 18 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 68b0c31916d..08e8cc3614a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,15 @@ +2013-01-08 Bastien Guerry + + * org.texi (Pushing to MobileOrg): Add footnote about using + symbolic links in `org-directory'. + (Timestamps, Deadlines and scheduling): Use `diary-float' instead + of the now obsolete alias `org-float'. + (TODO basics): Add `org-use-fast-todo-selection' to the variable + index. Fix description of TODO keywords cycling. + (Advanced features): Add missing argument for @item. + (Storing searches): Add index entries and a note about + *-tree agenda views. + 2013-01-06 Andreas Schwab * autotype.texi: Remove undefined command @subtitlefont. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 47ee0954671..3540ac8592a 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2,7 +2,7 @@ @c %**start of header @setfilename ../../info/org @settitle The Org Manual -@set VERSION 7.9.2 (GNU Emacs 24.3) +@set VERSION 7.9.3 (GNU Emacs 24.3) @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 @@ -3747,6 +3747,8 @@ The most important commands to work with TODO entries are: @table @kbd @orgcmd{C-c C-t,org-todo} @cindex cycling, of TODO states +@vindex org-use-fast-todo-selection + Rotate the TODO state of the current item among @example @@ -3754,14 +3756,19 @@ Rotate the TODO state of the current item among '--------------------------------' @end example -The same rotation can also be done ``remotely'' from the timeline and -agenda buffers with the @kbd{t} command key (@pxref{Agenda commands}). +If TODO keywords have fast access keys (see @ref{Fast access to TODO +states}), you will be prompted for a TODO keyword through the fast selection +interface; this is the default behavior when +@var{org-use-fast-todo-selection} is @code{non-nil}. + +The same rotation can also be done ``remotely'' from the timeline and agenda +buffers with the @kbd{t} command key (@pxref{Agenda commands}). @orgkey{C-u C-c C-t} -Select a specific keyword using completion or (if it has been set up) -the fast selection interface. For the latter, you need to assign keys -to TODO states, see @ref{Per-file keywords}, and @ref{Setting tags}, for -more information. +When TODO keywords have no selection keys, select a specific keyword using +completion; otherwise force cycling through TODO states with no prompt. When +@var{org-use-fast-todo-selection} is set to @code{prefix}, use the fast +selection interface. @kindex S-@key{right} @kindex S-@key{left} @@ -5512,7 +5519,7 @@ example with optional time @example * 22:00-23:00 The nerd meeting on every 2nd Thursday of the month - <%%(org-float t 4 2)> + <%%(diary-float t 4 2)> @end example @item Time/Date range @@ -5850,7 +5857,7 @@ entries. Org mode will issue early and late warnings based on the assumption that the timestamp represents the @i{nearest instance} of the repeater. However, the use of diary sexp entries like @c -@code{<%%(org-float t 42)>} +@code{<%%(diary-float t 42)>} @c in scheduling and deadline timestamps is limited. Org mode does not know enough about the internals of each sexp function to issue early and @@ -6539,7 +6546,7 @@ suggestion.} for capturing new material. @table @kbd @orgcmd{C-c c,org-capture} Call the command @code{org-capture}. Note that this keybinding is global and -not active by default; you need to install it. If you have templates +not active by default: you need to install it. If you have templates @cindex date tree defined @pxref{Capture templates}, it will offer these templates for selection or use a new Org outline node as the default template. It will @@ -8621,6 +8628,13 @@ buffer, or a sparse tree (the latter covering of course only the current buffer). @kindex C-c a C @vindex org-agenda-custom-commands +@cindex agenda views, main example +@cindex tags, as an agenda view +@cindex todo, as an agenda view +@cindex tags-todo +@cindex todo-tree +@cindex occur-tree +@cindex tags-tree Custom commands are configured in the variable @code{org-agenda-custom-commands}. You can customize this variable, for @@ -8681,6 +8695,9 @@ additional key (@kbd{l}, @kbd{p} or @kbd{k}) to select a name (Lisa, Peter, or Kim) as additional tag to match. @end table +Note that the @code{*-tree} agenda views need to be called from an +Org buffer as they operate on the current buffer only. + @node Block agenda, Setting Options, Storing searches, Custom agenda views @subsection Block agenda @cindex block agenda @@ -16537,14 +16554,18 @@ to the directory @code{org-mobile-directory}. By default this list contains all agenda files (as listed in @code{org-agenda-files}), but additional files can be included by customizing @code{org-mobile-files}. File names will be staged with paths relative to @code{org-directory}, so all files should be -inside this directory. The push operation also creates a special Org file -@file{agendas.org} with all custom agenda view defined by the -user@footnote{While creating the agendas, Org mode will force ID properties -on all referenced entries, so that these entries can be uniquely identified -if @i{MobileOrg} flags them for further action. If you do not want to get -these properties in so many entries, you can set the variable -@code{org-mobile-force-id-on-agenda-items} to @code{nil}. Org mode will then -rely on outline paths, in the hope that these will be unique enough.}. +inside this directory@footnote{Symbolic links in @code{org-directory} need to +have the same name than their targets.}. + +The push operation also creates a special Org file @file{agendas.org} with +all custom agenda view defined by the user@footnote{While creating the +agendas, Org mode will force ID properties on all referenced entries, so that +these entries can be uniquely identified if @i{MobileOrg} flags them for +further action. If you do not want to get these properties in so many +entries, you can set the variable @code{org-mobile-force-id-on-agenda-items} +to @code{nil}. Org mode will then rely on outline paths, in the hope that +these will be unique enough.}. + Finally, Org writes the file @file{index.org}, containing links to all other files. @i{MobileOrg} first reads this file from the server, and then downloads all agendas and Org files listed in it. To speed up the download, -- cgit v1.2.1 From 6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 16:31:30 +0100 Subject: Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog. --- doc/misc/ChangeLog | 3 +++ doc/misc/org.texi | 26 +++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 08e8cc3614a..8d88336183d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -9,6 +9,9 @@ (Advanced features): Add missing argument for @item. (Storing searches): Add index entries and a note about *-tree agenda views. + (Structure editing): Document `org-mark-element' and + `org-mark-subtree'. + (Tag inheritance): Document `org-agenda-use-tag-inheritance'. 2013-01-06 Andreas Schwab diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 3540ac8592a..39577a33131 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2,7 +2,8 @@ @c %**start of header @setfilename ../../info/org @settitle The Org Manual -@set VERSION 7.9.3 (GNU Emacs 24.3) + +@include org-version.inc @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 @@ -262,7 +263,7 @@ @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004--2013 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1470,6 +1471,13 @@ Move subtree up (swap with previous subtree of same level). @orgcmd{M-S-@key{down},org-move-subtree-down} Move subtree down (swap with next subtree of same level). +@orgcmd{M-h,org-mark-element} +Mark the element at point. Hitting repeatedly will mark subsequent elements +of the one just marked. E.g. hitting @key{M-h} on a paragraph will mark it, +hitting @key{M-h} immediately again will mark the next one. +@orgcmd{C-c @@,org-mark-subtree} +Mark the subtree at point. Hitting repeatedly will mark subsequent subtrees +of the same level than the marked subtree. @orgcmd{C-c C-x C-w,org-cut-subtree} Kill subtree, i.e., remove it from buffer but save in kill ring. With a numeric prefix argument N, kill N sequential subtrees. @@ -4624,9 +4632,8 @@ changes in the line.}: @noindent @vindex org-use-tag-inheritance @vindex org-tags-exclude-from-inheritance -To limit tag inheritance to specific tags, or to turn it off entirely, use -the variables @code{org-use-tag-inheritance} and -@code{org-tags-exclude-from-inheritance}. +To limit tag inheritance to specific tags, use @code{org-tags-exclude-from-inheritance}. +To turn it off entirely, use @code{org-use-tag-inheritance}. @vindex org-tags-match-list-sublevels When a headline matches during a tags search while tag inheritance is turned @@ -4637,6 +4644,15 @@ of matches may then become very long. If you only want to see the first tags match in a subtree, configure the variable @code{org-tags-match-list-sublevels} (not recommended). +@vindex org-agenda-use-tag-inheritance +Tag inheritance is relevant when the agenda search tries to match a tag, +either in the @code{tags} or @code{tags-todo} agenda types. In other agenda +types, @code{org-use-tag-inheritance} has no effect. Still, you may want to +have your tags correctly set in the agenda, so that tag filtering works fine, +with inherited tags. Set @code{org-agenda-use-tag-inheritance} to control +this: the default value includes all agenda types, but setting this to nil +can really speed up agenda generation. + @node Setting tags, Tag searches, Tag inheritance, Tags @section Setting tags @cindex setting tags -- cgit v1.2.1 From d576dd9bde77c398779645ff7f369f7c345106c0 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 17:56:58 +0100 Subject: doc/misc/org.texi: Fix version number --- doc/misc/org.texi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 39577a33131..93efa8e0a8d 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2,8 +2,7 @@ @c %**start of header @setfilename ../../info/org @settitle The Org Manual - -@include org-version.inc +@set VERSION 7.9.3+ (GNU Emacs 24.3) @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 -- cgit v1.2.1 From 04c285b2644d4fc551c907365a574ebbfd260b23 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 23:02:09 +0100 Subject: Fixes related to the last Org merge. --- doc/misc/org.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 93efa8e0a8d..75298db29fe 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -262,7 +262,7 @@ @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004--2012 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document -- cgit v1.2.1 From 677d5c928c0da0fd0b3172d2ea023bc73777a06c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Jan 2013 00:17:47 -0800 Subject: Spelling fixes. * lisp/net/tramp-adb.el (tramp-adb-get-toolbox): Fix misspelling of 'unknown'. --- doc/misc/htmlfontify.texi | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'doc') diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 911cdd3cd5f..6cb8942bf15 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -7,7 +7,7 @@ @copying This manual documents Htmlfontify, a source code -> crosslinked + -formatted + syntax colorised html transformer. +formatted + syntax colorized html transformer. Copyright @copyright{} 2002, 2003, 2013 Free Software Foundation, Inc. @@ -56,7 +56,7 @@ modify this GNU manual.'' @menu * Introduction:: About Htmlfontify. * Usage & Examples:: How to use Htmlfontify. -* Customisation:: Fine-tuning Htmlfontify's behaviour. +* Customization:: Fine-tuning Htmlfontify's behaviour. * Requirements:: External programs used by Htmlfontify. * GNU Free Documentation License:: The license for this documentation. * Index:: Index of contents. @@ -68,7 +68,7 @@ modify this GNU manual.'' Htmlfontify provides a means of converting individual Emacs buffers, source files, or entire source trees to html, preserving formatting -and Emacs colorisation / syntax highlighting as much as possible +and Emacs colorization / syntax highlighting as much as possible through careful application of CSS stylesheets and html tags. It can also turn instances of functions, methods and (for some @@ -76,7 +76,7 @@ languages) variables and other constructs and items into links to their definitions, and create an index file (or files) of all such symbols, also linked to their points of definition. -Htmlfontify also provides several customisation items, which should +Htmlfontify also provides several customization items, which should allow it to mesh more-or-less seamlessly with various templating or publishing systems (in the event, for instance, that you don't want to produce the html pages directly). @@ -93,7 +93,7 @@ batch mode. @menu * Interactive:: Using Htmlfontify interactively. * Non-interactive:: Using Htmlfontify from elisp. -* Variables:: Variables (other than customisation entries). +* Variables:: Variables (other than customization entries). * Data Structures:: Important data structures. * Examples:: Example(s) of Htmlfontify in use. @end menu @@ -236,7 +236,7 @@ color map specified, otherwise it uses Htmlfontify's built in map. @end lisp Return a @code{defface} style alist of possible specifications for -@var{face}, with any entries resulting from user customisation +@var{face}, with any entries resulting from user customization (@code{custom-set-faces}) taking precedence. See also: @ref{hfy-default-face-def} @@ -268,10 +268,10 @@ does things like deferring fontification until a section of the buffer is exposed and rendered, or until Emacs is idle for a while. Sometimes, in non-interactive circumstances, or if it can't see X, it doesn't bother with some of the harder stuff. While this is all great from the perspective -of a user waiting for Emacs to load a 20000 line file and colorise it, +of a user waiting for Emacs to load a 20000 line file and colorize it, it's a pain from the point of view from non-interactive code. This function lies, cheats, steals and generally bullies Emacs into fontifying a buffer -from start to finish, with all the extra frills, whether it thinks it nneds +from start to finish, with all the extra frills, whether it thinks it needs to or not. Oh yes: it operates on the current buffer. @item hfy-link-style-string @@ -861,7 +861,7 @@ As per @ref{hfy-color} but for background colors. (hfy-kludge-cperl-mode) @end lisp -cperl mode does its damndest not to do some of its fontification when not +cperl mode does its best to not do some of its fontification when not in a windowing system---we try to trick it@dots{} @item hfy-href @@ -1044,7 +1044,7 @@ Convert an Emacs @code{:width} attribute to a CSS font-stretch attribute. @section Variables @cindex variables -Important variables that are not customisation items: +Important variables that are not customization items: @table @code @@ -1234,7 +1234,7 @@ main-content <=MAIN_CONTENT;\n" rtfm-section file style rtfm-section file)) ;; Here's the function I actually call---it asks me for a section label, ;; and source and destination directories, and then binds a couple of -;; customisation variable in a let before calling htmlfontify: +;; customization variable in a let before calling htmlfontify: (defun rtfm-build-source-docs (section srcdir destdir) (interactive "s section[eg- emacs / p4-blame]:\nD source-dir: \nD output-dir: ") @@ -1252,11 +1252,11 @@ main-content <=MAIN_CONTENT;\n" rtfm-section file style rtfm-section file)) (htmlfontify-copy-and-link-dir srcdir destdir ".src" ".html"))) @end lisp -@node Customisation -@chapter Customisation -@cindex variables (customisation) +@node Customization +@chapter Customization +@cindex variables (customization) -Htmlfontify provides the following variable and customisation entries: +Htmlfontify provides the following variable and customization entries: @table @code @comment AUTOGENERATED BLOCK @@ -1394,7 +1394,7 @@ when @ref{hfy-display-class} has been set (the normal Htmlfontify way of extracting potentially non-current face information doesn't necessarily work for @code{default}). -For example, I customise this to: +For example, I customize this to: @lisp ((t :background "black" :foreground "white" :family "misc-fixed")) @@ -1405,7 +1405,7 @@ For example, I customise this to: @anchor{hfy-init-kludge-hooks} List of functions to call when starting htmlfontify-buffer to do any -kludging necessary to get highlighting modes to bahave as you want, even +kludging necessary to get highlighting modes to behave as you want, even when not running under a window system. @item hfy-shell-file-name @@ -1421,7 +1421,7 @@ Currently this is only required/used when using GNU etags, see @vindex hfy-optimisations @anchor{hfy-optimisations} -Optimisations to turn on. So far, the following have been implemented: +Optimizations to turn on. So far, the following have been implemented: @table @option @item merge-adjacent-tags @@ -1454,7 +1454,8 @@ Suppress hyperlinking between files highlighted by different modes. @end table -Note: like compiler optimisations, these optimise the _output_ of the code, +Note: like compiler optimizations, these optimize the @emph{output} of +the code, not the processing of the source itself, and are therefore likely to slow Htmlfontify down, at least a little. Except for skip-refontification, which can never slow you down, but may result in incomplete fontification. @@ -1470,7 +1471,7 @@ Regex to remove from the