mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
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.
This commit is contained in:
parent
d95a819904
commit
d60b1ba1dc
@ -1,3 +1,7 @@
|
||||
2008-11-24 Carsten Dominik <dominik@science.uva.nl>
|
||||
|
||||
* org.texi: re-apply change to FDL 1.3.
|
||||
|
||||
2008-11-23 Carsten Dominik <dominik@science.uva.nl>
|
||||
|
||||
* org.texi (Setting up Remember): Document `org-remember-mode'.
|
||||
|
@ -3,7 +3,7 @@
|
||||
@setfilename ../../info/org
|
||||
@settitle The Org Manual
|
||||
|
||||
@set VERSION 6.13
|
||||
@set VERSION 6.13a
|
||||
@set DATE November 2008
|
||||
|
||||
@dircategory Emacs
|
||||
@ -39,7 +39,7 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
|
||||
|
||||
@quotation
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
under the terms of the GNU Free Documentation License, Version 1.2 or
|
||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||
any later version published by the Free Software Foundation; with no
|
||||
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
|
||||
and with the Back-Cover Texts as in (a) below. A copy of the license
|
||||
@ -868,6 +868,7 @@ u @r{One level up.}
|
||||
0-9 @r{Digit argument.}
|
||||
q @r{Quit}
|
||||
@end example
|
||||
See also the variable@code{org-goto-interface}.
|
||||
@end table
|
||||
|
||||
@node Structure editing, Archiving, Motion, Document Structure
|
||||
@ -5206,13 +5207,14 @@ special command:
|
||||
Refile the entry or region at point. This command offers possible locations
|
||||
for refiling the entry and lets you select one with completion. The item (or
|
||||
all items in the region) is filed below the target heading as a subitem.
|
||||
Depending on @code{org-reverse-note-order}, it will be either the first of
|
||||
Depending on @code{org-reverse-note-order}, it will be either the first or
|
||||
last subitem.@*
|
||||
By default, all level 1 headlines in the current buffer are considered to be
|
||||
targets, but you can have more complex definitions across a number of files.
|
||||
See the variable @code{org-refile-targets} for details. If you would like to
|
||||
select a location via a file-pathlike completion along the outline path, see
|
||||
the variable @code{org-refile-use-outline-path}.
|
||||
select a location via a file-path-like completion along the outline path, see
|
||||
the variables @code{org-refile-use-outline-path} and
|
||||
@code{org-outline-path-complete-in-steps}.
|
||||
@kindex C-u C-c C-w
|
||||
@item C-u C-c C-w
|
||||
Use the refile interface to jump to a heading.
|
||||
@ -8990,7 +8992,7 @@ go to @url{http://orgmode.org} to get access to these modules.
|
||||
exactly point to the definition location of a variable of function.
|
||||
@item @file{org-eval.el} by @i{Carsten Dominik}
|
||||
The @code{<lisp>} tag, adapted from Emacs Wiki and Emacs Muse, allows
|
||||
to include text in a document that is the result of evaluating some
|
||||
text to be included in a document that is the result of evaluating some
|
||||
code. Other scripting languages like @code{perl} can be supported with
|
||||
this package as well.
|
||||
@item @file{org-eval-light.el} by @i{Eric Schulte}
|
||||
|
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -3398,7 +3398,7 @@ the documentation of `org-diary'."
|
||||
(push txt ee))))
|
||||
(nreverse ee)))
|
||||
|
||||
(defalias 'org-get-closed 'org-get-progress)
|
||||
(defalias 'org-get-closed 'org-agenda-get-progress)
|
||||
(defun org-agenda-get-progress ()
|
||||
"Return the logged TODO entries for agenda display."
|
||||
(let* ((props (list 'mouse-face 'highlight
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: John Wiegley <johnw@newartisans.com>
|
||||
;; Keywords: org data task
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Emacs Lisp Archive Entry
|
||||
;; Filename: org-export-latex.el
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;; Author: Bastien Guerry <bzg AT altern DOT org>
|
||||
;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
|
||||
;; Keywords: org, wp, tex
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -6,7 +6,7 @@
|
||||
;; Tassilo Horn <tassilo at member dot fsf dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -4,7 +4,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
|
||||
;; Keywords: erc, irc, link, org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -6,7 +6,7 @@
|
||||
;; Bastien Guerry <bzg AT altern DOT org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -3,7 +3,7 @@
|
||||
;; Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: John Wiegley <johnw@gnu.org>
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
|
||||
;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -144,7 +144,7 @@
|
||||
(defvar org-agenda-undo-list)
|
||||
(defvar org-agenda-custom-commands)
|
||||
(declare-function org-agenda-change-all-lines "org-agenda"
|
||||
(newhead hdmarker &optional fixface))
|
||||
(newhead hdmarker &optional fixface just-this))
|
||||
(declare-function org-verify-change-for-undo "org-agenda" (l1 l2))
|
||||
|
||||
(defvar org-mouse-plain-list-regexp "\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) "
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
|
||||
;; Keywords: tables, plotting
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -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.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.13
|
||||
;; Version: 6.13a
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -92,7 +92,7 @@
|
||||
|
||||
;;; Version
|
||||
|
||||
(defconst org-version "6.13"
|
||||
(defconst org-version "6.13a"
|
||||
"The version number of the file org.el.")
|
||||
|
||||
(defun org-version (&optional here)
|
||||
@ -1245,7 +1245,7 @@ For more examples, see the system specific constants
|
||||
|
||||
(defgroup org-refile nil
|
||||
"Options concerning refiling entries in Org-mode."
|
||||
:tag "Org Remember"
|
||||
:tag "Org Refile"
|
||||
:group 'org)
|
||||
|
||||
(defcustom org-directory "~/org"
|
||||
@ -1275,7 +1275,8 @@ outline The interface shows an outline of the relevant file
|
||||
and the correct heading is found by moving through
|
||||
the outline or by searching with incremental search.
|
||||
outline-path-completion Headlines in the current buffer are offered via
|
||||
completion."
|
||||
completion. This is the interface also used by
|
||||
the refile command."
|
||||
:group 'org-refile
|
||||
:type '(choice
|
||||
(const :tag "Outline" outline)
|
||||
@ -1287,6 +1288,7 @@ When nil, new notes will be filed to the end of a file or entry.
|
||||
This can also be a list with cons cells of regular expressions that
|
||||
are matched against file names, and values."
|
||||
:group 'org-remember
|
||||
:group 'org-refile
|
||||
:type '(choice
|
||||
(const :tag "Reverse always" t)
|
||||
(const :tag "Reverse never" nil)
|
||||
@ -1314,7 +1316,7 @@ This is list of cons cells. Each cell contains:
|
||||
|
||||
When this variable is nil, all top-level headlines in the current buffer
|
||||
are used, equivalent to the value `((nil . (:level . 1))'."
|
||||
:group 'org-remember
|
||||
:group 'org-refile
|
||||
:type '(repeat
|
||||
(cons
|
||||
(choice :value org-agenda-files
|
||||
@ -1333,13 +1335,25 @@ are used, equivalent to the value `((nil . (:level . 1))'."
|
||||
So a level 3 headline will be available as level1/level2/level3.
|
||||
When the value is `file', also include the file name (without directory)
|
||||
into the path. When `full-file-path', include the full file path."
|
||||
:group 'org-remember
|
||||
:group 'org-refile
|
||||
:type '(choice
|
||||
(const :tag "Not" nil)
|
||||
(const :tag "Yes" t)
|
||||
(const :tag "Start with file name" file)
|
||||
(const :tag "Start with full file path" full-file-path)))
|
||||
|
||||
(defcustom org-outline-path-complete-in-steps t
|
||||
"Non-nil means, complete the outline path in hierarchical steps.
|
||||
When Org-mode uses the refile interface to select an outline path
|
||||
\(see variable `org-refile-use-outline-path'), the completion of
|
||||
the path can be done is a single go, or if can be done in steps down
|
||||
the headline hierarchy. Going in steps is probably the best if you
|
||||
do not use a special completion package like `ido' or `icicles'.
|
||||
However, when using these packages, going in one step can be very
|
||||
fast, while still showing the whole path to the entry."
|
||||
:group 'org-refile
|
||||
:type 'boolean)
|
||||
|
||||
(defgroup org-todo nil
|
||||
"Options concerning TODO items in Org-mode."
|
||||
:tag "Org TODO"
|
||||
@ -2381,7 +2395,7 @@ Normal means, no org-mode-specific context."
|
||||
(extra txt &optional category tags dotime noprefix remove-re))
|
||||
(declare-function org-agenda-new-marker "org-agenda" (&optional pos))
|
||||
(declare-function org-agenda-change-all-lines "org-agenda"
|
||||
(newhead hdmarker &optional fixface))
|
||||
(newhead hdmarker &optional fixface just-this))
|
||||
(declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
|
||||
(declare-function org-agenda-maybe-redo "org-agenda" ())
|
||||
(declare-function org-agenda-save-markers-for-cut-and-paste "org-agenda"
|
||||
@ -6326,7 +6340,7 @@ This is the list that is used for internal purposes.")
|
||||
This is the list that is used before handing over to the browser.")
|
||||
|
||||
(defun org-link-escape (text &optional table)
|
||||
"Escape charaters in TEXT that are problematic for links."
|
||||
"Escape characters in TEXT that are problematic for links."
|
||||
(setq table (or table org-link-escape-chars))
|
||||
(when text
|
||||
(let ((re (mapconcat (lambda (x) (regexp-quote
|
||||
@ -7504,7 +7518,8 @@ operation has put the subtree."
|
||||
(unless org-refile-target-table
|
||||
(error "No refile targets"))
|
||||
(let* ((cbuf (current-buffer))
|
||||
(cfunc (if org-refile-use-outline-path
|
||||
(cfunc (if (and org-refile-use-outline-path
|
||||
org-outline-path-complete-in-steps)
|
||||
'org-olpath-completing-read
|
||||
'org-ido-completing-read))
|
||||
(extra (if org-refile-use-outline-path "/" ""))
|
||||
@ -9082,10 +9097,10 @@ only lines with a TODO keyword are included in the output."
|
||||
(defvar todo-only) ;; dynamically scoped
|
||||
|
||||
(defun org-tags-sparse-tree (&optional todo-only match)
|
||||
"Create a sparse tree according to tags string MATCH.
|
||||
"Create a sparse tree according to tags string MATCH.
|
||||
MATCH can contain positive and negative selection of tags, like
|
||||
\"+WORK+URGENT-WITHBOSS\".
|
||||
If optional argument TODO_ONLY is non-nil, only select lines that are
|
||||
If optional argument TODO-ONLY is non-nil, only select lines that are
|
||||
also TODO lines."
|
||||
(interactive "P")
|
||||
(org-prepare-agenda-buffers (list (current-buffer)))
|
||||
@ -11228,7 +11243,7 @@ days in order to avoid rounding problems."
|
||||
"Convert a time stamp to an absolute day number.
|
||||
If there is a specifyer for a cyclic time stamp, get the closest date to
|
||||
DAYNR.
|
||||
PREFER and SHOW_ALL are passed through to `org-closest-date'."
|
||||
PREFER and SHOW-ALL are passed through to `org-closest-date'."
|
||||
(cond
|
||||
((and daynr (string-match "\\`%%\\((.*)\\)" s))
|
||||
(if (org-diary-sexp-entry (match-string 1 s) "" date)
|
||||
@ -11248,8 +11263,8 @@ PREFER and SHOW_ALL are passed through to `org-closest-date'."
|
||||
(defun org-small-year-to-year (year)
|
||||
"Convert 2-digit years into 4-digit years.
|
||||
38-99 are mapped into 1938-1999. 1-37 are mapped into 2001-2007.
|
||||
The year 2000 cannot be abbreviated. Any year lager than 99
|
||||
is retrned unchanged."
|
||||
The year 2000 cannot be abbreviated. Any year larger than 99
|
||||
is returned unchanged."
|
||||
(if (< year 38)
|
||||
(setq year (+ 2000 year))
|
||||
(if (< year 100)
|
||||
|
Loading…
Reference in New Issue
Block a user