2016-08-23 20:13:56 +00:00
|
|
|
;;; org-capture.el --- Fast note taking in Org -*- lexical-binding: t; -*-
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2018-01-02 11:39:46 +00:00
|
|
|
;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
2018-01-16 16:22:00 +00:00
|
|
|
;; Homepage: https://orgmode.org
|
2009-10-13 07:41:40 +00:00
|
|
|
;;
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;;
|
|
|
|
;; 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
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-10-13 07:41:40 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;
|
|
|
|
;;; Commentary:
|
|
|
|
|
2013-11-05 11:13:46 +00:00
|
|
|
;; This file contains an alternative implementation of the functionality
|
|
|
|
;; that used to be provided by org-remember.el. The implementation is more
|
2009-10-13 07:41:40 +00:00
|
|
|
;; streamlined, can produce more target types (e.g. plain list items or
|
|
|
|
;; table lines). Also, it does not use a temporary buffer for editing
|
|
|
|
;; the captured entry - instead it uses an indirect buffer that visits
|
|
|
|
;; the new entry already in the target buffer (this was an idea by Samuel
|
2013-11-05 11:13:46 +00:00
|
|
|
;; Wales). John Wiegley's excellent `remember.el' is not needed anymore
|
|
|
|
;; for this implementation, even though we borrow heavily from its ideas.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
;; This implementation heavily draws on ideas by James TD Smith and
|
|
|
|
;; Samuel Wales, and, of cause, uses John Wiegley's remember.el as inspiration.
|
|
|
|
|
|
|
|
;;; TODO
|
|
|
|
|
|
|
|
;; - find a clever way to not always insert an annotation maybe a
|
|
|
|
;; predicate function that can check for conditions for %a to be
|
|
|
|
;; used. This could be one of the properties.
|
|
|
|
|
|
|
|
;; - Should there be plist members that arrange for properties to be
|
|
|
|
;; asked for, like James proposed in his RFC?
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2015-12-05 10:55:02 +00:00
|
|
|
(require 'cl-lib)
|
2009-10-13 07:41:40 +00:00
|
|
|
(require 'org)
|
|
|
|
|
2015-12-05 10:55:02 +00:00
|
|
|
(declare-function org-at-encrypted-entry-p "org-crypt" ())
|
2018-02-24 21:01:04 +00:00
|
|
|
(declare-function org-clock-update-mode-line "org-clock" (&optional refresh))
|
|
|
|
(declare-function org-datetree-find-date-create "org-datetree" (date &optional keep-restriction))
|
2015-12-05 10:55:02 +00:00
|
|
|
(declare-function org-decrypt-entry "org-crypt" ())
|
|
|
|
(declare-function org-encrypt-entry "org-crypt" ())
|
|
|
|
(declare-function org-table-analyze "org-table" ())
|
2017-01-08 23:30:41 +00:00
|
|
|
(declare-function org-table-current-dline "org-table" ())
|
2018-06-21 16:09:40 +00:00
|
|
|
(declare-function org-table-fix-formulas "org-table" (key replace &optional limit delta remove))
|
2015-12-05 10:55:02 +00:00
|
|
|
(declare-function org-table-goto-line "org-table" (N))
|
2011-07-18 17:25:10 +00:00
|
|
|
|
2018-04-29 22:52:57 +00:00
|
|
|
(defvar dired-buffers)
|
2016-01-05 22:30:01 +00:00
|
|
|
(defvar org-end-time-was-given)
|
2010-06-23 05:39:56 +00:00
|
|
|
(defvar org-remember-default-headline)
|
|
|
|
(defvar org-remember-templates)
|
2018-04-29 22:52:57 +00:00
|
|
|
(defvar org-table-border-regexp)
|
2015-07-31 08:48:14 +00:00
|
|
|
(defvar org-table-current-begin-pos)
|
2018-06-21 16:09:40 +00:00
|
|
|
(defvar org-table-fix-formulas-confirm)
|
2018-04-29 22:52:57 +00:00
|
|
|
(defvar org-table-hlines)
|
2010-06-23 05:39:56 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defvar org-capture-clock-was-started nil
|
|
|
|
"Internal flag, noting if the clock was started.")
|
|
|
|
|
|
|
|
(defvar org-capture-last-stored-marker (make-marker)
|
|
|
|
"Marker pointing to the entry most recently stored with `org-capture'.")
|
|
|
|
|
2010-06-23 14:21:22 +00:00
|
|
|
;; The following variable is scoped dynamically by org-protocol
|
|
|
|
;; to indicate that the link properties have already been stored
|
|
|
|
(defvar org-capture-link-is-already-stored nil)
|
|
|
|
|
2015-12-05 08:30:17 +00:00
|
|
|
(defvar org-capture-is-refiling nil
|
|
|
|
"Non-nil when capture process is refiling an entry.")
|
|
|
|
|
2017-11-29 14:09:44 +00:00
|
|
|
(defvar org-capture--prompt-history-table (make-hash-table :test #'equal)
|
|
|
|
"Hash table for all history lists per prompt.")
|
|
|
|
|
|
|
|
(defvar org-capture--prompt-history nil
|
|
|
|
"History list for prompt placeholders.")
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defgroup org-capture nil
|
|
|
|
"Options concerning capturing new entries."
|
|
|
|
:tag "Org Capture"
|
|
|
|
:group 'org)
|
|
|
|
|
2017-02-01 05:44:00 +00:00
|
|
|
(defun org-capture-upgrade-templates (templates)
|
|
|
|
"Update the template list to the new format.
|
|
|
|
TEMPLATES is a template list, as in `org-capture-templates'. The
|
|
|
|
new format unifies all the date/week tree targets into one that
|
|
|
|
also allows for an optional outline path to specify a target."
|
|
|
|
(let ((modified-templates
|
|
|
|
(mapcar
|
|
|
|
(lambda (entry)
|
|
|
|
(pcase entry
|
|
|
|
;; Match templates with an obsolete "tree" target type. Replace
|
|
|
|
;; it with common `file+olp-datetree'. Add new properties
|
|
|
|
;; (i.e., `:time-prompt' and `:tree-type') if needed.
|
|
|
|
(`(,key ,desc ,type (file+datetree . ,path) ,tpl . ,props)
|
|
|
|
`(,key ,desc ,type (file+olp+datetree ,@path) ,tpl ,@props))
|
|
|
|
(`(,key ,desc ,type (file+datetree+prompt . ,path) ,tpl . ,props)
|
|
|
|
`(,key ,desc ,type (file+olp+datetree ,@path) ,tpl
|
|
|
|
:time-prompt t ,@props))
|
|
|
|
(`(,key ,desc ,type (file+weektree . ,path) ,tpl . ,props)
|
|
|
|
`(,key ,desc ,type (file+olp+datetree ,@path) ,tpl
|
|
|
|
:tree-type week ,@props))
|
|
|
|
(`(,key ,desc ,type (file+weektree+prompt . ,path) ,tpl . ,props)
|
|
|
|
`(,key ,desc ,type (file+olp+datetree ,@path) ,tpl
|
|
|
|
:tree-type week :time-prompt t ,@props))
|
|
|
|
;; Other templates are left unchanged.
|
|
|
|
(_ entry)))
|
|
|
|
templates)))
|
|
|
|
(unless (equal modified-templates templates)
|
|
|
|
(message "Deprecated date/weektree capture templates changed to `file+olp+datetree'."))
|
|
|
|
modified-templates))
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defcustom org-capture-templates nil
|
|
|
|
"Templates for the creation of new entries.
|
|
|
|
|
|
|
|
Each entry is a list with the following items:
|
|
|
|
|
|
|
|
keys The keys that will select the template, as a string, characters
|
|
|
|
only, for example \"a\" for a template to be selected with a
|
|
|
|
single key, or \"bt\" for selection with two keys. When using
|
|
|
|
several keys, keys using the same prefix key must be together
|
|
|
|
in the list and preceded by a 2-element entry explaining the
|
|
|
|
prefix key, for example
|
|
|
|
|
|
|
|
(\"b\" \"Templates for marking stuff to buy\")
|
|
|
|
|
2010-06-23 04:24:26 +00:00
|
|
|
The \"C\" key is used by default for quick access to the
|
|
|
|
customization of the template variable. But if you want to use
|
|
|
|
that key for a template, you can.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
description A short string describing the template, will be shown during
|
|
|
|
selection.
|
|
|
|
|
2010-07-07 20:40:41 +00:00
|
|
|
type The type of entry. Valid types are:
|
2016-08-23 20:13:56 +00:00
|
|
|
entry an Org node, with a headline. Will be filed
|
|
|
|
as the child of the target entry or as a
|
|
|
|
top-level entry.
|
2010-07-07 20:40:41 +00:00
|
|
|
item a plain list item, will be placed in the
|
|
|
|
first plain list at the target
|
|
|
|
location.
|
|
|
|
checkitem a checkbox item. This differs from the
|
|
|
|
plain list item only is so far as it uses a
|
|
|
|
different default template.
|
2009-10-13 07:41:40 +00:00
|
|
|
table-line a new line in the first table at target location.
|
|
|
|
plain text to be inserted as it is.
|
|
|
|
|
|
|
|
target Specification of where the captured item should be placed.
|
2016-08-23 20:13:56 +00:00
|
|
|
In Org files, targets usually define a node. Entries will
|
2009-10-13 07:41:40 +00:00
|
|
|
become children of this node, other types will be added to the
|
2011-07-12 06:29:55 +00:00
|
|
|
table or list in the body of this node.
|
2011-03-06 16:31:56 +00:00
|
|
|
|
2011-07-12 06:29:55 +00:00
|
|
|
Most target specifications contain a file name. If that file
|
|
|
|
name is the empty string, it defaults to `org-default-notes-file'.
|
2016-11-04 16:41:27 +00:00
|
|
|
A file can also be given as a variable or as a function called
|
|
|
|
with no argument. When an absolute path is not specified for a
|
2016-02-07 16:56:04 +00:00
|
|
|
target, it is taken as relative to `org-directory'.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
Valid values are:
|
|
|
|
|
|
|
|
(file \"path/to/file\")
|
|
|
|
Text will be placed at the beginning or end of that file
|
|
|
|
|
2016-11-07 00:14:04 +00:00
|
|
|
(id \"id of existing Org entry\")
|
2010-07-07 20:40:41 +00:00
|
|
|
File as child of this entry, or in the body of the entry
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(file+headline \"path/to/file\" \"node headline\")
|
|
|
|
Fast configuration if the target heading is unique in the file
|
|
|
|
|
|
|
|
(file+olp \"path/to/file\" \"Level 1 heading\" \"Level 2\" ...)
|
2017-02-01 05:44:00 +00:00
|
|
|
For non-unique headings, the full outline path is safer
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(file+regexp \"path/to/file\" \"regexp to find location\")
|
2010-07-07 20:40:41 +00:00
|
|
|
File to the entry matching regexp
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2017-02-01 05:44:00 +00:00
|
|
|
(file+olp+datetree \"path/to/file\" \"Level 1 heading\" ...)
|
|
|
|
Will create a heading in a date tree for today's date.
|
|
|
|
If no heading is given, the tree will be on top level.
|
|
|
|
To prompt for date instead of using TODAY, use the
|
|
|
|
:time-prompt property. To create a week-tree, use the
|
|
|
|
:tree-type property.
|
2015-12-29 17:49:20 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(file+function \"path/to/file\" function-finding-location)
|
2010-07-07 20:40:41 +00:00
|
|
|
A function to find the right location in the file
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(clock)
|
2010-07-07 20:40:41 +00:00
|
|
|
File to the entry that is currently being clocked
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(function function-finding-location)
|
2016-05-16 08:34:30 +00:00
|
|
|
Most general way: write your own function which both visits
|
|
|
|
the file and moves point to the right location
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
template The template for creating the capture item. If you leave this
|
|
|
|
empty, an appropriate default template will be used. See below
|
2010-07-06 07:40:46 +00:00
|
|
|
for more details. Instead of a string, this may also be one of
|
|
|
|
|
|
|
|
(file \"/path/to/template-file\")
|
|
|
|
(function function-returning-the-template)
|
|
|
|
|
|
|
|
in order to get a template from a file, or dynamically
|
|
|
|
from a function.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
The rest of the entry is a property list of additional options. Recognized
|
|
|
|
properties are:
|
|
|
|
|
2010-07-07 20:40:41 +00:00
|
|
|
:prepend Normally newly captured information will be appended at
|
2009-10-13 07:41:40 +00:00
|
|
|
the target location (last child, last table line,
|
|
|
|
last list item...). Setting this property will
|
|
|
|
change that.
|
|
|
|
|
|
|
|
:immediate-finish When set, do not offer to edit the information, just
|
|
|
|
file it away immediately. This makes sense if the
|
|
|
|
template only needs information that can be added
|
|
|
|
automatically.
|
|
|
|
|
2013-03-30 14:43:30 +00:00
|
|
|
:jump-to-captured When set, jump to the captured entry when finished.
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
:empty-lines Set this to the number of lines the should be inserted
|
|
|
|
before and after the new item. Default 0, only common
|
|
|
|
other value is 1.
|
|
|
|
|
2012-01-29 15:52:08 +00:00
|
|
|
:empty-lines-before Set this to the number of lines the should be inserted
|
2012-08-11 17:10:44 +00:00
|
|
|
before the new item. Overrides :empty-lines for the
|
2012-01-29 15:52:08 +00:00
|
|
|
number lines inserted before.
|
|
|
|
|
|
|
|
:empty-lines-after Set this to the number of lines the should be inserted
|
2012-08-11 17:10:44 +00:00
|
|
|
after the new item. Overrides :empty-lines for the
|
2012-01-29 15:52:08 +00:00
|
|
|
number of lines inserted after.
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
:clock-in Start the clock in this item.
|
|
|
|
|
2011-03-07 14:21:13 +00:00
|
|
|
:clock-keep Keep the clock running when filing the captured entry.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2011-03-07 14:21:13 +00:00
|
|
|
:clock-resume Start the interrupted clock when finishing the capture.
|
|
|
|
Note that :clock-keep has precedence over :clock-resume.
|
2015-05-21 17:04:45 +00:00
|
|
|
When setting both to t, the current clock will run and
|
2011-03-07 14:21:13 +00:00
|
|
|
the previous one will not be resumed.
|
2011-03-07 10:43:58 +00:00
|
|
|
|
2017-02-01 05:44:00 +00:00
|
|
|
:time-prompt Prompt for a date/time to be used for date/week trees
|
|
|
|
and when filling the template.
|
|
|
|
|
|
|
|
:tree-type When `week', make a week tree instead of the month tree.
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
:unnarrowed Do not narrow the target buffer, simply show the
|
|
|
|
full buffer. Default is to narrow it so that you
|
|
|
|
only see the new stuff.
|
|
|
|
|
2010-06-23 15:16:44 +00:00
|
|
|
:table-line-pos Specification of the location in the table where the
|
2011-05-05 07:58:31 +00:00
|
|
|
new line should be inserted. It should be a string like
|
|
|
|
\"II-3\", meaning that the new line should become the
|
|
|
|
third line before the second horizontal separator line.
|
2010-06-23 15:16:44 +00:00
|
|
|
|
2010-10-26 15:44:34 +00:00
|
|
|
:kill-buffer If the target file was not yet visited by a buffer when
|
|
|
|
capture was invoked, kill the buffer again after capture
|
|
|
|
is finalized.
|
|
|
|
|
2011-07-25 21:08:45 +00:00
|
|
|
The template defines the text to be inserted. Often this is an
|
2015-11-29 15:53:35 +00:00
|
|
|
Org mode entry (so the first line should start with a star) that
|
2011-07-25 21:08:45 +00:00
|
|
|
will be filed as a child of the target headline. It can also be
|
|
|
|
freely formatted text. Furthermore, the following %-escapes will
|
2015-11-29 15:53:35 +00:00
|
|
|
be replaced with content and expanded:
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2015-11-29 15:53:35 +00:00
|
|
|
%[pathname] Insert the contents of the file given by
|
|
|
|
`pathname'. These placeholders are expanded at the very
|
|
|
|
beginning of the process so they can be used to extend the
|
|
|
|
current template.
|
2012-11-04 15:01:08 +00:00
|
|
|
%(sexp) Evaluate elisp `(sexp)' and replace it with the results.
|
2015-11-29 15:53:35 +00:00
|
|
|
Only placeholders pre-existing within the template, or
|
|
|
|
introduced with %[pathname] are expanded this way. Since this
|
2015-12-03 22:27:07 +00:00
|
|
|
happens after expanding non-interactive %-escapes, those can
|
|
|
|
be used to fill the expression.
|
2012-08-10 09:48:54 +00:00
|
|
|
%<...> The result of format-time-string on the ... format specification.
|
2017-08-05 12:53:29 +00:00
|
|
|
%t Time stamp, date only. The time stamp is the current time,
|
|
|
|
except when called from agendas with `\\[org-agenda-capture]' or
|
|
|
|
with `org-capture-use-agenda-date' set.
|
|
|
|
%T Time stamp as above, with date and time.
|
2012-08-10 09:48:54 +00:00
|
|
|
%u, %U Like the above, but inactive time stamps.
|
|
|
|
%i Initial content, copied from the active region. If %i is
|
2009-10-13 07:41:40 +00:00
|
|
|
indented, the entire inserted text will be indented as well.
|
2012-08-10 09:48:54 +00:00
|
|
|
%a Annotation, normally the link created with `org-store-link'.
|
|
|
|
%A Like %a, but prompt for the description part.
|
|
|
|
%l Like %a, but only insert the literal link.
|
|
|
|
%c Current kill ring head.
|
|
|
|
%x Content of the X clipboard.
|
|
|
|
%k Title of currently clocked task.
|
|
|
|
%K Link to currently clocked task.
|
2013-03-05 14:35:08 +00:00
|
|
|
%n User name (taken from the variable `user-full-name').
|
2012-08-10 09:48:54 +00:00
|
|
|
%f File visited by current buffer when org-capture was called.
|
|
|
|
%F Full path of the file or directory visited by current buffer.
|
|
|
|
%:keyword Specific information for certain link types, see below.
|
|
|
|
%^g Prompt for tags, with completion on tags in target file.
|
|
|
|
%^G Prompt for tags, with completion on all tags in all agenda files.
|
|
|
|
%^t Like %t, but prompt for date. Similarly %^T, %^u, %^U.
|
2017-08-05 12:53:29 +00:00
|
|
|
You may define a prompt like: %^{Please specify birthday}t.
|
|
|
|
The default date is that of %t, see above.
|
2012-08-10 09:48:54 +00:00
|
|
|
%^C Interactive selection of which kill or clip to use.
|
|
|
|
%^L Like %^C, but insert as link.
|
|
|
|
%^{prop}p Prompt the user for a value for property `prop'.
|
|
|
|
%^{prompt} Prompt the user for a string and replace this sequence with it.
|
2011-07-25 21:08:45 +00:00
|
|
|
A default value and a completion table ca be specified like this:
|
|
|
|
%^{prompt|default|completion2|completion3|...}.
|
2009-10-13 07:41:40 +00:00
|
|
|
%? After completing the template, position cursor here.
|
2016-10-19 17:23:05 +00:00
|
|
|
%\\1 ... %\\N Insert the text entered at the nth %^{prompt}, where N
|
2015-12-03 22:27:07 +00:00
|
|
|
is a number, starting from 1.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2012-08-10 09:48:54 +00:00
|
|
|
Apart from these general escapes, you can access information specific to
|
|
|
|
the link type that is created. For example, calling `org-capture' in emails
|
|
|
|
or in Gnus will record the author and the subject of the message, which you
|
2010-09-12 16:45:04 +00:00
|
|
|
can access with \"%:from\" and \"%:subject\", respectively. Here is a
|
2009-10-13 07:41:40 +00:00
|
|
|
complete list of what is recorded for each link type.
|
|
|
|
|
2010-09-23 16:46:35 +00:00
|
|
|
Link type | Available information
|
|
|
|
------------------------+------------------------------------------------------
|
|
|
|
bbdb | %:type %:name %:company
|
2012-08-03 12:01:19 +00:00
|
|
|
vm, wl, mh, mew, rmail, | %:type %:subject %:message-id
|
|
|
|
gnus | %:from %:fromname %:fromaddress
|
2010-09-23 16:46:35 +00:00
|
|
|
| %:to %:toname %:toaddress
|
|
|
|
| %:fromto (either \"to NAME\" or \"from NAME\")
|
2012-08-03 12:01:19 +00:00
|
|
|
| %:date %:date-timestamp (as active timestamp)
|
2010-09-23 16:46:35 +00:00
|
|
|
| %:date-timestamp-inactive (as inactive timestamp)
|
|
|
|
gnus | %:group, for messages also all email fields
|
2016-08-20 00:59:56 +00:00
|
|
|
eww, w3, w3m | %:type %:url
|
2010-09-23 16:46:35 +00:00
|
|
|
info | %:type %:file %:node
|
2015-11-29 15:53:35 +00:00
|
|
|
calendar | %:type %:date
|
|
|
|
|
|
|
|
When you need to insert a literal percent sign in the template,
|
|
|
|
you can escape ambiguous cases with a backward slash, e.g., \\%i."
|
2009-10-13 07:41:40 +00:00
|
|
|
:group 'org-capture
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2017-02-01 05:44:00 +00:00
|
|
|
:set (lambda (s v) (set s (org-capture-upgrade-templates v)))
|
2009-10-13 07:41:40 +00:00
|
|
|
:type
|
2016-05-16 08:34:30 +00:00
|
|
|
(let ((file-variants '(choice :tag "Filename "
|
|
|
|
(file :tag "Literal")
|
|
|
|
(function :tag "Function")
|
|
|
|
(variable :tag "Variable")
|
|
|
|
(sexp :tag "Form"))))
|
|
|
|
`(repeat
|
2009-10-13 07:41:40 +00:00
|
|
|
(choice :value ("" "" entry (file "~/org/notes.org") "")
|
2012-08-11 17:10:44 +00:00
|
|
|
(list :tag "Multikey description"
|
|
|
|
(string :tag "Keys ")
|
|
|
|
(string :tag "Description"))
|
|
|
|
(list :tag "Template entry"
|
|
|
|
(string :tag "Keys ")
|
|
|
|
(string :tag "Description ")
|
|
|
|
(choice :tag "Capture Type " :value entry
|
|
|
|
(const :tag "Org entry" entry)
|
|
|
|
(const :tag "Plain list item" item)
|
|
|
|
(const :tag "Checkbox item" checkitem)
|
|
|
|
(const :tag "Plain text" plain)
|
|
|
|
(const :tag "Table line" table-line))
|
|
|
|
(choice :tag "Target location"
|
|
|
|
(list :tag "File"
|
|
|
|
(const :format "" file)
|
2016-05-16 08:34:30 +00:00
|
|
|
,file-variants)
|
2012-08-11 17:10:44 +00:00
|
|
|
(list :tag "ID"
|
|
|
|
(const :format "" id)
|
|
|
|
(string :tag " ID"))
|
|
|
|
(list :tag "File & Headline"
|
|
|
|
(const :format "" file+headline)
|
2016-05-16 08:34:30 +00:00
|
|
|
,file-variants
|
2012-08-11 17:10:44 +00:00
|
|
|
(string :tag " Headline"))
|
|
|
|
(list :tag "File & Outline path"
|
|
|
|
(const :format "" file+olp)
|
2016-05-16 08:34:30 +00:00
|
|
|
,file-variants
|
2012-08-11 17:10:44 +00:00
|
|
|
(repeat :tag "Outline path" :inline t
|
|
|
|
(string :tag "Headline")))
|
|
|
|
(list :tag "File & Regexp"
|
|
|
|
(const :format "" file+regexp)
|
2016-05-16 08:34:30 +00:00
|
|
|
,file-variants
|
2012-08-11 17:10:44 +00:00
|
|
|
(regexp :tag " Regexp"))
|
2017-02-01 05:44:00 +00:00
|
|
|
(list :tag "File [ & Outline path ] & Date tree"
|
|
|
|
(const :format "" file+olp+datetree)
|
|
|
|
,file-variants
|
|
|
|
(option (repeat :tag "Outline path" :inline t
|
|
|
|
(string :tag "Headline"))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(list :tag "File & function"
|
|
|
|
(const :format "" file+function)
|
2016-05-16 08:34:30 +00:00
|
|
|
,file-variants
|
2012-08-11 17:10:44 +00:00
|
|
|
(sexp :tag " Function"))
|
|
|
|
(list :tag "Current clocking task"
|
|
|
|
(const :format "" clock))
|
|
|
|
(list :tag "Function"
|
|
|
|
(const :format "" function)
|
|
|
|
(sexp :tag " Function")))
|
2016-05-16 08:34:30 +00:00
|
|
|
(choice :tag "Template "
|
2012-08-11 17:10:44 +00:00
|
|
|
(string)
|
|
|
|
(list :tag "File"
|
|
|
|
(const :format "" file)
|
|
|
|
(file :tag "Template file"))
|
|
|
|
(list :tag "Function"
|
|
|
|
(const :format "" function)
|
|
|
|
(function :tag "Template function")))
|
|
|
|
(plist :inline t
|
|
|
|
;; Give the most common options as checkboxes
|
|
|
|
:options (((const :format "%v " :prepend) (const t))
|
|
|
|
((const :format "%v " :immediate-finish) (const t))
|
2013-03-30 14:43:30 +00:00
|
|
|
((const :format "%v " :jump-to-captured) (const t))
|
2012-08-11 17:10:44 +00:00
|
|
|
((const :format "%v " :empty-lines) (const 1))
|
2013-03-30 14:43:30 +00:00
|
|
|
((const :format "%v " :empty-lines-before) (const 1))
|
|
|
|
((const :format "%v " :empty-lines-after) (const 1))
|
2012-08-11 17:10:44 +00:00
|
|
|
((const :format "%v " :clock-in) (const t))
|
|
|
|
((const :format "%v " :clock-keep) (const t))
|
|
|
|
((const :format "%v " :clock-resume) (const t))
|
2017-02-01 05:44:00 +00:00
|
|
|
((const :format "%v " :time-prompt) (const t))
|
|
|
|
((const :format "%v " :tree-type) (const week))
|
2012-08-11 17:10:44 +00:00
|
|
|
((const :format "%v " :unnarrowed) (const t))
|
2017-02-01 05:44:00 +00:00
|
|
|
((const :format "%v " :table-line-pos) (string))
|
2016-05-16 08:34:30 +00:00
|
|
|
((const :format "%v " :kill-buffer) (const t)))))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defcustom org-capture-before-finalize-hook nil
|
2011-07-10 17:30:40 +00:00
|
|
|
"Hook that is run right before a capture process is finalized.
|
2011-10-29 12:07:18 +00:00
|
|
|
The capture buffer is still current when this hook runs and it is
|
|
|
|
widened to the entire buffer."
|
2009-10-13 07:41:40 +00:00
|
|
|
:group 'org-capture
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2009-10-13 07:41:40 +00:00
|
|
|
:type 'hook)
|
|
|
|
|
2010-11-18 22:32:53 +00:00
|
|
|
(defcustom org-capture-after-finalize-hook nil
|
|
|
|
"Hook that is run right after a capture process is finalized.
|
2012-08-11 17:35:34 +00:00
|
|
|
Suitable for window cleanup."
|
2010-11-18 22:32:53 +00:00
|
|
|
:group 'org-capture
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
|
|
|
:type 'hook)
|
|
|
|
|
|
|
|
(defcustom org-capture-prepare-finalize-hook nil
|
|
|
|
"Hook that is run before the finalization starts.
|
|
|
|
The capture buffer is current and still narrowed."
|
|
|
|
:group 'org-capture
|
|
|
|
:version "24.1"
|
2012-02-18 15:41:30 +00:00
|
|
|
:type 'hook)
|
|
|
|
|
2012-05-25 21:45:31 +00:00
|
|
|
(defcustom org-capture-bookmark t
|
|
|
|
"When non-nil, add a bookmark pointing at the last stored
|
|
|
|
position when capturing."
|
|
|
|
:group 'org-capture
|
2012-09-29 21:46:02 +00:00
|
|
|
:version "24.3"
|
2012-05-25 21:45:31 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
;;; The property list for keeping information about the capture process
|
|
|
|
|
|
|
|
(defvar org-capture-plist nil
|
|
|
|
"Plist for the current capture process, global, to avoid having to pass it.")
|
2011-05-27 18:50:09 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defvar org-capture-current-plist nil
|
|
|
|
"Local variable holding the plist in a capture buffer.
|
2011-05-27 18:50:09 +00:00
|
|
|
This is used to store the plist for use when finishing a capture process
|
|
|
|
because another such process might have changed the global variable by then.
|
|
|
|
|
|
|
|
Each time a new capture buffer has been set up, the global `org-capture-plist'
|
|
|
|
is copied to this variable, which is local in the indirect buffer.")
|
|
|
|
|
2011-04-08 16:04:47 +00:00
|
|
|
(defvar org-capture-clock-keep nil
|
|
|
|
"Local variable to store the value of the :clock-keep parameter.
|
|
|
|
This is needed in case org-capture-finalize is called interactively.")
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-put (&rest stuff)
|
2011-05-27 18:50:09 +00:00
|
|
|
"Add properties to the capture property list `org-capture-plist'."
|
2009-10-13 07:41:40 +00:00
|
|
|
(while stuff
|
|
|
|
(setq org-capture-plist (plist-put org-capture-plist
|
|
|
|
(pop stuff) (pop stuff)))))
|
|
|
|
(defun org-capture-get (prop &optional local)
|
2011-05-27 18:50:09 +00:00
|
|
|
"Get properties from the capture property list `org-capture-plist'.
|
|
|
|
When LOCAL is set, use the local variable `org-capture-current-plist',
|
|
|
|
this is necessary after initialization of the capture process,
|
|
|
|
to avoid conflicts with other active capture processes."
|
2009-10-13 07:41:40 +00:00
|
|
|
(plist-get (if local org-capture-current-plist org-capture-plist) prop))
|
|
|
|
|
|
|
|
;;; The minor mode
|
|
|
|
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(defvar org-capture-mode-map
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
(define-key map "\C-c\C-c" #'org-capture-finalize)
|
|
|
|
(define-key map "\C-c\C-k" #'org-capture-kill)
|
|
|
|
(define-key map "\C-c\C-w" #'org-capture-refile)
|
|
|
|
map)
|
2010-07-15 20:26:51 +00:00
|
|
|
"Keymap for `org-capture-mode', a minor mode.
|
2016-08-23 20:13:56 +00:00
|
|
|
Use this map to set additional keybindings for when Org mode is used
|
2011-07-10 17:30:40 +00:00
|
|
|
for a capture buffer.")
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defvar org-capture-mode-hook nil
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
"Hook for the `org-capture-mode' minor mode.")
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(define-minor-mode org-capture-mode
|
2012-09-24 05:07:43 +00:00
|
|
|
"Minor mode for special key bindings in a capture buffer.
|
|
|
|
|
|
|
|
Turning on this mode runs the normal hook `org-capture-mode-hook'."
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
nil " Cap" org-capture-mode-map
|
2015-11-05 16:47:38 +00:00
|
|
|
(setq-local
|
|
|
|
header-line-format
|
2015-08-21 22:54:14 +00:00
|
|
|
(substitute-command-keys
|
2016-10-15 15:36:47 +00:00
|
|
|
"\\<org-capture-mode-map>Capture buffer. Finish \
|
|
|
|
`\\[org-capture-finalize]', refile `\\[org-capture-refile]', \
|
|
|
|
abort `\\[org-capture-kill]'.")))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
;;; The main commands
|
|
|
|
|
2012-08-11 09:17:35 +00:00
|
|
|
(defvar org-capture-initial nil)
|
2012-09-17 16:42:11 +00:00
|
|
|
(defvar org-capture-entry nil)
|
2012-10-02 08:03:15 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2012-08-11 09:17:35 +00:00
|
|
|
(defun org-capture-string (string &optional keys)
|
2013-03-05 14:35:08 +00:00
|
|
|
"Capture STRING with the template selected by KEYS."
|
2012-08-11 09:17:35 +00:00
|
|
|
(interactive "sInitial text: \n")
|
|
|
|
(let ((org-capture-initial string)
|
2012-09-17 16:42:11 +00:00
|
|
|
(org-capture-entry (org-capture-select-template keys)))
|
2012-08-11 09:17:35 +00:00
|
|
|
(org-capture)))
|
|
|
|
|
2012-08-23 09:08:47 +00:00
|
|
|
(defcustom org-capture-templates-contexts nil
|
2012-08-24 10:14:54 +00:00
|
|
|
"Alist of capture templates and valid contexts.
|
2012-08-23 09:08:47 +00:00
|
|
|
|
|
|
|
For example, if you have a capture template \"c\" and you want
|
2012-08-23 15:04:43 +00:00
|
|
|
this template to be accessible only from `message-mode' buffers,
|
2012-08-23 09:08:47 +00:00
|
|
|
use this:
|
|
|
|
|
2015-09-21 04:23:58 +00:00
|
|
|
\\='((\"c\" ((in-mode . \"message-mode\"))))
|
2012-08-23 09:08:47 +00:00
|
|
|
|
2012-08-24 10:14:54 +00:00
|
|
|
Here are the available contexts definitions:
|
2012-08-23 15:04:43 +00:00
|
|
|
|
2012-08-24 10:14:54 +00:00
|
|
|
in-file: command displayed only in matching files
|
|
|
|
in-mode: command displayed only in matching modes
|
|
|
|
not-in-file: command not displayed in matching files
|
|
|
|
not-in-mode: command not displayed in matching modes
|
2013-01-31 10:06:04 +00:00
|
|
|
in-buffer: command displayed only in matching buffers
|
|
|
|
not-in-buffer: command not displayed in matching buffers
|
2012-08-24 10:14:54 +00:00
|
|
|
[function]: a custom function taking no argument
|
2012-08-23 15:04:43 +00:00
|
|
|
|
2012-08-24 10:14:54 +00:00
|
|
|
If you define several checks, the agenda command will be
|
|
|
|
accessible if there is at least one valid check.
|
2012-08-23 15:04:43 +00:00
|
|
|
|
2018-03-20 11:38:24 +00:00
|
|
|
You can also bind a key to another capture template depending on
|
|
|
|
contextual rules.
|
2012-08-23 09:08:47 +00:00
|
|
|
|
2015-09-21 04:23:58 +00:00
|
|
|
\\='((\"c\" \"d\" ((in-mode . \"message-mode\"))))
|
2012-08-23 09:08:47 +00:00
|
|
|
|
2013-01-12 08:20:17 +00:00
|
|
|
Here it means: in `message-mode buffers', use \"c\" as the
|
2012-08-24 10:14:54 +00:00
|
|
|
key for the capture template otherwise associated with \"d\".
|
2013-01-12 08:20:17 +00:00
|
|
|
\(The template originally associated with \"d\" is not displayed
|
2012-08-24 10:14:54 +00:00
|
|
|
to avoid duplicates.)"
|
2012-09-29 21:46:02 +00:00
|
|
|
:version "24.3"
|
2012-08-23 09:08:47 +00:00
|
|
|
:group 'org-capture
|
2012-08-23 15:04:43 +00:00
|
|
|
:type '(repeat (list :tag "Rule"
|
2012-08-24 10:14:54 +00:00
|
|
|
(string :tag " Capture key")
|
2012-08-23 15:04:43 +00:00
|
|
|
(string :tag "Replace by template")
|
2012-08-23 09:08:47 +00:00
|
|
|
(repeat :tag "Available when"
|
2012-08-24 10:14:54 +00:00
|
|
|
(choice
|
2012-08-23 09:08:47 +00:00
|
|
|
(cons :tag "Condition"
|
|
|
|
(choice
|
|
|
|
(const :tag "In file" in-file)
|
|
|
|
(const :tag "Not in file" not-in-file)
|
2013-01-31 10:06:04 +00:00
|
|
|
(const :tag "In buffer" in-buffer)
|
|
|
|
(const :tag "Not in buffer" not-in-buffer)
|
2012-08-23 09:08:47 +00:00
|
|
|
(const :tag "In mode" in-mode)
|
|
|
|
(const :tag "Not in mode" not-in-mode))
|
2012-08-24 10:14:54 +00:00
|
|
|
(regexp))
|
|
|
|
(function :tag "Custom function"))))))
|
2012-08-23 09:08:47 +00:00
|
|
|
|
2012-09-02 10:52:38 +00:00
|
|
|
(defcustom org-capture-use-agenda-date nil
|
|
|
|
"Non-nil means use the date at point when capturing from agendas.
|
2016-10-15 15:36:47 +00:00
|
|
|
When nil, you can still capture using the date at point with
|
|
|
|
`\\[org-agenda-capture]'."
|
2012-09-02 10:52:38 +00:00
|
|
|
:group 'org-capture
|
2012-09-29 21:46:02 +00:00
|
|
|
:version "24.3"
|
2012-09-02 10:52:38 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
2010-06-22 12:29:13 +00:00
|
|
|
;;;###autoload
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture (&optional goto keys)
|
|
|
|
"Capture something.
|
2010-07-15 20:26:51 +00:00
|
|
|
\\<org-capture-mode-map>
|
2016-10-15 15:36:47 +00:00
|
|
|
This will let you select a template from `org-capture-templates', and
|
|
|
|
then file the newly captured information. The text is immediately
|
|
|
|
inserted at the target location, and an indirect buffer is shown where
|
|
|
|
you can edit it. Pressing `\\[org-capture-finalize]' brings you back to the \
|
|
|
|
previous
|
|
|
|
state of Emacs, so that you can continue your work.
|
|
|
|
|
|
|
|
When called interactively with a `\\[universal-argument]' prefix argument \
|
|
|
|
GOTO, don't
|
|
|
|
capture anything, just go to the file/headline where the selected
|
|
|
|
template stores its notes.
|
|
|
|
|
|
|
|
With a `\\[universal-argument] \\[universal-argument]' prefix argument, go to \
|
|
|
|
the last note stored.
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
When called with a `C-0' (zero) prefix, insert a template at point.
|
|
|
|
|
2017-02-01 05:44:00 +00:00
|
|
|
When called with a `C-1' (one) prefix, force prompting for a date when
|
|
|
|
a datetree entry is made.
|
|
|
|
|
2012-12-12 14:21:10 +00:00
|
|
|
ELisp programs can set KEYS to a string associated with a template
|
2012-09-02 10:52:38 +00:00
|
|
|
in `org-capture-templates'. In this case, interactive selection
|
|
|
|
will be bypassed.
|
2012-09-02 10:30:56 +00:00
|
|
|
|
2012-09-02 10:52:38 +00:00
|
|
|
If `org-capture-use-agenda-date' is non-nil, capturing from the
|
2012-12-12 14:21:10 +00:00
|
|
|
agenda will use the date at point as the default date. Then, a
|
|
|
|
`C-1' prefix will tell the capture process to use the HH:MM time
|
|
|
|
of the day at point (if any) or the current HH:MM time."
|
2009-10-13 07:41:40 +00:00
|
|
|
(interactive "P")
|
2012-09-02 10:52:38 +00:00
|
|
|
(when (and org-capture-use-agenda-date
|
|
|
|
(eq major-mode 'org-agenda-mode))
|
|
|
|
(setq org-overriding-default-time
|
2012-12-12 14:21:10 +00:00
|
|
|
(org-get-cursor-date (equal goto 1))))
|
2009-10-13 07:41:40 +00:00
|
|
|
(cond
|
|
|
|
((equal goto '(4)) (org-capture-goto-target))
|
|
|
|
((equal goto '(16)) (org-capture-goto-last-stored))
|
|
|
|
(t
|
|
|
|
(let* ((orig-buf (current-buffer))
|
2010-07-09 10:42:30 +00:00
|
|
|
(annotation (if (and (boundp 'org-capture-link-is-already-stored)
|
|
|
|
org-capture-link-is-already-stored)
|
2010-06-23 14:21:22 +00:00
|
|
|
(plist-get org-store-link-plist :annotation)
|
2013-03-26 13:16:56 +00:00
|
|
|
(ignore-errors (org-store-link nil))))
|
2012-09-17 16:42:11 +00:00
|
|
|
(entry (or org-capture-entry (org-capture-select-template keys)))
|
2012-08-11 09:17:35 +00:00
|
|
|
initial)
|
|
|
|
(setq initial (or org-capture-initial
|
|
|
|
(and (org-region-active-p)
|
|
|
|
(buffer-substring (point) (mark)))))
|
2010-09-03 05:09:18 +00:00
|
|
|
(when (stringp initial)
|
2010-09-02 09:34:26 +00:00
|
|
|
(remove-text-properties 0 (length initial) '(read-only t) initial))
|
2010-09-03 05:09:18 +00:00
|
|
|
(when (stringp annotation)
|
|
|
|
(remove-text-properties 0 (length annotation)
|
|
|
|
'(read-only t) annotation))
|
2010-06-23 15:16:44 +00:00
|
|
|
(cond
|
|
|
|
((equal entry "C")
|
|
|
|
(customize-variable 'org-capture-templates))
|
|
|
|
((equal entry "q")
|
2016-05-01 06:11:43 +00:00
|
|
|
(user-error "Abort"))
|
2010-06-23 15:16:44 +00:00
|
|
|
(t
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-set-plist entry)
|
2010-07-06 10:45:26 +00:00
|
|
|
(org-capture-get-template)
|
2011-01-07 14:28:57 +00:00
|
|
|
(org-capture-put :original-buffer orig-buf
|
2011-07-18 15:42:01 +00:00
|
|
|
:original-file (or (buffer-file-name orig-buf)
|
2011-07-19 15:49:37 +00:00
|
|
|
(and (featurep 'dired)
|
|
|
|
(car (rassq orig-buf
|
|
|
|
dired-buffers))))
|
2011-01-07 14:28:57 +00:00
|
|
|
:original-file-nondirectory
|
|
|
|
(and (buffer-file-name orig-buf)
|
|
|
|
(file-name-nondirectory
|
|
|
|
(buffer-file-name orig-buf)))
|
|
|
|
:annotation annotation
|
2013-11-06 14:51:57 +00:00
|
|
|
:initial initial
|
|
|
|
:return-to-wconf (current-window-configuration)
|
|
|
|
:default-time
|
2009-10-13 07:41:40 +00:00
|
|
|
(or org-overriding-default-time
|
|
|
|
(org-current-time)))
|
|
|
|
(org-capture-set-target-location)
|
2010-06-27 10:26:08 +00:00
|
|
|
(condition-case error
|
|
|
|
(org-capture-put :template (org-capture-fill-template))
|
|
|
|
((error quit)
|
|
|
|
(if (get-buffer "*Capture*") (kill-buffer "*Capture*"))
|
|
|
|
(error "Capture abort: %s" error)))
|
|
|
|
|
2011-04-08 16:04:47 +00:00
|
|
|
(setq org-capture-clock-keep (org-capture-get :clock-keep))
|
2009-10-13 07:41:40 +00:00
|
|
|
(if (equal goto 0)
|
|
|
|
;;insert at point
|
|
|
|
(org-capture-insert-template-here)
|
2010-06-29 07:14:21 +00:00
|
|
|
(condition-case error
|
2013-11-06 14:51:57 +00:00
|
|
|
(org-capture-place-template
|
2016-09-25 15:29:06 +00:00
|
|
|
(eq (car (org-capture-get :target)) 'function))
|
2010-06-29 07:14:21 +00:00
|
|
|
((error quit)
|
|
|
|
(if (and (buffer-base-buffer (current-buffer))
|
2016-09-03 01:05:10 +00:00
|
|
|
(string-prefix-p "CAPTURE-" (buffer-name)))
|
2010-06-29 07:14:21 +00:00
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
(set-window-configuration (org-capture-get :return-to-wconf))
|
|
|
|
(error "Capture template `%s': %s"
|
|
|
|
(org-capture-get :key)
|
|
|
|
(nth 1 error))))
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(if (and (derived-mode-p 'org-mode)
|
2011-04-08 16:04:47 +00:00
|
|
|
(org-capture-get :clock-in))
|
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(if (org-clock-is-active)
|
|
|
|
(org-capture-put :interrupted-clock
|
|
|
|
(copy-marker org-clock-marker)))
|
|
|
|
(org-clock-in)
|
2015-11-05 16:47:38 +00:00
|
|
|
(setq-local org-capture-clock-was-started t))
|
2011-04-08 16:04:47 +00:00
|
|
|
(error
|
|
|
|
"Could not start the clock in this capture buffer")))
|
2009-10-13 07:41:40 +00:00
|
|
|
(if (org-capture-get :immediate-finish)
|
2013-02-27 23:29:24 +00:00
|
|
|
(org-capture-finalize)))))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2010-07-06 10:45:26 +00:00
|
|
|
(defun org-capture-get-template ()
|
|
|
|
"Get the template from a file or a function if necessary."
|
|
|
|
(let ((txt (org-capture-get :template)) file)
|
|
|
|
(cond
|
|
|
|
((and (listp txt) (eq (car txt) 'file))
|
|
|
|
(if (file-exists-p
|
|
|
|
(setq file (expand-file-name (nth 1 txt) org-directory)))
|
|
|
|
(setq txt (org-file-contents file))
|
|
|
|
(setq txt (format "* Template file %s not found" (nth 1 txt)))))
|
|
|
|
((and (listp txt) (eq (car txt) 'function))
|
|
|
|
(if (fboundp (nth 1 txt))
|
|
|
|
(setq txt (funcall (nth 1 txt)))
|
|
|
|
(setq txt (format "* Template function %s not found" (nth 1 txt)))))
|
|
|
|
((not txt) (setq txt ""))
|
|
|
|
((stringp txt))
|
|
|
|
(t (setq txt "* Invalid capture template")))
|
|
|
|
(org-capture-put :template txt)))
|
|
|
|
|
2011-04-08 16:04:47 +00:00
|
|
|
(defun org-capture-finalize (&optional stay-with-capture)
|
2010-12-06 08:32:24 +00:00
|
|
|
"Finalize the capture process.
|
|
|
|
With prefix argument STAY-WITH-CAPTURE, jump to the location of the
|
2011-04-08 16:04:47 +00:00
|
|
|
captured item after finalizing."
|
2010-12-06 08:32:24 +00:00
|
|
|
(interactive "P")
|
2013-03-30 14:43:30 +00:00
|
|
|
(when (org-capture-get :jump-to-captured)
|
|
|
|
(setq stay-with-capture t))
|
2009-10-13 07:41:40 +00:00
|
|
|
(unless (and org-capture-mode
|
|
|
|
(buffer-base-buffer (current-buffer)))
|
2016-10-11 16:00:08 +00:00
|
|
|
(error "This does not seem to be a capture buffer for Org mode"))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(run-hooks 'org-capture-prepare-finalize-hook)
|
|
|
|
|
2010-06-23 08:36:42 +00:00
|
|
|
;; Did we start the clock in this capture buffer?
|
|
|
|
(when (and org-capture-clock-was-started
|
2018-02-21 14:02:33 +00:00
|
|
|
org-clock-marker
|
|
|
|
(eq (marker-buffer org-clock-marker) (buffer-base-buffer))
|
|
|
|
(>= org-clock-marker (point-min))
|
2010-06-23 08:36:42 +00:00
|
|
|
(< org-clock-marker (point-max)))
|
2018-02-21 14:02:33 +00:00
|
|
|
;; Looks like the clock we started is still running.
|
|
|
|
(if org-capture-clock-keep
|
|
|
|
;; User may have completed clocked heading from the template.
|
|
|
|
;; Refresh clock mode line.
|
|
|
|
(org-clock-update-mode-line t)
|
|
|
|
;; Clock out. Possibly resume interrupted clock.
|
|
|
|
(let (org-log-note-clock-out) (org-clock-out))
|
|
|
|
(when (and (org-capture-get :clock-resume 'local)
|
|
|
|
(markerp (org-capture-get :interrupted-clock 'local))
|
|
|
|
(buffer-live-p (marker-buffer
|
|
|
|
(org-capture-get :interrupted-clock 'local))))
|
|
|
|
(let ((clock-in-task (org-capture-get :interrupted-clock 'local)))
|
|
|
|
(org-with-point-at clock-in-task (org-clock-in)))
|
|
|
|
(message "Interrupted clock has been resumed"))))
|
2010-06-23 08:36:42 +00:00
|
|
|
|
2018-04-21 13:21:25 +00:00
|
|
|
(let ((abort-note nil))
|
2011-03-06 13:10:28 +00:00
|
|
|
;; Store the size of the capture buffer
|
|
|
|
(org-capture-put :captured-entry-size (- (point-max) (point-min)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(widen)
|
2011-03-06 13:10:28 +00:00
|
|
|
;; Store the insertion point in the target buffer
|
|
|
|
(org-capture-put :insertion-point (point))
|
2010-06-23 08:36:42 +00:00
|
|
|
|
|
|
|
(if org-note-abort
|
2018-04-21 13:21:25 +00:00
|
|
|
(let ((beg (org-capture-get :begin-marker 'local))
|
|
|
|
(end (org-capture-get :end-marker 'local)))
|
|
|
|
(if (not (and beg end)) (setq abort-note 'dirty)
|
|
|
|
(setq abort-note t)
|
|
|
|
(org-with-wide-buffer (kill-region beg end))))
|
2010-06-23 08:36:42 +00:00
|
|
|
|
|
|
|
;; Postprocessing: Update Statistics cookies, do the sorting
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(when (derived-mode-p 'org-mode)
|
2010-06-23 08:36:42 +00:00
|
|
|
(save-excursion
|
|
|
|
(when (ignore-errors (org-back-to-heading))
|
|
|
|
(org-update-parent-todo-statistics)
|
|
|
|
(org-update-checkbox-count)))
|
|
|
|
;; FIXME Here we should do the sorting
|
|
|
|
;; If we have added a table line, maybe recompute?
|
|
|
|
(when (and (eq (org-capture-get :type 'local) 'table-line)
|
|
|
|
(org-at-table-p))
|
2018-06-21 16:09:40 +00:00
|
|
|
(if (not (org-table-get-stored-formulas)) (org-table-align)
|
|
|
|
;; Adjust formulas, if necessary. We assume a non-nil
|
|
|
|
;; `:immediate-finish' means that no confirmation is
|
|
|
|
;; required. Else, obey `org-table-fix-formulas-confirm'.
|
|
|
|
;;
|
|
|
|
;; The delta required to fix formulas depends on the
|
|
|
|
;; number of rows inserted by the template.
|
|
|
|
(when (or (org-capture-get :immediate-finish)
|
|
|
|
(not org-table-fix-formulas-confirm)
|
|
|
|
(funcall org-table-fix-formulas-confirm "Fix formulas? "))
|
|
|
|
(org-table-fix-formulas
|
|
|
|
"@" nil (1- (org-table-current-dline))
|
|
|
|
(count-lines (org-capture-get :begin-marker 'local)
|
|
|
|
(org-capture-get :end-marker 'local))))
|
|
|
|
(org-table-recalculate 'all)))) ;FIXME: should we iterate?
|
2010-06-23 08:36:42 +00:00
|
|
|
;; Store this place as the last one where we stored something
|
|
|
|
;; Do the marking in the base buffer, so that it makes sense after
|
|
|
|
;; the indirect buffer has been killed.
|
2017-01-11 08:52:57 +00:00
|
|
|
(org-capture-store-last-position)
|
2010-06-29 07:14:21 +00:00
|
|
|
|
2010-06-23 08:36:42 +00:00
|
|
|
;; Run the hook
|
2011-07-11 22:57:57 +00:00
|
|
|
(run-hooks 'org-capture-before-finalize-hook))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2012-09-25 14:32:52 +00:00
|
|
|
(when (org-capture-get :decrypted)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (org-capture-get :decrypted))
|
|
|
|
(org-encrypt-entry)))
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
;; Kill the indirect buffer
|
2010-10-26 15:44:34 +00:00
|
|
|
(let ((return-wconf (org-capture-get :return-to-wconf 'local))
|
|
|
|
(new-buffer (org-capture-get :new-buffer 'local))
|
|
|
|
(kill-buffer (org-capture-get :kill-buffer 'local))
|
|
|
|
(base-buffer (buffer-base-buffer (current-buffer))))
|
|
|
|
|
2011-03-06 13:10:28 +00:00
|
|
|
;; Kill the indirect buffer
|
2009-10-13 07:41:40 +00:00
|
|
|
(kill-buffer (current-buffer))
|
2010-10-26 15:44:34 +00:00
|
|
|
|
2011-03-06 13:10:28 +00:00
|
|
|
;; Narrow back the target buffer to its previous state
|
|
|
|
(with-current-buffer (org-capture-get :buffer)
|
|
|
|
(let ((reg (org-capture-get :initial-target-region))
|
|
|
|
(pos (org-capture-get :initial-target-position))
|
|
|
|
(ipt (org-capture-get :insertion-point))
|
|
|
|
(size (org-capture-get :captured-entry-size)))
|
2014-03-13 09:44:41 +00:00
|
|
|
(if (not reg)
|
|
|
|
(widen)
|
2011-03-06 13:10:28 +00:00
|
|
|
(cond ((< ipt (car reg))
|
|
|
|
;; insertion point is before the narrowed region
|
|
|
|
(narrow-to-region (+ size (car reg)) (+ size (cdr reg))))
|
|
|
|
((> ipt (cdr reg))
|
|
|
|
;; insertion point is after the narrowed region
|
|
|
|
(narrow-to-region (car reg) (cdr reg)))
|
|
|
|
(t
|
|
|
|
;; insertion point is within the narrowed region
|
|
|
|
(narrow-to-region (car reg) (+ size (cdr reg)))))
|
|
|
|
;; now place back the point at its original position
|
|
|
|
(if (< ipt (car reg))
|
|
|
|
(goto-char (+ size pos))
|
|
|
|
(goto-char (if (< ipt pos) (+ size pos) pos))))))
|
|
|
|
|
2010-10-26 15:44:34 +00:00
|
|
|
;; Kill the target buffer if that is desired
|
|
|
|
(when (and base-buffer new-buffer kill-buffer)
|
|
|
|
(with-current-buffer base-buffer (save-buffer))
|
|
|
|
(kill-buffer base-buffer))
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
;; Restore the window configuration before capture
|
2010-06-23 08:36:42 +00:00
|
|
|
(set-window-configuration return-wconf))
|
2010-11-18 22:32:53 +00:00
|
|
|
|
|
|
|
(run-hooks 'org-capture-after-finalize-hook)
|
2010-12-06 08:32:24 +00:00
|
|
|
;; Special cases
|
|
|
|
(cond
|
|
|
|
(abort-note
|
2016-09-25 15:29:06 +00:00
|
|
|
(cl-case abort-note
|
2016-09-25 19:08:36 +00:00
|
|
|
(clean
|
|
|
|
(message "Capture process aborted and target buffer cleaned up"))
|
|
|
|
(dirty
|
|
|
|
(error "Capture process aborted, but target buffer could not be \
|
|
|
|
cleaned up correctly"))))
|
2010-12-06 08:32:24 +00:00
|
|
|
(stay-with-capture
|
|
|
|
(org-capture-goto-last-stored)))
|
|
|
|
;; Return if we did store something
|
|
|
|
(not abort-note)))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-refile ()
|
|
|
|
"Finalize the current capture and then refile the entry.
|
|
|
|
Refiling is done from the base buffer, because the indirect buffer is then
|
2011-02-23 15:47:37 +00:00
|
|
|
already gone. Any prefix argument will be passed to the refile command."
|
2009-10-13 07:41:40 +00:00
|
|
|
(interactive)
|
2010-06-23 08:36:42 +00:00
|
|
|
(unless (eq (org-capture-get :type 'local) 'entry)
|
2017-02-19 14:27:09 +00:00
|
|
|
(user-error "Refiling from a capture buffer makes only sense \
|
|
|
|
for `entry'-type templates"))
|
|
|
|
(let* ((base (or (buffer-base-buffer) (current-buffer)))
|
|
|
|
(pos (make-marker))
|
|
|
|
(org-capture-is-refiling t)
|
2017-08-31 21:14:04 +00:00
|
|
|
(kill-buffer (org-capture-get :kill-buffer 'local))
|
|
|
|
(jump-to-captured (org-capture-get :jump-to-captured 'local)))
|
2017-02-19 14:27:09 +00:00
|
|
|
;; Since `org-capture-finalize' may alter buffer contents (e.g.,
|
|
|
|
;; empty lines) around entry, use a marker to refer to the
|
|
|
|
;; headline to be refiled. Place the marker in the base buffer,
|
|
|
|
;; as the current indirect one is going to be killed.
|
2017-02-23 11:59:24 +00:00
|
|
|
(set-marker pos (save-excursion (org-back-to-heading t) (point)) base)
|
2017-08-31 21:14:04 +00:00
|
|
|
;; `org-capture-finalize' calls `org-capture-goto-last-stored' too
|
|
|
|
;; early. We want to wait for the refiling to be over, so we
|
|
|
|
;; control when the latter function is called.
|
|
|
|
(org-capture-put :kill-buffer nil :jump-to-captured nil)
|
2018-09-15 14:56:35 +00:00
|
|
|
(org-capture-finalize)
|
|
|
|
(save-window-excursion
|
|
|
|
(with-current-buffer base
|
|
|
|
(org-with-point-at pos
|
|
|
|
(call-interactively 'org-refile))))
|
|
|
|
(when kill-buffer
|
|
|
|
(with-current-buffer base (save-buffer))
|
|
|
|
(kill-buffer base))
|
|
|
|
(when jump-to-captured (org-capture-goto-last-stored))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-kill ()
|
|
|
|
"Abort the current capture process."
|
|
|
|
(interactive)
|
2012-08-11 17:35:34 +00:00
|
|
|
;; FIXME: This does not do the right thing, we need to remove the
|
|
|
|
;; new stuff by hand it is easy: undo, then kill the buffer
|
2011-07-12 06:29:55 +00:00
|
|
|
(let ((org-note-abort t)
|
2011-07-11 22:57:57 +00:00
|
|
|
(org-capture-before-finalize-hook nil))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-finalize)))
|
|
|
|
|
|
|
|
(defun org-capture-goto-last-stored ()
|
2011-07-10 17:30:40 +00:00
|
|
|
"Go to the location where the last capture note was stored."
|
2009-10-13 07:41:40 +00:00
|
|
|
(interactive)
|
|
|
|
(org-goto-marker-or-bmk org-capture-last-stored-marker
|
2014-03-07 13:09:16 +00:00
|
|
|
(plist-get org-bookmark-names-plist
|
|
|
|
:last-capture))
|
2010-06-22 12:29:13 +00:00
|
|
|
(message "This is the last note stored by a capture process"))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
;;; Supporting functions for handling the process
|
|
|
|
|
2011-03-06 13:10:28 +00:00
|
|
|
(defun org-capture-put-target-region-and-position ()
|
|
|
|
"Store the initial region with `org-capture-put'."
|
|
|
|
(org-capture-put
|
|
|
|
:initial-target-region
|
|
|
|
;; Check if the buffer is currently narrowed
|
2014-03-13 09:49:48 +00:00
|
|
|
(when (org-buffer-narrowed-p)
|
2011-03-06 13:10:28 +00:00
|
|
|
(cons (point-min) (point-max))))
|
|
|
|
;; store the current point
|
|
|
|
(org-capture-put :initial-target-position (point)))
|
|
|
|
|
2012-09-26 13:18:49 +00:00
|
|
|
(defvar org-time-was-given) ; dynamically scoped parameter
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-set-target-location (&optional target)
|
2012-09-25 14:32:52 +00:00
|
|
|
"Find TARGET buffer and position.
|
|
|
|
Store them in the capture property list."
|
2016-11-06 08:29:09 +00:00
|
|
|
(let ((target-entry-p t))
|
2009-10-13 07:41:40 +00:00
|
|
|
(save-excursion
|
2016-11-06 08:29:09 +00:00
|
|
|
(pcase (or target (org-capture-get :target))
|
|
|
|
(`(file ,path)
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(setq target-entry-p nil))
|
|
|
|
(`(id ,id)
|
|
|
|
(pcase (org-id-find id)
|
|
|
|
(`(,path . ,position)
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
2011-03-06 13:10:28 +00:00
|
|
|
(widen)
|
|
|
|
(org-capture-put-target-region-and-position)
|
2016-11-06 08:29:09 +00:00
|
|
|
(goto-char position))
|
|
|
|
(_ (error "Cannot find target ID \"%s\"" id))))
|
|
|
|
(`(file+headline ,path ,headline)
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
2018-01-02 11:39:46 +00:00
|
|
|
;; Org expects the target file to be in Org mode, otherwise
|
|
|
|
;; it throws an error. However, the default notes files
|
|
|
|
;; should work out of the box. In this case, we switch it to
|
|
|
|
;; Org mode.
|
2016-11-06 08:29:09 +00:00
|
|
|
(unless (derived-mode-p 'org-mode)
|
2018-01-02 11:39:46 +00:00
|
|
|
(org-display-warning
|
|
|
|
(format "Capture requirement: switching buffer %S to Org mode"
|
|
|
|
(current-buffer)))
|
|
|
|
(org-mode))
|
2017-01-11 10:58:51 +00:00
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
2016-11-06 08:29:09 +00:00
|
|
|
(if (re-search-forward (format org-complex-heading-regexp-format
|
|
|
|
(regexp-quote headline))
|
|
|
|
nil t)
|
2018-01-02 11:39:46 +00:00
|
|
|
(beginning-of-line)
|
2016-11-06 08:29:09 +00:00
|
|
|
(goto-char (point-max))
|
2018-01-02 11:39:46 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
2016-11-06 08:29:09 +00:00
|
|
|
(insert "* " headline "\n")
|
|
|
|
(beginning-of-line 0)))
|
|
|
|
(`(file+olp ,path . ,outline-path)
|
|
|
|
(let ((m (org-find-olp (cons (org-capture-expand-file path)
|
|
|
|
outline-path))))
|
|
|
|
(set-buffer (marker-buffer m))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(goto-char m)
|
|
|
|
(set-marker m nil)))
|
|
|
|
(`(file+regexp ,path ,regexp)
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (not (re-search-forward regexp nil t))
|
|
|
|
(error "No match for target regexp in file %s" path)
|
|
|
|
(goto-char (if (org-capture-get :prepend)
|
|
|
|
(match-beginning 0)
|
|
|
|
(match-end 0)))
|
|
|
|
(org-capture-put :exact-position (point))
|
|
|
|
(setq target-entry-p
|
|
|
|
(and (derived-mode-p 'org-mode) (org-at-heading-p)))))
|
2017-02-01 05:44:00 +00:00
|
|
|
(`(file+olp+datetree ,path . ,outline-path)
|
|
|
|
(let ((m (if outline-path
|
|
|
|
(org-find-olp (cons (org-capture-expand-file path)
|
|
|
|
outline-path))
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
2017-03-17 07:26:29 +00:00
|
|
|
(point-marker))))
|
2017-02-01 05:44:00 +00:00
|
|
|
(set-buffer (marker-buffer m))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(goto-char m)
|
|
|
|
(set-marker m nil)
|
|
|
|
(require 'org-datetree)
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
;; Make a date/week tree entry, with the current date (or
|
|
|
|
;; yesterday, if we are extending dates for a couple of hours)
|
|
|
|
(funcall
|
|
|
|
(if (eq (org-capture-get :tree-type) 'week)
|
|
|
|
#'org-datetree-find-iso-week-create
|
|
|
|
#'org-datetree-find-date-create)
|
|
|
|
(calendar-gregorian-from-absolute
|
|
|
|
(cond
|
|
|
|
(org-overriding-default-time
|
|
|
|
;; Use the overriding default time.
|
|
|
|
(time-to-days org-overriding-default-time))
|
|
|
|
((or (org-capture-get :time-prompt)
|
|
|
|
(equal current-prefix-arg 1))
|
|
|
|
;; Prompt for date.
|
|
|
|
(let ((prompt-time (org-read-date
|
|
|
|
nil t nil "Date for tree entry:"
|
|
|
|
(current-time))))
|
|
|
|
(org-capture-put
|
|
|
|
:default-time
|
|
|
|
(cond ((and (or (not (boundp 'org-time-was-given))
|
|
|
|
(not org-time-was-given))
|
|
|
|
(not (= (time-to-days prompt-time) (org-today))))
|
|
|
|
;; Use 00:00 when no time is given for another
|
|
|
|
;; date than today?
|
|
|
|
(apply #'encode-time
|
2018-04-11 21:01:16 +00:00
|
|
|
(append `(0 0 ,org-extend-today-until)
|
2017-02-01 05:44:00 +00:00
|
|
|
(cl-cdddr (decode-time prompt-time)))))
|
|
|
|
((string-match "\\([^ ]+\\)--?[^ ]+[ ]+\\(.*\\)"
|
|
|
|
org-read-date-final-answer)
|
|
|
|
;; Replace any time range by its start.
|
|
|
|
(apply #'encode-time
|
|
|
|
(org-read-date-analyze
|
|
|
|
(replace-match "\\1 \\2" nil nil
|
|
|
|
org-read-date-final-answer)
|
|
|
|
prompt-time (decode-time prompt-time))))
|
|
|
|
(t prompt-time)))
|
|
|
|
(time-to-days prompt-time)))
|
|
|
|
(t
|
|
|
|
;; Current date, possibly corrected for late night
|
|
|
|
;; workers.
|
|
|
|
(org-today))))
|
|
|
|
;; the following is the keep-restriction argument for
|
|
|
|
;; org-datetree-find-date-create
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(when outline-path 'subtree-at-point))))
|
2016-11-06 08:29:09 +00:00
|
|
|
(`(file+function ,path ,function)
|
|
|
|
(set-buffer (org-capture-target-buffer path))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(funcall function)
|
|
|
|
(org-capture-put :exact-position (point))
|
|
|
|
(setq target-entry-p
|
|
|
|
(and (derived-mode-p 'org-mode) (org-at-heading-p))))
|
|
|
|
(`(function ,fun)
|
|
|
|
(funcall fun)
|
|
|
|
(org-capture-put :exact-position (point))
|
|
|
|
(setq target-entry-p
|
|
|
|
(and (derived-mode-p 'org-mode) (org-at-heading-p))))
|
|
|
|
(`(clock)
|
|
|
|
(if (and (markerp org-clock-hd-marker)
|
|
|
|
(marker-buffer org-clock-hd-marker))
|
|
|
|
(progn (set-buffer (marker-buffer org-clock-hd-marker))
|
|
|
|
(org-capture-put-target-region-and-position)
|
|
|
|
(widen)
|
|
|
|
(goto-char org-clock-hd-marker))
|
|
|
|
(error "No running clock that could be used as capture target")))
|
|
|
|
(target (error "Invalid capture target specification: %S" target)))
|
|
|
|
|
|
|
|
(org-capture-put :buffer (current-buffer)
|
|
|
|
:pos (point)
|
2012-09-25 14:32:52 +00:00
|
|
|
:target-entry-p target-entry-p
|
2016-11-06 08:29:09 +00:00
|
|
|
:decrypted
|
|
|
|
(and (featurep 'org-crypt)
|
|
|
|
(org-at-encrypted-entry-p)
|
|
|
|
(save-excursion
|
|
|
|
(org-decrypt-entry)
|
|
|
|
(and (org-back-to-heading t) (point))))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2011-02-22 09:04:00 +00:00
|
|
|
(defun org-capture-expand-file (file)
|
2016-11-06 07:56:22 +00:00
|
|
|
"Expand functions, symbols and file names for FILE.
|
2016-11-04 16:30:12 +00:00
|
|
|
When FILE is a function, call it. When it is a form, evaluate
|
2016-11-06 07:59:47 +00:00
|
|
|
it. When it is a variable, return its value. When it is
|
2016-11-06 07:56:22 +00:00
|
|
|
a string, treat it as a file name, possibly expanding it
|
|
|
|
according to `org-directory', and return it. If it is the empty
|
|
|
|
string, however, return `org-default-notes-file'. In any other
|
|
|
|
case, raise an error."
|
2016-11-06 10:20:25 +00:00
|
|
|
(let ((location (cond ((equal file "") org-default-notes-file)
|
|
|
|
((stringp file) (expand-file-name file org-directory))
|
|
|
|
((functionp file) (funcall file))
|
2017-03-13 00:58:15 +00:00
|
|
|
((and (symbolp file) (boundp file)) (symbol-value file))
|
2016-11-06 10:20:25 +00:00
|
|
|
(t nil))))
|
|
|
|
(or (org-string-nw-p location)
|
|
|
|
(error "Invalid file location: %S" location))))
|
2011-02-22 09:04:00 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-target-buffer (file)
|
2016-11-06 07:56:22 +00:00
|
|
|
"Get a buffer for FILE.
|
|
|
|
FILE is a generalized file location, as handled by
|
|
|
|
`org-capture-expand-file'."
|
2016-11-06 10:20:25 +00:00
|
|
|
(let ((file (org-capture-expand-file file)))
|
2016-11-06 07:56:22 +00:00
|
|
|
(or (org-find-base-buffer-visiting file)
|
|
|
|
(progn (org-capture-put :new-buffer t)
|
|
|
|
(find-file-noselect file)))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2013-11-06 14:51:57 +00:00
|
|
|
(defun org-capture-place-template (&optional inhibit-wconf-store)
|
|
|
|
"Insert the template at the target location, and display the buffer.
|
|
|
|
When `inhibit-wconf-store', don't store the window configuration, as it
|
|
|
|
may have been stored before."
|
|
|
|
(unless inhibit-wconf-store
|
|
|
|
(org-capture-put :return-to-wconf (current-window-configuration)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(delete-other-windows)
|
|
|
|
(org-switch-to-buffer-other-window
|
|
|
|
(org-capture-get-indirect-buffer (org-capture-get :buffer) "CAPTURE"))
|
2010-09-23 19:04:10 +00:00
|
|
|
(widen)
|
2017-12-06 15:03:23 +00:00
|
|
|
(org-show-all)
|
2009-10-13 07:41:40 +00:00
|
|
|
(goto-char (org-capture-get :pos))
|
2015-11-05 16:47:38 +00:00
|
|
|
(setq-local outline-level 'org-outline-level)
|
2015-12-05 08:30:17 +00:00
|
|
|
(pcase (org-capture-get :type)
|
|
|
|
((or `nil `entry) (org-capture-place-entry))
|
|
|
|
(`table-line (org-capture-place-table-line))
|
|
|
|
(`plain (org-capture-place-plain-text))
|
|
|
|
(`item (org-capture-place-item))
|
|
|
|
(`checkitem (org-capture-place-item)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-mode 1)
|
2015-11-05 16:47:38 +00:00
|
|
|
(setq-local org-capture-current-plist org-capture-plist))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-place-entry ()
|
|
|
|
"Place the template as a new Org entry."
|
2018-10-22 23:53:18 +00:00
|
|
|
(let ((template (org-capture-get :template))
|
|
|
|
(reversed? (org-capture-get :prepend))
|
2017-09-09 16:08:06 +00:00
|
|
|
(level 1))
|
2018-10-22 23:53:18 +00:00
|
|
|
(org-capture-verify-tree template)
|
2017-06-02 07:21:44 +00:00
|
|
|
(when (org-capture-get :exact-position)
|
|
|
|
(goto-char (org-capture-get :exact-position)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(cond
|
2017-06-02 07:21:44 +00:00
|
|
|
;; Insert as a child of the current entry.
|
|
|
|
((org-capture-get :target-entry-p)
|
|
|
|
(setq level (org-get-valid-level
|
|
|
|
(if (org-at-heading-p) (org-outline-level) 1)
|
|
|
|
1))
|
2018-03-11 18:21:29 +00:00
|
|
|
(if reversed? (outline-next-heading) (org-end-of-subtree t t)))
|
2017-06-02 07:21:44 +00:00
|
|
|
;; Insert as a top-level entry at the beginning of the file.
|
|
|
|
(reversed?
|
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (org-at-heading-p) (outline-next-heading)))
|
|
|
|
;; Otherwise, insert as a top-level entry at the end of the file.
|
|
|
|
(t (goto-char (point-max))))
|
2018-10-22 21:40:49 +00:00
|
|
|
(let ((origin (point)))
|
2018-10-22 20:22:21 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
|
|
|
(org-capture-empty-lines-before)
|
2018-10-22 23:53:18 +00:00
|
|
|
(org-capture-position-for-last-stored (point))
|
2018-10-22 21:40:49 +00:00
|
|
|
(let ((beg (point)))
|
2018-10-22 23:53:18 +00:00
|
|
|
(org-paste-subtree level template 'for-yank)
|
2018-10-22 21:40:49 +00:00
|
|
|
(let ((end (if (org-at-heading-p) (line-end-position 0) (point))))
|
|
|
|
(org-capture-empty-lines-after)
|
|
|
|
(unless (org-at-heading-p) (outline-next-heading))
|
|
|
|
(org-capture-mark-kill-region origin (point))
|
|
|
|
(org-capture-narrow beg end)
|
|
|
|
(when (or (search-backward "%?" beg t)
|
|
|
|
(search-forward "%?" end t))
|
|
|
|
(replace-match "")))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-place-item ()
|
|
|
|
"Place the template as a new plain list item."
|
|
|
|
(let* ((txt (org-capture-get :template))
|
|
|
|
(target-entry-p (org-capture-get :target-entry-p))
|
2010-07-05 06:10:46 +00:00
|
|
|
(ind 0)
|
|
|
|
beg end)
|
2012-01-24 05:41:49 +00:00
|
|
|
(if (org-capture-get :exact-position)
|
|
|
|
(goto-char (org-capture-get :exact-position))
|
|
|
|
(cond
|
|
|
|
((not target-entry-p)
|
|
|
|
;; Insert as top-level entry, either at beginning or at end of file
|
|
|
|
(setq beg (point-min) end (point-max)))
|
|
|
|
(t
|
|
|
|
(setq beg (1+ (point-at-eol))
|
|
|
|
end (save-excursion (outline-next-heading) (point)))))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(setq ind nil)
|
2012-01-24 05:41:49 +00:00
|
|
|
(if (org-capture-get :prepend)
|
2009-10-13 07:41:40 +00:00
|
|
|
(progn
|
2012-01-24 05:41:49 +00:00
|
|
|
(goto-char beg)
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(when (org-list-search-forward (org-item-beginning-re) end t)
|
|
|
|
(goto-char (match-beginning 0))
|
2018-05-08 23:26:31 +00:00
|
|
|
(setq ind (current-indentation))))
|
2012-01-24 05:41:49 +00:00
|
|
|
(goto-char end)
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(when (org-list-search-backward (org-item-beginning-re) beg t)
|
2018-05-08 23:26:31 +00:00
|
|
|
(setq ind (current-indentation))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(org-end-of-item)))
|
|
|
|
(unless ind (goto-char end)))
|
2009-10-13 07:41:40 +00:00
|
|
|
;; Remove common indentation
|
|
|
|
(setq txt (org-remove-indentation txt))
|
|
|
|
;; Make sure this is indeed an item
|
|
|
|
(unless (string-match (concat "\\`" (org-item-re)) txt)
|
|
|
|
(setq txt (concat "- "
|
|
|
|
(mapconcat 'identity (split-string txt "\n")
|
|
|
|
"\n "))))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
;; Prepare surrounding empty lines.
|
2017-06-30 11:50:39 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(org-capture-empty-lines-before)
|
|
|
|
(setq beg (point))
|
|
|
|
(unless (eolp) (save-excursion (insert "\n")))
|
|
|
|
(unless ind
|
|
|
|
(org-indent-line)
|
2018-05-08 23:26:31 +00:00
|
|
|
(setq ind (current-indentation))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
(delete-region beg (point)))
|
2009-10-13 07:41:40 +00:00
|
|
|
;; Set the correct indentation, depending on context
|
|
|
|
(setq ind (make-string ind ?\ ))
|
|
|
|
(setq txt (concat ind
|
|
|
|
(mapconcat 'identity (split-string txt "\n")
|
2010-06-23 08:36:42 +00:00
|
|
|
(concat "\n" ind))
|
|
|
|
"\n"))
|
org-capture: Better indentation when creating a new list
lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.
Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:
* Top Level
** Second Level
- item #1
- item #2
- item #3
The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.
Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list. And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:
* Top Level
** Second Level
This is some introductory text:
- item #1
- item #2
- item #3
TINYCHANGE
2014-10-07 15:59:23 +00:00
|
|
|
;; Insert item.
|
2009-10-13 07:41:40 +00:00
|
|
|
(insert txt)
|
2017-05-23 16:10:06 +00:00
|
|
|
(org-capture-empty-lines-after)
|
2010-06-29 07:14:21 +00:00
|
|
|
(org-capture-position-for-last-stored beg)
|
2009-10-13 07:41:40 +00:00
|
|
|
(setq end (point))
|
2017-06-30 11:27:38 +00:00
|
|
|
(org-capture-mark-kill-region beg end)
|
|
|
|
(org-capture-narrow beg end)
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(when (or (re-search-backward "%\\?" beg t)
|
|
|
|
(re-search-forward "%\\?" end t))
|
|
|
|
(replace-match ""))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-place-table-line ()
|
|
|
|
"Place the template as a table line."
|
2010-06-23 15:41:24 +00:00
|
|
|
(require 'org-table)
|
2018-04-29 22:52:57 +00:00
|
|
|
(let ((text
|
|
|
|
(pcase (org-trim (org-capture-get :template))
|
|
|
|
((pred (string-match-p org-table-border-regexp))
|
|
|
|
"| %?Bad template |")
|
|
|
|
(text (concat text "\n"))))
|
|
|
|
(table-line-pos (org-capture-get :table-line-pos))
|
|
|
|
beg end)
|
2009-10-13 07:41:40 +00:00
|
|
|
(cond
|
2010-07-05 06:10:46 +00:00
|
|
|
((org-capture-get :exact-position)
|
2018-05-17 20:46:09 +00:00
|
|
|
(setq beg (org-capture-get :exact-position))
|
|
|
|
(setq end (save-excursion (outline-next-heading) (point))))
|
2018-04-29 22:52:57 +00:00
|
|
|
((not (org-capture-get :target-entry-p))
|
|
|
|
;; Table is not necessarily under a heading. Find first table
|
|
|
|
;; in the buffer.
|
2009-10-13 07:41:40 +00:00
|
|
|
(setq beg (point-min) end (point-max)))
|
|
|
|
(t
|
2018-04-29 22:52:57 +00:00
|
|
|
;; We are at a heading, limit search to the body.
|
|
|
|
(setq beg (line-beginning-position 2))
|
|
|
|
(setq end (save-excursion (outline-next-heading) (point)))))
|
|
|
|
(goto-char beg)
|
|
|
|
;; Narrow to the table, possibly creating one if necessary.
|
|
|
|
(catch :found
|
|
|
|
(while (re-search-forward org-table-dataline-regexp end t)
|
|
|
|
(pcase (org-element-lineage (org-element-at-point) '(table) t)
|
|
|
|
(`nil nil)
|
2018-06-21 16:13:31 +00:00
|
|
|
((pred (lambda (e) (eq 'table.el (org-element-property :type e))))
|
2018-06-21 10:17:07 +00:00
|
|
|
nil)
|
2018-04-29 22:52:57 +00:00
|
|
|
(table
|
2018-06-21 10:17:07 +00:00
|
|
|
(goto-char (org-element-property :contents-end table))
|
2018-04-29 22:52:57 +00:00
|
|
|
(narrow-to-region (org-element-property :post-affiliated table)
|
|
|
|
(point))
|
|
|
|
(throw :found t))))
|
|
|
|
;; No table found. Create it with an empty header.
|
2009-10-13 07:41:40 +00:00
|
|
|
(goto-char end)
|
2018-04-29 22:52:57 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
|
|
|
(let ((origin (point)))
|
|
|
|
(insert "| |\n|----|\n")
|
|
|
|
(narrow-to-region origin (point))))
|
|
|
|
;; In the current table, find the appropriate location for TEXT.
|
2010-06-23 15:16:44 +00:00
|
|
|
(cond
|
|
|
|
((and table-line-pos
|
2018-04-29 22:52:57 +00:00
|
|
|
(string-match "\\(I+\\)\\([-+][0-9]+\\)" table-line-pos))
|
2016-04-13 21:47:36 +00:00
|
|
|
(goto-char (point-min))
|
2018-04-29 22:52:57 +00:00
|
|
|
(let ((line
|
|
|
|
(condition-case _
|
|
|
|
(progn
|
|
|
|
(save-match-data (org-table-analyze))
|
|
|
|
(aref org-table-hlines
|
|
|
|
(- (match-end 1) (match-beginning 1))))
|
|
|
|
(error
|
|
|
|
(error "Invalid table line specification %S" table-line-pos))))
|
2015-07-31 08:48:14 +00:00
|
|
|
(delta (string-to-number (match-string 2 table-line-pos))))
|
2018-04-29 22:52:57 +00:00
|
|
|
(forward-line (+ line delta (if (< delta 0) 0 -1)))
|
|
|
|
(forward-line))) ;insert below
|
2010-06-23 15:16:44 +00:00
|
|
|
((org-capture-get :prepend)
|
|
|
|
(goto-char (point-min))
|
2018-04-29 22:52:57 +00:00
|
|
|
(cond
|
|
|
|
((not (re-search-forward org-table-hline-regexp nil t)))
|
|
|
|
((re-search-forward org-table-dataline-regexp nil t) (beginning-of-line))
|
|
|
|
(t (goto-char (org-table-end)))))
|
2010-06-23 15:16:44 +00:00
|
|
|
(t
|
2018-04-29 22:52:57 +00:00
|
|
|
(goto-char (org-table-end))))
|
|
|
|
;; Insert text and position point according to template.
|
2018-10-22 22:04:37 +00:00
|
|
|
(let ((origin (point)))
|
|
|
|
(unless (bolp) (insert "\n"))
|
|
|
|
(let ((beg (point))
|
|
|
|
(end (save-excursion
|
|
|
|
(insert text)
|
|
|
|
(point))))
|
|
|
|
(org-capture-position-for-last-stored 'table-line)
|
|
|
|
(org-capture-mark-kill-region origin end)
|
2018-10-22 23:32:55 +00:00
|
|
|
;; TEXT is guaranteed to end with a newline character. Ignore
|
|
|
|
;; it when narrowing so as to not alter data on the next line.
|
|
|
|
(org-capture-narrow beg (1- end))
|
2018-10-22 22:04:37 +00:00
|
|
|
(when (or (search-backward "%?" beg t)
|
|
|
|
(search-forward "%?" end t))
|
|
|
|
(replace-match "")))
|
|
|
|
(org-table-align))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-place-plain-text ()
|
2011-04-07 06:36:31 +00:00
|
|
|
"Place the template plainly.
|
|
|
|
If the target locator points at an Org node, place the template into
|
|
|
|
the text of the entry, before the first child. If not, place the
|
|
|
|
template at the beginning or end of the file.
|
2011-04-07 16:41:55 +00:00
|
|
|
Of course, if exact position has been required, just put it there."
|
2018-10-22 23:22:49 +00:00
|
|
|
(cond
|
|
|
|
((org-capture-get :exact-position)
|
|
|
|
(goto-char (org-capture-get :exact-position)))
|
2018-10-22 23:46:57 +00:00
|
|
|
((org-capture-get :target-entry-p)
|
2018-10-22 23:22:49 +00:00
|
|
|
;; Place the text into this entry.
|
|
|
|
(if (org-capture-get :prepend)
|
|
|
|
;; Skip meta data and drawers.
|
|
|
|
(org-end-of-meta-data t)
|
2018-10-22 23:46:57 +00:00
|
|
|
;; Go to end of the entry text, before the next headline.
|
2018-10-22 23:22:49 +00:00
|
|
|
(outline-next-heading)))
|
|
|
|
(t
|
|
|
|
;; Beginning or end of file.
|
|
|
|
(goto-char (if (org-capture-get :prepend) (point-min) (point-max)))))
|
|
|
|
(let ((origin (point)))
|
|
|
|
(unless (bolp) (insert "\n"))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-empty-lines-before)
|
2018-10-22 23:22:49 +00:00
|
|
|
(org-capture-position-for-last-stored (point))
|
|
|
|
(let ((beg (point)))
|
|
|
|
(insert (org-capture-get :template))
|
|
|
|
(unless (bolp) (insert "\n"))
|
|
|
|
;; Ignore the final newline character so as to not alter data
|
|
|
|
;; after inserted text. Yet, if the template is empty, make
|
|
|
|
;; sure END matches BEG instead of pointing before it.
|
|
|
|
(let ((end (max beg (1- (point)))))
|
|
|
|
(org-capture-empty-lines-after)
|
|
|
|
(org-capture-mark-kill-region origin (point))
|
|
|
|
(org-capture-narrow beg end)
|
|
|
|
(when (or (search-backward "%?" beg t)
|
|
|
|
(search-forward "%?" end t))
|
|
|
|
(replace-match ""))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2010-06-23 11:26:25 +00:00
|
|
|
(defun org-capture-mark-kill-region (beg end)
|
|
|
|
"Mark the region that will have to be killed when aborting capture."
|
2017-11-02 10:47:19 +00:00
|
|
|
(let ((m1 (copy-marker beg))
|
|
|
|
(m2 (copy-marker end t)))
|
2010-06-23 08:36:42 +00:00
|
|
|
(org-capture-put :begin-marker m1)
|
|
|
|
(org-capture-put :end-marker m2)))
|
|
|
|
|
2010-06-29 07:14:21 +00:00
|
|
|
(defun org-capture-position-for-last-stored (where)
|
|
|
|
"Memorize the position that should later become the position of last capture."
|
|
|
|
(cond
|
|
|
|
((integerp where)
|
|
|
|
(org-capture-put :position-for-last-stored
|
|
|
|
(move-marker (make-marker) where
|
|
|
|
(or (buffer-base-buffer (current-buffer))
|
|
|
|
(current-buffer)))))
|
|
|
|
((eq where 'table-line)
|
|
|
|
(org-capture-put :position-for-last-stored
|
|
|
|
(list 'table-line
|
|
|
|
(org-table-current-dline))))
|
|
|
|
(t (error "This should not happen"))))
|
|
|
|
|
2017-01-11 08:52:57 +00:00
|
|
|
(defun org-capture-store-last-position ()
|
|
|
|
"Store the last-captured position."
|
2010-06-29 07:14:21 +00:00
|
|
|
(let* ((where (org-capture-get :position-for-last-stored 'local))
|
|
|
|
(pos (cond
|
|
|
|
((markerp where)
|
|
|
|
(prog1 (marker-position where)
|
|
|
|
(move-marker where nil)))
|
|
|
|
((and (listp where) (eq (car where) 'table-line))
|
|
|
|
(if (org-at-table-p)
|
|
|
|
(save-excursion
|
|
|
|
(org-table-goto-line (nth 1 where))
|
|
|
|
(point-at-bol))
|
|
|
|
(point))))))
|
|
|
|
(with-current-buffer (buffer-base-buffer (current-buffer))
|
2017-01-11 08:52:57 +00:00
|
|
|
(org-with-point-at pos
|
|
|
|
(when org-capture-bookmark
|
|
|
|
(let ((bookmark (plist-get org-bookmark-names-plist :last-capture)))
|
|
|
|
(when bookmark (with-demoted-errors (bookmark-set bookmark)))))
|
|
|
|
(move-marker org-capture-last-stored-marker (point))))))
|
2010-06-29 07:14:21 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-narrow (beg end)
|
2010-07-15 20:26:51 +00:00
|
|
|
"Narrow, unless configuration says not to narrow."
|
2009-10-13 07:41:40 +00:00
|
|
|
(unless (org-capture-get :unnarrowed)
|
|
|
|
(narrow-to-region beg end)
|
|
|
|
(goto-char beg)))
|
|
|
|
|
|
|
|
(defun org-capture-empty-lines-before (&optional n)
|
2013-03-05 14:35:08 +00:00
|
|
|
"Set the correct number of empty lines before the insertion point.
|
2010-07-15 20:26:51 +00:00
|
|
|
Point will be after the empty lines, so insertion can directly be done."
|
2012-01-29 15:52:08 +00:00
|
|
|
(setq n (or n (org-capture-get :empty-lines-before)
|
|
|
|
(org-capture-get :empty-lines) 0))
|
2009-10-13 07:41:40 +00:00
|
|
|
(let ((pos (point)))
|
|
|
|
(org-back-over-empty-lines)
|
|
|
|
(delete-region (point) pos)
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(when (> n 0) (newline n))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-empty-lines-after (&optional n)
|
2013-03-05 14:35:08 +00:00
|
|
|
"Set the correct number of empty lines after the inserted string.
|
2009-10-13 07:41:40 +00:00
|
|
|
Point will remain at the first line after the inserted text."
|
2012-01-29 15:52:08 +00:00
|
|
|
(setq n (or n (org-capture-get :empty-lines-after)
|
|
|
|
(org-capture-get :empty-lines) 0))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-back-over-empty-lines)
|
|
|
|
(while (looking-at "[ \t]*\n") (replace-match ""))
|
|
|
|
(let ((pos (point)))
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(when (> n 0) (newline n))
|
2009-10-13 07:41:40 +00:00
|
|
|
(goto-char pos)))
|
|
|
|
|
|
|
|
(defvar org-clock-marker) ; Defined in org.el
|
2012-10-02 08:03:15 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-insert-template-here ()
|
2013-03-05 14:35:08 +00:00
|
|
|
"Insert the capture template at point."
|
2009-10-13 07:41:40 +00:00
|
|
|
(let* ((template (org-capture-get :template))
|
|
|
|
(type (org-capture-get :type))
|
|
|
|
beg end pp)
|
2017-05-23 16:10:06 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
2009-10-13 07:41:40 +00:00
|
|
|
(setq beg (point))
|
|
|
|
(cond
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
((and (eq type 'entry) (derived-mode-p 'org-mode))
|
2011-03-01 06:24:14 +00:00
|
|
|
(org-capture-verify-tree (org-capture-get :template))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-paste-subtree nil template t))
|
|
|
|
((and (memq type '(item checkitem))
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(derived-mode-p 'org-mode)
|
2009-10-13 07:41:40 +00:00
|
|
|
(save-excursion (skip-chars-backward " \t\n")
|
|
|
|
(setq pp (point))
|
|
|
|
(org-in-item-p)))
|
|
|
|
(goto-char pp)
|
|
|
|
(org-insert-item)
|
|
|
|
(skip-chars-backward " ")
|
|
|
|
(skip-chars-backward "-+*0123456789).")
|
|
|
|
(delete-region (point) (point-at-eol))
|
|
|
|
(setq beg (point))
|
|
|
|
(org-remove-indentation template)
|
|
|
|
(insert template)
|
|
|
|
(org-capture-empty-lines-after)
|
|
|
|
(goto-char beg)
|
2010-08-17 19:29:49 +00:00
|
|
|
(org-list-repair)
|
2017-05-23 16:10:06 +00:00
|
|
|
(org-end-of-item))
|
|
|
|
(t
|
|
|
|
(insert template)
|
|
|
|
(org-capture-empty-lines-after)
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
(unless (eobp) (beginning-of-line))))
|
2009-10-13 07:41:40 +00:00
|
|
|
(setq end (point))
|
|
|
|
(goto-char beg)
|
2017-05-23 16:10:06 +00:00
|
|
|
(when (re-search-forward "%\\?" end t)
|
|
|
|
(replace-match ""))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-set-plist (entry)
|
|
|
|
"Initialize the property list from the template definition."
|
|
|
|
(setq org-capture-plist (copy-sequence (nthcdr 5 entry)))
|
|
|
|
(org-capture-put :key (car entry) :description (nth 1 entry)
|
|
|
|
:target (nth 3 entry))
|
|
|
|
(let ((txt (nth 4 entry)) (type (or (nth 2 entry) 'entry)))
|
2010-07-14 19:59:53 +00:00
|
|
|
(when (or (not txt) (and (stringp txt) (not (string-match "\\S-" txt))))
|
2009-10-13 07:41:40 +00:00
|
|
|
;; The template may be empty or omitted for special types.
|
|
|
|
;; Here we insert the default templates for such cases.
|
|
|
|
(cond
|
|
|
|
((eq type 'item) (setq txt "- %?"))
|
|
|
|
((eq type 'checkitem) (setq txt "- [ ] %?"))
|
|
|
|
((eq type 'table-line) (setq txt "| %? |"))
|
2010-06-23 04:24:26 +00:00
|
|
|
((member type '(nil entry)) (setq txt "* %?\n %a"))))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-put :template txt :type type)))
|
|
|
|
|
|
|
|
(defun org-capture-goto-target (&optional template-key)
|
|
|
|
"Go to the target location of a capture template.
|
|
|
|
The user is queried for the template."
|
|
|
|
(interactive)
|
2015-12-05 08:30:17 +00:00
|
|
|
(let ((entry (org-capture-select-template template-key)))
|
|
|
|
(unless entry (error "No capture template selected"))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-set-plist entry)
|
|
|
|
(org-capture-set-target-location)
|
2016-06-23 08:00:00 +00:00
|
|
|
(pop-to-buffer-same-window (org-capture-get :buffer))
|
2009-10-13 07:41:40 +00:00
|
|
|
(goto-char (org-capture-get :pos))))
|
|
|
|
|
|
|
|
(defun org-capture-get-indirect-buffer (&optional buffer prefix)
|
|
|
|
"Make an indirect buffer for a capture process.
|
|
|
|
Use PREFIX as a prefix for the name of the indirect buffer."
|
|
|
|
(setq buffer (or buffer (current-buffer)))
|
|
|
|
(let ((n 1) (base (buffer-name buffer)) bname)
|
|
|
|
(setq bname (concat prefix "-" base))
|
|
|
|
(while (buffer-live-p (get-buffer bname))
|
2016-07-25 14:34:48 +00:00
|
|
|
(setq bname (concat prefix "-" (number-to-string (cl-incf n)) "-" base)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(condition-case nil
|
|
|
|
(make-indirect-buffer buffer bname 'clone)
|
2011-10-26 17:43:07 +00:00
|
|
|
(error
|
|
|
|
(let ((buf (make-indirect-buffer buffer bname)))
|
|
|
|
(with-current-buffer buf (org-mode))
|
|
|
|
buf)))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2010-12-16 15:51:04 +00:00
|
|
|
(defun org-capture-verify-tree (tree)
|
2012-07-30 08:08:15 +00:00
|
|
|
"Throw error if TREE is not a valid tree."
|
2010-12-16 15:51:04 +00:00
|
|
|
(unless (org-kill-is-subtree-p tree)
|
|
|
|
(error "Template is not a valid Org entry or tree")))
|
|
|
|
|
2013-03-04 17:21:47 +00:00
|
|
|
;;; The template code
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-select-template (&optional keys)
|
|
|
|
"Select a capture template.
|
|
|
|
Lisp programs can force the template by setting KEYS to a string."
|
2010-12-20 13:22:14 +00:00
|
|
|
(let ((org-capture-templates
|
2012-08-24 10:14:54 +00:00
|
|
|
(or (org-contextualize-keys
|
2017-02-01 05:44:00 +00:00
|
|
|
(org-capture-upgrade-templates org-capture-templates)
|
|
|
|
org-capture-templates-contexts)
|
2010-12-20 13:22:14 +00:00
|
|
|
'(("t" "Task" entry (file+headline "" "Tasks")
|
|
|
|
"* TODO %?\n %u\n %a")))))
|
|
|
|
(if keys
|
|
|
|
(or (assoc keys org-capture-templates)
|
|
|
|
(error "No capture template referred to by \"%s\" keys" keys))
|
|
|
|
(org-mks org-capture-templates
|
|
|
|
"Select a capture template\n========================="
|
|
|
|
"Template key: "
|
|
|
|
'(("C" "Customize org-capture-templates")
|
|
|
|
("q" "Abort"))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2017-04-17 12:18:06 +00:00
|
|
|
(defvar org-capture--clipboards nil
|
|
|
|
"List various clipboards values.")
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(defun org-capture-fill-template (&optional template initial annotation)
|
|
|
|
"Fill a template and return the filled template as a string.
|
|
|
|
The template may still contain \"%?\" for cursor positioning."
|
2016-01-07 09:45:18 +00:00
|
|
|
(let* ((template (or template (org-capture-get :template)))
|
|
|
|
(buffer (org-capture-get :buffer))
|
2009-10-13 07:41:40 +00:00
|
|
|
(file (buffer-file-name (or (buffer-base-buffer buffer) buffer)))
|
2016-01-07 09:45:18 +00:00
|
|
|
(time (let* ((c (or (org-capture-get :default-time) (current-time)))
|
|
|
|
(d (decode-time c)))
|
|
|
|
(if (< (nth 2 d) org-extend-today-until)
|
|
|
|
(encode-time 0 59 23 (1- (nth 3 d)) (nth 4 d) (nth 5 d))
|
|
|
|
c)))
|
|
|
|
(v-t (format-time-string (org-time-stamp-format nil) time))
|
|
|
|
(v-T (format-time-string (org-time-stamp-format t) time))
|
|
|
|
(v-u (format-time-string (org-time-stamp-format nil t) time))
|
|
|
|
(v-U (format-time-string (org-time-stamp-format t t) time))
|
|
|
|
(v-c (and kill-ring (current-kill 0)))
|
2009-10-13 07:41:40 +00:00
|
|
|
(v-x (or (org-get-x-clipboard 'PRIMARY)
|
|
|
|
(org-get-x-clipboard 'CLIPBOARD)
|
2018-04-21 09:25:46 +00:00
|
|
|
(org-get-x-clipboard 'SECONDARY)
|
|
|
|
"")) ;ensure it is a string
|
2015-11-29 15:53:35 +00:00
|
|
|
;; `initial' and `annotation' might have been passed. But if
|
|
|
|
;; the property list has them, we prefer those values.
|
2009-10-13 07:41:40 +00:00
|
|
|
(v-i (or (plist-get org-store-link-plist :initial)
|
2016-01-07 09:45:18 +00:00
|
|
|
(and (stringp initial) (org-no-properties initial))
|
2009-10-13 07:41:40 +00:00
|
|
|
(org-capture-get :initial)
|
|
|
|
""))
|
2016-01-07 09:45:18 +00:00
|
|
|
(v-a
|
|
|
|
(let ((a (or (plist-get org-store-link-plist :annotation)
|
|
|
|
annotation
|
|
|
|
(org-capture-get :annotation)
|
|
|
|
"")))
|
|
|
|
;; Is the link empty? Then we do not want it...
|
|
|
|
(if (equal a "[[]]") "" a)))
|
2012-08-02 15:06:22 +00:00
|
|
|
(l-re "\\[\\[\\(.*?\\)\\]\\(\\[.*?\\]\\)?\\]")
|
|
|
|
(v-A (if (and v-a (string-match l-re v-a))
|
|
|
|
(replace-match "[[\\1][%^{Link description}]]" nil nil v-a)
|
|
|
|
v-a))
|
|
|
|
(v-l (if (and v-a (string-match l-re v-a))
|
|
|
|
(replace-match "\\1" nil nil v-a)
|
2009-10-13 07:41:40 +00:00
|
|
|
v-a))
|
|
|
|
(v-n user-full-name)
|
2017-07-13 12:08:20 +00:00
|
|
|
(v-k (if (marker-buffer org-clock-marker)
|
|
|
|
(org-no-properties org-clock-heading)
|
|
|
|
""))
|
2009-10-13 07:41:40 +00:00
|
|
|
(v-K (if (marker-buffer org-clock-marker)
|
|
|
|
(org-make-link-string
|
2017-07-14 08:40:03 +00:00
|
|
|
(format "%s::*%s"
|
2017-07-13 12:08:20 +00:00
|
|
|
(buffer-file-name (marker-buffer org-clock-marker))
|
2017-07-14 08:40:03 +00:00
|
|
|
v-k)
|
|
|
|
v-k)
|
2017-07-13 12:08:20 +00:00
|
|
|
""))
|
2011-01-07 14:28:57 +00:00
|
|
|
(v-f (or (org-capture-get :original-file-nondirectory) ""))
|
|
|
|
(v-F (or (org-capture-get :original-file) ""))
|
2017-04-17 12:18:06 +00:00
|
|
|
(org-capture--clipboards
|
|
|
|
(delq nil
|
|
|
|
(list v-i
|
|
|
|
(org-get-x-clipboard 'PRIMARY)
|
|
|
|
(org-get-x-clipboard 'CLIPBOARD)
|
|
|
|
(org-get-x-clipboard 'SECONDARY)
|
|
|
|
v-c))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2015-11-29 15:53:35 +00:00
|
|
|
(setq org-store-link-plist (plist-put org-store-link-plist :annotation v-a))
|
|
|
|
(setq org-store-link-plist (plist-put org-store-link-plist :initial v-i))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
2015-11-29 15:53:35 +00:00
|
|
|
(unless template
|
|
|
|
(setq template "")
|
|
|
|
(message "no template") (ding)
|
|
|
|
(sit-for 1))
|
2009-10-13 07:41:40 +00:00
|
|
|
(save-window-excursion
|
2015-06-25 07:58:34 +00:00
|
|
|
(org-switch-to-buffer-other-window (get-buffer-create "*Capture*"))
|
2010-06-27 10:26:08 +00:00
|
|
|
(erase-buffer)
|
2015-11-29 15:53:35 +00:00
|
|
|
(setq buffer-file-name nil)
|
|
|
|
(setq mark-active nil)
|
2016-01-07 09:45:18 +00:00
|
|
|
(insert template)
|
|
|
|
(goto-char (point-min))
|
2011-04-06 06:49:12 +00:00
|
|
|
|
2015-11-29 15:53:35 +00:00
|
|
|
;; %[] insert contents of a file.
|
|
|
|
(save-excursion
|
|
|
|
(while (re-search-forward "%\\[\\(.+\\)\\]" nil t)
|
2016-01-08 22:36:22 +00:00
|
|
|
(let ((filename (expand-file-name (match-string 1)))
|
|
|
|
(beg (copy-marker (match-beginning 0)))
|
|
|
|
(end (copy-marker (match-end 0))))
|
|
|
|
(unless (org-capture-escaped-%)
|
|
|
|
(delete-region beg end)
|
|
|
|
(set-marker beg nil)
|
|
|
|
(set-marker end nil)
|
2015-11-29 15:53:35 +00:00
|
|
|
(condition-case error
|
|
|
|
(insert-file-contents filename)
|
2016-01-08 22:36:22 +00:00
|
|
|
(error
|
|
|
|
(insert (format "%%![couldn not insert %s: %s]"
|
|
|
|
filename
|
|
|
|
error))))))))
|
2015-11-29 15:53:35 +00:00
|
|
|
|
|
|
|
;; Mark %() embedded elisp for later evaluation.
|
2016-01-07 09:45:18 +00:00
|
|
|
(org-capture-expand-embedded-elisp 'mark)
|
2015-11-29 15:53:35 +00:00
|
|
|
|
2015-12-03 22:27:07 +00:00
|
|
|
;; Expand non-interactive templates.
|
|
|
|
(let ((regexp "%\\(:[-a-za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlntTuUx]\\)"))
|
|
|
|
(save-excursion
|
|
|
|
(while (re-search-forward regexp nil t)
|
2016-01-08 22:36:22 +00:00
|
|
|
;; `org-capture-escaped-%' may modify buffer and cripple
|
|
|
|
;; match-data. Use markers instead. Ditto for other
|
|
|
|
;; templates.
|
2015-12-03 22:27:07 +00:00
|
|
|
(let ((pos (copy-marker (match-beginning 0)))
|
|
|
|
(end (copy-marker (match-end 0)))
|
|
|
|
(value (match-string 1))
|
|
|
|
(time-string (match-string 2)))
|
|
|
|
(unless (org-capture-escaped-%)
|
|
|
|
(delete-region pos end)
|
2016-01-08 22:36:22 +00:00
|
|
|
(set-marker pos nil)
|
|
|
|
(set-marker end nil)
|
2017-03-13 21:45:54 +00:00
|
|
|
(let* ((inside-sexp? (org-capture-inside-embedded-elisp-p))
|
|
|
|
(replacement
|
|
|
|
(pcase (string-to-char value)
|
2017-02-01 05:44:00 +00:00
|
|
|
(?< (format-time-string time-string time))
|
2017-03-13 21:45:54 +00:00
|
|
|
(?:
|
|
|
|
(or (plist-get org-store-link-plist (intern value))
|
|
|
|
""))
|
|
|
|
(?i
|
|
|
|
(if inside-sexp? v-i
|
|
|
|
;; Outside embedded Lisp, repeat leading
|
|
|
|
;; characters before initial place holder
|
|
|
|
;; every line.
|
|
|
|
(let ((lead (buffer-substring-no-properties
|
2016-01-08 22:36:22 +00:00
|
|
|
(line-beginning-position) (point))))
|
2017-03-13 21:45:54 +00:00
|
|
|
(replace-regexp-in-string "\n\\(.\\)"
|
|
|
|
(concat lead "\\1")
|
|
|
|
v-i nil nil 1))))
|
|
|
|
(?a v-a)
|
|
|
|
(?A v-A)
|
|
|
|
(?c v-c)
|
|
|
|
(?f v-f)
|
|
|
|
(?F v-F)
|
|
|
|
(?k v-k)
|
|
|
|
(?K v-K)
|
|
|
|
(?l v-l)
|
|
|
|
(?n v-n)
|
|
|
|
(?t v-t)
|
|
|
|
(?T v-T)
|
|
|
|
(?u v-u)
|
|
|
|
(?U v-U)
|
|
|
|
(?x v-x))))
|
2016-01-07 09:45:18 +00:00
|
|
|
(insert
|
2017-03-13 21:45:54 +00:00
|
|
|
(if inside-sexp?
|
|
|
|
;; Escape sensitive characters.
|
|
|
|
(replace-regexp-in-string "[\\\"]" "\\\\\\&" replacement)
|
2016-01-08 22:36:22 +00:00
|
|
|
replacement))))))))
|
2015-11-29 15:53:35 +00:00
|
|
|
|
|
|
|
;; Expand %() embedded Elisp. Limit to Sexp originally marked.
|
2016-01-07 09:45:18 +00:00
|
|
|
(org-capture-expand-embedded-elisp)
|
2015-11-29 15:53:35 +00:00
|
|
|
|
2015-12-03 22:27:07 +00:00
|
|
|
;; Expand interactive templates. This is the last step so that
|
2016-01-07 09:45:18 +00:00
|
|
|
;; template is mostly expanded when prompting happens. Turn on
|
|
|
|
;; Org mode and set local variables. This is to support
|
|
|
|
;; completion in interactive prompts.
|
2015-12-03 22:27:07 +00:00
|
|
|
(let ((org-inhibit-startup t)) (org-mode))
|
2016-01-07 09:45:18 +00:00
|
|
|
(org-clone-local-variables buffer "\\`org-")
|
2015-12-03 22:27:07 +00:00
|
|
|
(let (strings) ; Stores interactive answers.
|
|
|
|
(save-excursion
|
|
|
|
(let ((regexp "%\\^\\(?:{\\([^}]*\\)}\\)?\\([CgGLptTuU]\\)?"))
|
|
|
|
(while (re-search-forward regexp nil t)
|
2016-01-08 22:36:22 +00:00
|
|
|
(let* ((items (and (match-end 1)
|
|
|
|
(save-match-data
|
|
|
|
(split-string (match-string-no-properties 1)
|
|
|
|
"|"))))
|
|
|
|
(key (match-string 2))
|
|
|
|
(beg (copy-marker (match-beginning 0)))
|
|
|
|
(end (copy-marker (match-end 0)))
|
|
|
|
(prompt (nth 0 items))
|
|
|
|
(default (nth 1 items))
|
2016-07-29 13:58:08 +00:00
|
|
|
(completions (nthcdr 2 items)))
|
2016-01-08 22:36:22 +00:00
|
|
|
(unless (org-capture-escaped-%)
|
|
|
|
(delete-region beg end)
|
|
|
|
(set-marker beg nil)
|
|
|
|
(set-marker end nil)
|
2015-12-03 22:27:07 +00:00
|
|
|
(pcase key
|
2016-01-05 22:59:05 +00:00
|
|
|
((or "G" "g")
|
2015-12-03 22:27:07 +00:00
|
|
|
(let* ((org-last-tags-completion-table
|
|
|
|
(org-global-tags-completion-table
|
|
|
|
(cond ((equal key "G") (org-agenda-files))
|
|
|
|
(file (list file))
|
|
|
|
(t nil))))
|
|
|
|
(org-add-colon-after-tag-completion t)
|
|
|
|
(ins (mapconcat
|
|
|
|
#'identity
|
|
|
|
(org-split-string
|
|
|
|
(completing-read
|
|
|
|
(if prompt (concat prompt ": ") "Tags: ")
|
|
|
|
'org-tags-completion-function nil nil nil
|
|
|
|
'org-tags-history)
|
|
|
|
"[^[:alnum:]_@#%]+")
|
|
|
|
":")))
|
|
|
|
(when (org-string-nw-p ins)
|
|
|
|
(unless (eq (char-before) ?:) (insert ":"))
|
|
|
|
(insert ins)
|
|
|
|
(unless (eq (char-after) ?:) (insert ":"))
|
2018-04-20 08:45:19 +00:00
|
|
|
(when (org-at-heading-p) (org-align-tags)))))
|
2017-04-17 12:18:06 +00:00
|
|
|
((or "C" "L")
|
|
|
|
(let ((insert-fun (if (equal key "C") #'insert
|
2017-04-17 18:04:09 +00:00
|
|
|
(lambda (s) (org-insert-link 0 s)))))
|
|
|
|
(pcase org-capture--clipboards
|
|
|
|
(`nil nil)
|
2017-04-17 12:18:06 +00:00
|
|
|
(`(,value) (funcall insert-fun value))
|
|
|
|
(`(,first-value . ,_)
|
|
|
|
(funcall insert-fun
|
|
|
|
(read-string "Clipboard/kill value: "
|
|
|
|
first-value
|
|
|
|
'org-capture--clipboards
|
|
|
|
first-value)))
|
|
|
|
(_ (error "Invalid `org-capture--clipboards' value: %S"
|
|
|
|
org-capture--clipboards)))))
|
2018-06-16 14:39:25 +00:00
|
|
|
("p"
|
2018-06-16 21:15:34 +00:00
|
|
|
;; We remove file properties inherited from
|
|
|
|
;; target buffer so `org-read-property-value' has
|
|
|
|
;; a chance to find allowed values in sub-trees
|
|
|
|
;; from the target buffer.
|
|
|
|
(setq-local org-file-properties nil)
|
|
|
|
(let* ((origin (set-marker (make-marker)
|
|
|
|
(org-capture-get :pos)
|
|
|
|
(org-capture-get :buffer)))
|
|
|
|
;; Find location from where to get allowed
|
|
|
|
;; values. If `:target-entry-p' is
|
|
|
|
;; non-nil, the current headline in the
|
|
|
|
;; target buffer is going to be a parent
|
|
|
|
;; headline, so location is fine.
|
|
|
|
;; Otherwise, find the parent headline in
|
|
|
|
;; the target buffer.
|
|
|
|
(pom (if (org-capture-get :target-entry-p) origin
|
|
|
|
(let ((level (progn
|
|
|
|
(while (org-up-heading-safe))
|
|
|
|
(org-current-level))))
|
|
|
|
(org-with-point-at origin
|
|
|
|
(let ((l (if (org-at-heading-p)
|
|
|
|
(org-current-level)
|
|
|
|
most-positive-fixnum)))
|
|
|
|
(while (and l (>= l level))
|
|
|
|
(setq l (org-up-heading-safe)))
|
|
|
|
(if l (point-marker)
|
|
|
|
(point-min-marker)))))))
|
|
|
|
(value (org-read-property-value prompt pom)))
|
|
|
|
(org-set-property prompt value)))
|
2017-08-23 08:28:39 +00:00
|
|
|
((or "t" "T" "u" "U")
|
2015-12-03 22:27:07 +00:00
|
|
|
;; These are the date/time related ones.
|
|
|
|
(let* ((upcase? (equal (upcase key) key))
|
2017-08-25 19:51:04 +00:00
|
|
|
(org-end-time-was-given nil)
|
|
|
|
(time (org-read-date upcase? t nil prompt)))
|
2017-10-06 14:50:05 +00:00
|
|
|
(org-insert-time-stamp
|
|
|
|
time (or org-time-was-given upcase?)
|
|
|
|
(member key '("u" "U"))
|
|
|
|
nil nil (list org-end-time-was-given))))
|
2017-08-23 08:28:39 +00:00
|
|
|
(`nil
|
2017-11-29 14:09:44 +00:00
|
|
|
;; Load history list for current prompt.
|
|
|
|
(setq org-capture--prompt-history
|
|
|
|
(gethash prompt org-capture--prompt-history-table))
|
2016-01-11 22:51:54 +00:00
|
|
|
(push (org-completing-read
|
2015-12-03 22:27:07 +00:00
|
|
|
(concat (or prompt "Enter string")
|
|
|
|
(and default (format " [%s]" default))
|
|
|
|
": ")
|
2017-11-29 14:09:44 +00:00
|
|
|
completions
|
|
|
|
nil nil nil 'org-capture--prompt-history default)
|
2015-12-03 22:27:07 +00:00
|
|
|
strings)
|
2017-11-29 14:09:44 +00:00
|
|
|
(insert (car strings))
|
|
|
|
;; Save updated history list for current prompt.
|
|
|
|
(puthash prompt org-capture--prompt-history
|
|
|
|
org-capture--prompt-history-table))
|
2017-08-23 08:28:39 +00:00
|
|
|
(_
|
|
|
|
(error "Unknown template placeholder: \"%%^%s\""
|
|
|
|
key))))))))
|
2015-12-03 22:27:07 +00:00
|
|
|
|
|
|
|
;; Replace %n escapes with nth %^{...} string.
|
|
|
|
(setq strings (nreverse strings))
|
|
|
|
(save-excursion
|
|
|
|
(while (re-search-forward "%\\\\\\([1-9][0-9]*\\)" nil t)
|
|
|
|
(unless (org-capture-escaped-%)
|
|
|
|
(replace-match
|
|
|
|
(nth (1- (string-to-number (match-string 1))) strings)
|
|
|
|
nil t)))))
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
;; Make sure there are no empty lines before the text, and that
|
2018-06-19 14:38:09 +00:00
|
|
|
;; it ends with a newline character or it is empty.
|
2015-12-03 22:27:07 +00:00
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
(delete-region (point-min) (line-beginning-position))
|
|
|
|
(goto-char (point-max))
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(delete-region (point) (point-max))
|
2018-06-19 14:38:09 +00:00
|
|
|
(unless (bobp) (insert "\n"))
|
2015-12-03 22:27:07 +00:00
|
|
|
|
2016-01-07 09:45:18 +00:00
|
|
|
;; Return the expanded template and kill the capture buffer.
|
2009-10-13 07:41:40 +00:00
|
|
|
(untabify (point-min) (point-max))
|
|
|
|
(set-buffer-modified-p nil)
|
2015-11-29 15:53:35 +00:00
|
|
|
(prog1 (buffer-substring-no-properties (point-min) (point-max))
|
|
|
|
(kill-buffer (current-buffer))))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(defun org-capture-escaped-% ()
|
2015-11-29 15:53:35 +00:00
|
|
|
"Non-nil if % was escaped.
|
|
|
|
If yes, unescape it now. Assume match-data contains the
|
|
|
|
placeholder to check."
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(let ((n (abs (skip-chars-backward "\\\\"))))
|
|
|
|
(delete-char (/ (1+ n) 2))
|
|
|
|
(= (% n 2) 1))))
|
|
|
|
|
2016-01-07 09:45:18 +00:00
|
|
|
(defun org-capture-expand-embedded-elisp (&optional mark)
|
2015-11-29 15:53:35 +00:00
|
|
|
"Evaluate embedded elisp %(sexp) and replace with the result.
|
|
|
|
When optional MARK argument is non-nil, mark Sexp with a text
|
|
|
|
property (`org-embedded-elisp') for later evaluation. Only
|
|
|
|
marked Sexp are evaluated when this argument is nil."
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward "%(" nil t)
|
2016-01-07 09:45:18 +00:00
|
|
|
(cond
|
|
|
|
((get-text-property (match-beginning 0) 'org-embedded-elisp)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(let ((template-start (point)))
|
|
|
|
(forward-char 1)
|
|
|
|
(let* ((sexp (read (current-buffer)))
|
|
|
|
(result (org-eval
|
|
|
|
(org-capture--expand-keyword-in-embedded-elisp
|
|
|
|
sexp))))
|
|
|
|
(delete-region template-start (point))
|
|
|
|
(cond
|
|
|
|
((not result) nil)
|
|
|
|
((stringp result) (insert result))
|
|
|
|
(t (error
|
|
|
|
"Capture template sexp `%s' must evaluate to string or nil"
|
|
|
|
sexp))))))
|
|
|
|
((not mark) nil)
|
|
|
|
;; Only mark valid and non-escaped sexp.
|
|
|
|
((org-capture-escaped-%) nil)
|
|
|
|
(t
|
|
|
|
(let ((end (with-syntax-table emacs-lisp-mode-syntax-table
|
|
|
|
(ignore-errors (scan-sexps (1- (point)) 1)))))
|
|
|
|
(when end
|
|
|
|
(put-text-property (- (point) 2) end 'org-embedded-elisp t))))))))
|
2012-08-11 16:49:38 +00:00
|
|
|
|
2012-11-04 15:01:08 +00:00
|
|
|
(defun org-capture--expand-keyword-in-embedded-elisp (attr)
|
|
|
|
"Recursively replace capture link keywords in ATTR sexp.
|
2012-11-05 12:38:18 +00:00
|
|
|
Such keywords are prefixed with \"%:\". See
|
|
|
|
`org-capture-template' for more information."
|
2012-11-04 15:01:08 +00:00
|
|
|
(cond ((consp attr)
|
|
|
|
(mapcar 'org-capture--expand-keyword-in-embedded-elisp attr))
|
|
|
|
((symbolp attr)
|
|
|
|
(let* ((attr-symbol (symbol-name attr))
|
|
|
|
(key (and (string-match "%\\(:.*\\)" attr-symbol)
|
|
|
|
(intern (match-string 1 attr-symbol)))))
|
|
|
|
(or (plist-get org-store-link-plist key)
|
|
|
|
attr)))
|
|
|
|
(t attr)))
|
|
|
|
|
2012-08-11 16:49:38 +00:00
|
|
|
(defun org-capture-inside-embedded-elisp-p ()
|
2016-01-07 09:45:18 +00:00
|
|
|
"Non-nil if point is inside of embedded elisp %(sexp).
|
|
|
|
Assume sexps have been marked with
|
|
|
|
`org-capture-expand-embedded-elisp' beforehand."
|
|
|
|
(get-text-property (point) 'org-embedded-elisp))
|
2012-08-11 16:49:38 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-capture-import-remember-templates ()
|
2013-03-05 14:35:08 +00:00
|
|
|
"Set `org-capture-templates' to be similar to `org-remember-templates'."
|
2009-10-13 07:41:40 +00:00
|
|
|
(interactive)
|
|
|
|
(when (and (yes-or-no-p
|
|
|
|
"Import old remember templates into org-capture-templates? ")
|
|
|
|
(yes-or-no-p
|
|
|
|
"Note that this will remove any templates currently defined in `org-capture-templates'. Do you still want to go ahead? "))
|
2010-06-23 05:39:56 +00:00
|
|
|
(require 'org-remember)
|
2009-10-13 07:41:40 +00:00
|
|
|
(setq org-capture-templates
|
|
|
|
(mapcar
|
|
|
|
(lambda (entry)
|
|
|
|
(let ((desc (car entry))
|
|
|
|
(key (char-to-string (nth 1 entry)))
|
|
|
|
(template (nth 2 entry))
|
|
|
|
(file (or (nth 3 entry) org-default-notes-file))
|
2010-06-23 06:41:14 +00:00
|
|
|
(position (or (nth 4 entry) org-remember-default-headline))
|
2009-10-13 07:41:40 +00:00
|
|
|
(type 'entry)
|
|
|
|
(prepend org-reverse-note-order)
|
2013-03-30 18:03:09 +00:00
|
|
|
immediate target jump-to-captured)
|
2009-10-13 07:41:40 +00:00
|
|
|
(cond
|
|
|
|
((member position '(top bottom))
|
|
|
|
(setq target (list 'file file)
|
|
|
|
prepend (eq position 'top)))
|
|
|
|
((eq position 'date-tree)
|
|
|
|
(setq target (list 'file+datetree file)
|
|
|
|
prepend nil))
|
2010-06-23 06:41:14 +00:00
|
|
|
(t (setq target (list 'file+headline file position))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(when (string-match "%!" template)
|
|
|
|
(setq template (replace-match "" t t template)
|
|
|
|
immediate t))
|
|
|
|
|
2013-03-30 18:03:09 +00:00
|
|
|
(when (string-match "%&" template)
|
|
|
|
(setq jump-to-captured t))
|
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
(append (list key desc type target template)
|
Many small code improvements
* lisp/org-capture.el (org-capture-member): Make obsolete; the old
definition was identical to ‘org-capture-get’ anyway.
(org-capture-mode-map): Move the calls to ‘define-key’ up to where the
variable is defined.
(org-capture-mode-hook): Small docstring tweak.
(org-capture-mode): Fix typo in mode lighter.
(org-capture-set-target-location, org-capture-place-item):
(org-capture-place-plain-text, org-capture-narrow):
(org-capture-empty-lines-after):
(org-capture-import-remember-templates): ‘if’ without else -> ‘when’
* lisp/org-colview.el (org-columns-edit-value): Change an error to a
user-error.
(org-columns-uncompile-format): Improve docstring.
* lisp/org-compat.el (org-remove-from-invisibility-spec): Make
obsolete, the underlying emacs function exists since 1997, commit 31aa282e.
(org-in-invisibility-spec-p, org-count-lines): ‘if’ without else -> ‘when’.
* lisp/org-element.el (org-element-swap-A-B):
* lisp/org-entities.el (org-entities-create-table):
* lisp/org-list.el (org-insert-item):
* lisp/org-macs.el (org-with-point-at, org-base-buffer):
(org-preserve-local-variables, org-overlay-display):
(org-overlay-before-string): ‘if’ without else -> ‘when’.
* lisp/org-eshell.el (org-eshell-open): Fix docstring typo.
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/language):
(pcomplete/org-mode/file-option/startup):
(pcomplete/org-mode/file-option/options):
(pcomplete/org-mode/file-option/infojs_opt):
(pcomplete/org-mode/link, pcomplete/org-mode/tex):
(pcomplete/org-mode/todo, pcomplete/org-mode/searchhead):
(pcomplete/org-mode/tag, pcomplete/org-mode/prop): Avoid the formerly
misspelled ‘pcomplete-uniqify-list’ function. It has a defalias in
emacs >= 27; we add our own for older emacsen.
(pcomplete/org-mode/file-option/bind): ‘if’ without else -> ‘when’.
* lisp/org-protocol.el (org-protocol-capture):
(org-protocol-convert-query-to-plist): ‘if’ without else -> ‘when’.
(org-protocol-do-capture): Pacify byte compiler, simplify conditional
logic.
* lisp/org-table.el (org-table-create-with-table.el): Simplify conditional
logic.
(org-table-create, org-table-convert-region, org-table-next-field):
(org-table-beginning-of-field, org-table-end-of-field):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode): ‘if’ without else ->
‘when’.
* lisp/org.el (org-babel-do-load-languages, org-previous-link):
(org-refile): Use ‘(foo ...)’ instead of ‘(funcall 'foo ...)’.
(org-add-log-note): Convert a long cond into a cl-case.
(org-priority): Improve docstring, show a deprecation warning if the
‘show’ argument is passed (which was previously silently ignored).
Also, use ?\s instead of ?\ as a character literal for space.
(org-fast-tag-insert): Fix docstring typo.
(org-fill-element): ‘if’ without else -> ‘when’.
(org-on-target-p): Remove ancient compatibility alias.
2018-05-10 01:02:35 +00:00
|
|
|
(and prepend '(:prepend t))
|
|
|
|
(and immediate '(:immediate-finish t))
|
|
|
|
(and jump-to-captured '(:jump-to-captured t)))))
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
org-remember-templates))))
|
2017-07-02 07:19:09 +00:00
|
|
|
|
2009-10-13 07:41:40 +00:00
|
|
|
|
|
|
|
(provide 'org-capture)
|
|
|
|
|
|
|
|
;;; org-capture.el ends here
|