aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorCarsten Dominik2008-11-24 12:17:46 +0000
committerCarsten Dominik2008-11-24 12:17:46 +0000
commitd60b1ba1dca0d6f7274f18f557babc78c930c38f (patch)
tree68df020c4d8e2297a8f5adda1d840cac92d8ceaa /doc
parentd95a8199043fd99ee5d5d36a5ab66c76967fc87d (diff)
downloademacs-d60b1ba1dca0d6f7274f18f557babc78c930c38f.tar.gz
emacs-d60b1ba1dca0d6f7274f18f557babc78c930c38f.zip
2008-11-24 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-get-closed): Re-apply changes accidentially overwritten by last commit to Emacs. * org.el (org-outline-path-complete-in-steps): New option. (org-refile-get-location): Honor `org-outline-path-complete-in-steps'. (org-agenda-change-all-lines, org-tags-sparse-tree) (org-time-string-to-absolute, org-small-year-to-year) (org-link-escape): Re-apply changes accidentially overwritten by last commit to Emacs.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/org.texi14
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ec9a85a5974..1b635720f0a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12008-11-24 Carsten Dominik <dominik@science.uva.nl>
2
3 * org.texi: re-apply change to FDL 1.3.
4
12008-11-23 Carsten Dominik <dominik@science.uva.nl> 52008-11-23 Carsten Dominik <dominik@science.uva.nl>
2 6
3 * org.texi (Setting up Remember): Document `org-remember-mode'. 7 * org.texi (Setting up Remember): Document `org-remember-mode'.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index faac6b95331..8f2620ad5db 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3,7 +3,7 @@
3@setfilename ../../info/org 3@setfilename ../../info/org
4@settitle The Org Manual 4@settitle The Org Manual
5 5
6@set VERSION 6.13 6@set VERSION 6.13a
7@set DATE November 2008 7@set DATE November 2008
8 8
9@dircategory Emacs 9@dircategory Emacs
@@ -39,7 +39,7 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
39 39
40@quotation 40@quotation
41Permission is granted to copy, distribute and/or modify this document 41Permission is granted to copy, distribute and/or modify this document
42under the terms of the GNU Free Documentation License, Version 1.2 or 42under the terms of the GNU Free Documentation License, Version 1.3 or
43any later version published by the Free Software Foundation; with no 43any later version published by the Free Software Foundation; with no
44Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' 44Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
45and with the Back-Cover Texts as in (a) below. A copy of the license 45and with the Back-Cover Texts as in (a) below. A copy of the license
@@ -868,6 +868,7 @@ u @r{One level up.}
8680-9 @r{Digit argument.} 8680-9 @r{Digit argument.}
869q @r{Quit} 869q @r{Quit}
870@end example 870@end example
871See also the variable@code{org-goto-interface}.
871@end table 872@end table
872 873
873@node Structure editing, Archiving, Motion, Document Structure 874@node Structure editing, Archiving, Motion, Document Structure
@@ -5206,13 +5207,14 @@ special command:
5206Refile the entry or region at point. This command offers possible locations 5207Refile the entry or region at point. This command offers possible locations
5207for refiling the entry and lets you select one with completion. The item (or 5208for refiling the entry and lets you select one with completion. The item (or
5208all items in the region) is filed below the target heading as a subitem. 5209all items in the region) is filed below the target heading as a subitem.
5209Depending on @code{org-reverse-note-order}, it will be either the first of 5210Depending on @code{org-reverse-note-order}, it will be either the first or
5210last subitem.@* 5211last subitem.@*
5211By default, all level 1 headlines in the current buffer are considered to be 5212By default, all level 1 headlines in the current buffer are considered to be
5212targets, but you can have more complex definitions across a number of files. 5213targets, but you can have more complex definitions across a number of files.
5213See the variable @code{org-refile-targets} for details. If you would like to 5214See the variable @code{org-refile-targets} for details. If you would like to
5214select a location via a file-pathlike completion along the outline path, see 5215select a location via a file-path-like completion along the outline path, see
5215the variable @code{org-refile-use-outline-path}. 5216the variables @code{org-refile-use-outline-path} and
5217@code{org-outline-path-complete-in-steps}.
5216@kindex C-u C-c C-w 5218@kindex C-u C-c C-w
5217@item C-u C-c C-w 5219@item C-u C-c C-w
5218Use the refile interface to jump to a heading. 5220Use the refile interface to jump to a heading.
@@ -8990,7 +8992,7 @@ go to @url{http://orgmode.org} to get access to these modules.
8990 exactly point to the definition location of a variable of function. 8992 exactly point to the definition location of a variable of function.
8991@item @file{org-eval.el} by @i{Carsten Dominik} 8993@item @file{org-eval.el} by @i{Carsten Dominik}
8992 The @code{<lisp>} tag, adapted from Emacs Wiki and Emacs Muse, allows 8994 The @code{<lisp>} tag, adapted from Emacs Wiki and Emacs Muse, allows
8993 to include text in a document that is the result of evaluating some 8995 text to be included in a document that is the result of evaluating some
8994 code. Other scripting languages like @code{perl} can be supported with 8996 code. Other scripting languages like @code{perl} can be supported with
8995 this package as well. 8997 this package as well.
8996@item @file{org-eval-light.el} by @i{Eric Schulte} 8998@item @file{org-eval-light.el} by @i{Eric Schulte}