Nicolas Goaziou
52ba1a27ad
Merge branch 'maint'
2018-04-11 23:03:01 +02:00
Nicolas Goaziou
d20fc4d7c5
org-capture: Properly handle `org-extend-today-until' in templates
...
* lisp/org-capture.el (org-capture-set-target-location): Handle
non-default `org-extend-today-until'.
Reported-by: Robert Irelan <rirelan@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00023.html >
2018-04-11 23:01:16 +02:00
Rasmus
06ab656f42
org-macs: Move org-mks from org-capture to org-macs
...
* lisp/org-capture.el (org-mks): Moved to org-macs.el.
* lisp/org-macs.el (org-mks): Added from org-capture.el.
The move is being done to accommodate the usage of org-mks in other
Org libraries.
2018-04-07 13:03:18 +02:00
Bastien
8548dfa33f
Merge branch 'maint'
2018-03-20 12:38:31 +01:00
Bastien
b2d3dbabf7
org-capture.el: Fix docstring
...
* lisp/org-capture.el (org-capture-templates-contexts): Fix docstring.
2018-03-20 12:38:24 +01:00
Nicolas Goaziou
0de818964d
Merge branch 'maint'
2018-03-11 19:22:25 +01:00
Nicolas Goaziou
2f587d496f
org-capture: Prevent spurious blank line during capture
...
* lisp/org-capture.el (org-capture-place-entry): Prevent spurious
blank line during capture.
Reported-by: Luke <mideniko1234-org@yahoo.co.uk>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00075.html >
2018-03-11 19:21:29 +01:00
Nicolas Goaziou
6e10c268de
Merge branch 'maint'
2018-02-24 22:01:32 +01:00
Nicolas Goaziou
65d6d3b043
org-capture: Silence byte-compiler
2018-02-24 22:01:04 +01:00
Nicolas Goaziou
79b36b6a8d
Merge branch 'maint'
2018-02-21 15:04:37 +01:00
Nicolas Goaziou
6655429b8d
org-capture: Refresh clock mode line when finalizing capture
...
* lisp/org-capture.el (org-capture-finalize): Refresh clock mode line.
* lisp/org-clock.el (org-clock--mode-line-heading): New function.
(org-clock-get-clock-string): Small refactoring.
(org-clock-update-mode-line): Add optional argument. Use new function.
(org-clock-in): Use new function.
2018-02-21 15:02:33 +01:00
Nicolas Goaziou
0155441358
Merge branch 'maint'
2018-01-19 18:22:00 +01:00
Tim Landscheidt
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
Nicolas Goaziou
4dbb4a76a7
Implement `org-show-all'
...
* lisp/org.el (org-show-all): New function.
(org-cycle):
(org-cycle-internal-global):
(org-global-cycle):
(org-set-startup-visibility):
(org-set-outline-overlay-data):
(org-hide-block-all):
(org-mode-hook):
(org-tree-to-indirect-buffer):
(org-sort-entries):
(org-mode-map):
(org-org-menu):
* lisp/ob-lilypond.el (org-babel-lilypond-mark-error-line):
* lisp/org-archive.el (org-archive-subtree):
* lisp/org-capture.el (org-capture-place-template):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/ox-org.el (org-org-publish-to-org):
* testing/org-test.el (org-test-at-id):
(org-test-in-example-file): Use new function.
* lisp/org-compat.el (org-show-block-all): Mark as obsolete.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
ec6813157e
org-capture: Demote error when capturing `file+headline' in non-Org buffers
...
* lisp/org-capture.el (org-capture-set-target-location): Warn when
capturing a `file+headline' target and buffer is not in Org mode.
Fixes: 22352
2018-01-02 12:40:54 +01:00
Nicolas Goaziou
45c4502713
org-capture: Re-introduce history list per prompt
...
* lisp/org-capture.el (org-capture--prompt-history-table):
(org-capture--prompt-history): New variables.
(org-capture-fill-template): Handle history list per prompt.
Reported-by: Karl Eichwalder <ke@gnu.franken.de>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00251.html >
2017-11-29 15:09:44 +01:00
Xavier Martinez-Hidalgo
f38a7d433b
org-capture: Fix aborting after inserting text at end of buffer
...
* lisp/org-capture.el (org-capture-mark-kill-region): Set end marker
insertion type so that it advances when inserting text at the end of
the capture buffer.
* testing/lisp/test-org-capture.el (test-org-capture/insert-at-end-abort):
Add test case.
Inserting text at the end of the capture buffer does not advance the
end kill marker. This causes the narrowing region and the kill
markers to get out of sync, which prevents 'org-capture-finalize' from
correctly cleaning the target buffer when aborting the capture.
Setting the kill end marker insertion type fixes this.
TINYCHANGE
2017-11-03 22:20:11 +01:00
Matt Lundin
ce536f6375
Fix interactive timestamp entry in capture templates
...
* lisp/org-capture.el: (org-capture-fill-template) Fix interactive
timestamp entry to match the behavior of org-time-stamp. This fixes
a bug related to the %^t and %^u template escapes which resulted in
incorrect timestamps (<2017-10-06 Fri-12:00>). The difference
between %^t and %^T now corresponds to the difference between
org-time-stamp called without and with a prefix argument.
2017-10-06 19:13:57 +02:00
Paul Eggert
ff0dcf52a5
Backport commit bc511a64f from Emacs
...
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
2017-09-17 00:28:38 -04:00
Matt Lundin
2dfbafa4a9
Ensure that top-level capture targets are pasted at level 1
...
* lisp/org-capture.el: (org-capture-place-entry) Ensure that level is
set to 1 (i.e., the top level) if there is no headline target
defined. Otherwise, captured items are improperly nested by context.
2017-09-10 09:39:24 +02:00
Nicolas Goaziou
8a0c89244d
Merge branch 'maint'
2017-08-31 23:15:56 +02:00
Nicolas Goaziou
1654a5a98a
Fix `:jump-to-captured' when refiling a capture target
...
* lisp/org-capture.el (org-capture-refile): Call
`org-capture-goto-last-stored' at the appropriate time.
* testing/lisp/test-org-capture.el (test-org-capture/refile): Add
test.
Reported-by: "Raymond Zeitler" <zeitra@yahoo.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00704.html >
2017-08-31 23:14:04 +02:00
Nicolas Goaziou
489346c1d5
Merge branch 'maint'
2017-08-25 21:51:56 +02:00
Nicolas Goaziou
51b431d013
org-capture: Fix "org-capture: Fix %^T and %^U placeholders"
...
* lisp/org-capture.el (org-capture-fill-template): Fix
2ff3101c0e
.
2017-08-25 21:51:04 +02:00
Nicolas Goaziou
b47de25062
Merge branch 'maint'
2017-08-23 10:30:33 +02:00
Nicolas Goaziou
2ff3101c0e
org-capture: Fix %^T and %^U placeholders
...
* lisp/org-capture.el (org-capture-fill-template): Fix %^T and %^U
placeholders.
Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00528.html >
2017-08-23 10:28:39 +02:00
Nicolas Goaziou
71aabd9db7
Merge branch 'maint'
2017-08-06 01:55:26 +02:00
Michaël Cadilhac
1f6f46aa69
org-capture.el: Document what the time stamp is in capture templates
...
* lisp/org-capture.el (org-capture-templates): Make explicit that the time
stamp aware %-escapes are influenced by `org-capture-use-agenda-date'.
TINYCHANGE
2017-08-06 01:44:23 +02:00
Nicolas Goaziou
e59718e9c3
Merge branch 'maint'
2017-07-14 10:40:47 +02:00
Nicolas Goaziou
8d9854ca8a
org-capture: Fix last commit
...
* lisp/org-capture.el (org-capture-fill-template): %K link
specifically targets a headline. Also provide a description.
2017-07-14 10:40:03 +02:00
Nicolas Goaziou
0c9feb660a
Merge branch 'maint'
2017-07-13 14:26:12 +02:00
Nicolas Goaziou
3315bd1118
org-capture: Fix %k and %K in capture template
...
* lisp/org-capture.el (org-capture-fill-template): Fix link returned
by %K. Also, both %k and %K should be expanded as strings even when
there is no clocking data.
Reported-by: Michal Politowski <mpol@meep.pl>
2017-07-13 14:08:20 +02:00
Nicolas Goaziou
dd757f14f0
Merge branch 'maint'
2017-07-02 09:20:35 +02:00
Nicolas Goaziou
796a78222a
Move an obsolete declaration in "org-compat.el"
...
* lisp/org-compat.el (org-capture-import-remember-templates): Moved
from "org-capture.el".
2017-07-02 09:19:09 +02:00
Nicolas Goaziou
602a1a21fc
Merge branch 'maint'
2017-06-30 14:36:30 +02:00
Nicolas Goaziou
4f90f44af3
org-capture: Fix blank lines in `item' target type
...
* lisp/org-capture.el (org-capture-place-item): Fix blank lines in
`item' target type.
2017-06-30 13:50:39 +02:00
Nicolas Goaziou
04403b446a
org-capture: Fix regression in item templates
...
* lisp/org-capture.el (org-capture-place-item):
Fix regression introduced in d6f096546
.
Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00591.html >
Reported-by: Florian Lindner <mailinglists@xgm.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00606.html >
2017-06-30 13:27:38 +02:00
Nicolas Goaziou
ed291a4a91
Merge branch 'maint'
2017-06-02 09:23:03 +02:00
Nicolas Goaziou
57d0a7453d
org-capture: Fix visibility of planning line in capture buffer
...
* lisp/org-capture.el (org-capture-place-entry): Make sure planning
line is visible when added in a narrowed capture buffer. Refactor
code.
Reported-by: Detlef Steuer <steuer@unibw-hamburg.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113756 >
2017-06-02 09:21:44 +02:00
Nicolas Goaziou
a023b31e48
Merge branch 'maint'
2017-05-23 18:15:42 +02:00
Nicolas Goaziou
d6f096546e
org-capture: Fix number of blank lines with :unnarrowed option
...
* lisp/org-capture.el (org-capture-finalize): Remove blank lines
number fix, which only applies to narrowed capture buffers.
(org-capture-insert-template-here):
(org-capture-place-plain-text):
(org-capture-place-item):
(org-capture-place-entry): Do not hard-code number of blank lines
after entry.
Reported-by: Igor Perepelytsya <igorquail@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113093 >
Reported-by: Jay Dresser <jay@jaydresser.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/113449 >
2017-05-23 18:10:06 +02:00
Yuri D. Lensky
9e4a1704ab
org-capture.el: Fix handling of variable capture location
...
* lisp/org-capture.el (org-capture-expand-file): Fix handling of
variable capture location.
2017-05-19 16:07:27 +02:00
Nicolas Goaziou
1dfdb81932
Merge branch 'maint'
2017-04-17 20:04:42 +02:00
Nicolas Goaziou
68f60dbdd5
org-capture: Fix typo
...
* lisp/org-capture.el (org-capture-fill-template): Fix typo introduced
in last commit.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113126 >
2017-04-17 20:04:09 +02:00
Nicolas Goaziou
ea3754f168
Merge branch 'maint'
2017-04-17 14:19:12 +02:00
Nicolas Goaziou
03873f070c
org-capture: Fix clipboard history with %^C or %^L place holders
...
* lisp/org-capture.el (org-capture--clipboards): New variable.
(org-capture-fill-template): Use new variable.
Reported-by: Allen Li <darkfeline@felesatra.moe>
<http://permalink.gmane.org/gmane.emacs.orgmode/113020 >
2017-04-17 14:18:06 +02:00
Nicolas Goaziou
2ff038da31
org-capture: Tiny refactoring
...
* lisp/org-capture.el (org-capture-set-target-location): Use
`point-marker'. Also remove trailing space.
2017-03-17 08:26:29 +01:00
Carsten Dominik
0f1b5ec496
Consolidate capture targets and allow outline path in datetree targets
...
* doc/org.texi: Document the new capture templates target.
* lisp/org-capture.el (org-capture-upgrade-templates): New function.
(org-capture-templates): Implement the new file+olp+datetree target.
(org-capture): Document the C-1 prefix.
(org-capture-sanitize-olp): New function.
(org-capture-select-template): Make sure upgraded version of templates
variable is used.
* lisp/org-datetree.el (org-datetree-find-date-create): Accept
`subtree-at-point' as a value for the KEEP-RESTRICTION argument.
(org-datetree-find-iso-week-create): Accept `subtree-at-point'
as a value for the KEEP-RESTRICTION argument.
* lisp/org.el (org-find-olp): Throw an error when called in a
buffer that is not in Org mode.
* lisp/org-capture.el (org-capture-fill-template): Use overriding time
also in `?<>' escapes.
2017-03-16 08:18:55 +01:00
Nicolas Goaziou
c41c2be339
Merge branch 'maint'
2017-03-14 09:07:55 +01:00
Nicolas Goaziou
92ee4d06a2
org-capture: Fix escaping characters in template embedded S-exps
...
* lisp/org-capture.el (org-capture-fill-template): Escape backslash
characters in %i contents when those are inserted within a S-exp.
Also prevent adding any prefix to %i contents spanning over multiple
lines when they are inserted within a S-exp.
* testing/lisp/test-org-capture.el (test-org-capture/fill-template):
Add tests.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112232 >
2017-03-14 09:03:59 +01:00
Nicolas Goaziou
83f5c8962f
Merge branch 'maint'
2017-02-23 12:59:45 +01:00
Nicolas Goaziou
da80e6c6ab
org-capture: Tiny refactoring
...
* lisp/org-capture.el (org-capture-refile): Tiny refactoring.
2017-02-23 12:59:24 +01:00
Bastien
cfadbc3761
Merge branch 'maint'
2017-02-21 15:42:12 +01:00
Bastien
df506794db
org-capture: Fix commit 7d7c38
2017-02-21 15:41:15 +01:00
Nicolas Goaziou
d1577d1e1b
Merge branch 'maint'
2017-02-19 15:37:41 +01:00
Nicolas Goaziou
7d7c38c6b1
org-capture: Fix `org-capture-refile'
...
* lisp/org-capture.el (org-capture-refile): Preserve location of point
when refiling.
* testing/lisp/test-org-capture.el (test-org-capture/refile): New
test.
Reported-by: Liu Hui <liuhui1610@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112202 >
2017-02-19 15:37:12 +01:00
Nicolas Goaziou
5edc17ef73
Merge branch 'maint'
2017-01-31 22:52:43 +01:00
Nicolas Goaziou
426bce6a83
org-capture: Small fix
...
* lisp/org-capture.el (org-mks): Find entries with full prefix, not
last pressed key.
This fixes a bug introduced in 8194e7b09
.
Reported-by: Charles Millar <millarc@verizon.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/111779 >
2017-01-31 22:50:09 +01:00
Nicolas Goaziou
9cb36f1982
Merge branch 'maint'
2017-01-30 23:43:14 +01:00
Nicolas Goaziou
8194e7b09d
org-capture: Fix freeze when capture templates are ill-defined
...
* lisp/org-capture.el (org-mks): Do not freeze when there is a missing
step in the key hierarchy. Fix docstring. Refactor code for clarity.
Reported-by: Roland Everaert <reveatwork@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111716 >
2017-01-30 23:36:52 +01:00
Nicolas Goaziou
235d3c5e45
Merge branch 'maint'
2017-01-11 11:58:51 +01:00
Nicolas Goaziou
71890398cd
org-capture: Fix :jump-+to-captured when `org-capture-bookmark' is nil
...
* lisp/org-capture.el (org-capture-bookmark-last-stored-position):
Rename to ...
(org-capture-store-last-position): ... this. Also store last position
unconditionally.
* lisp/org-capture.el (org-capture-finalize): Apply renaming.
2017-01-11 09:52:57 +01:00
Nicolas Goaziou
6a49de8862
org-capture: Improve error message for date/weektree capture
...
* lisp/org-capture.el (org-capture-set-target-location): Raise an
error when target location is not an Org buffer.
Reported-by: Simao <smm@imap.cc>
<http://permalink.gmane.org/gmane.emacs.orgmode/111320 >
2017-01-11 09:17:18 +01:00
Nicolas Goaziou
0ca32a2838
org-table: Remove command status for some functions
...
* lisp/org-table.el (org-table-current-column):
(org-table-current-dline): Do not allow to call these functions
interactively. `org-table-field-info' should be used instead.
* lisp/org-capture.el (org-encrypt-entry): Silence byte-compiler.
2017-01-09 00:30:41 +01:00
Kyle Meyer
0d3683f2cd
Merge branch 'maint'
2017-01-05 20:23:58 -05:00
Kyle Meyer
713f785017
Update copyright years
2017-01-05 20:19:37 -05:00
Nicolas Goaziou
8dc2d77678
Merge branch 'maint'
2016-11-07 01:16:29 +01:00
Nicolas Goaziou
13dbea95af
Fix documentation
...
* doc/org.texi (Installation):
(Feedback):
(Handling links):
(Setting tags):
(Matching tags and properties):
(Storing searches):
(The very busy C-c C-c key):
(org-crypt):
(Adding hyperlink types):
* lisp/org-agenda.el (org-agenda-todo-ignore-deadlines):
(org-agenda-show-inherited-tags):
(org-agenda-week-view):
(org-agenda-fortnight-view):
(org-agenda-month-view):
(org-agenda-year-view):
* lisp/org-archive.el (org-archive-to-archive-sibling):
* lisp/org-capture.el (org-capture-templates):
* lisp/org-table.el:
* lisp/org.el (org-startup-folded):
(org-tag-alist):
(org-match-sparse-tree): Provide more accurate documentation.
Reported-by: Jorge Morais Neto <jorge13515@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110080 >
2016-11-07 01:14:04 +01:00
Nicolas Goaziou
88a3c2483e
org-capture: Improve error handling for file locations
...
* lisp/org-capture.el (org-capture-expand-file): Return an error on
invalid locations.
(org-capture-target-buffer): Remove useless checks.
2016-11-06 11:20:25 +01:00
Nicolas Goaziou
dc3c69918f
org-capture: Remove error checking in capture template
...
* lisp/org-capture.el (org-capture-expand-file): Remove error checking
in capture template introduced in
b89dfaa904
for now.
2016-11-06 11:10:23 +01:00
Nicolas Goaziou
958eacdf22
org-capture: Small refactoring
...
* lisp/org-capture.el (org-capture-set-target-location): Refactor using
pattern-matching for clarity.
2016-11-06 09:29:09 +01:00
Nicolas Goaziou
bd061b91f3
Merge branch 'maint'
2016-11-06 08:59:47 +01:00
Nicolas Goaziou
b89dfaa904
org-capture: Fix file+olp target with a relative file name
...
* lisp/org-capture.el (org-capture-expand-file): Expand relative file
names from `org-directory'
(org-capture-target-buffer): Apply change above.
Reported-by: Allen Li <darkfeline@felesatra.moe>
<http://permalink.gmane.org/gmane.emacs.orgmode/110075 >
2016-11-06 08:56:22 +01:00
Nicolas Goaziou
f5645675a3
Disallow S-exp in capture templates
...
* lisp/org-capture.el (org-capture-expand-file): Disallow S-exp.
(org-capture-templates):
* doc/org.texi (Template elements): Update documentation.
A function is equivalent to using S-exp, without tainting code with an
yet another call to `eval'.
2016-11-04 17:41:27 +01:00
Nicolas Goaziou
c81f9fff3b
Revert "org-capture: Remove forbidden value type from "file" templates"
...
This reverts commit 5485170263
.
2016-11-04 17:30:12 +01:00
Nicolas Goaziou
e4c38ab1d3
Improve documentation for capture templates
...
* doc/org.texi (Template expansion):
* lisp/org-capture.el (org-capture-templates): Clarify documentation.
Suggested-by: Stig Brautaset <stig@brautaset.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/109844 >
2016-10-19 19:23:31 +02:00
Nicolas Goaziou
0cf58cc208
Improve docstrings
...
* lisp/ob-core.el (org-confirm-babel-evaluate):
(org-babel-no-eval-on-ctrl-c-ctrl-c):
(org-babel-hash-at-point):
* lisp/org-agenda.el (org-agenda-custom-commands):
(org-stuck-projects):
(org-agenda):
(org-timeline):
(org-todo-list):
(org-agenda-filter-by-tag):
(org-agenda-log-mode):
(org-agenda-refile):
(org-agenda-show-and-scroll-up):
(org-agenda-tree-to-indirect-buffer):
(org-agenda-show-the-flagging-note):
(org-agenda-to-appt):
* lisp/org-capture.el (org-capture-mode):
(org-capture-use-agenda-date):
(org-capture):
* lisp/org-clock.el (org-clock-in):
(org-clock-display):
* lisp/org-colview.el (org-columns--display-here):
(org-columns):
* lisp/org-footnote.el (org-footnote-section):
* lisp/org-gnus.el (org-gnus-prefer-web-links):
* lisp/org-lint.el (org-lint):
* lisp/org-list.el (org-plain-list-ordered-item-terminator):
(org-list-allow-alphabetical):
(org-list-automatic-rules):
(org-list-use-circular-motion):
* lisp/org-protocol.el (org-protocol-store-link):
(org-protocol-create-for-org):
* lisp/org-src.el (org-src-preserve-indentation):
(org-edit-src-content-indentation):
(org-src-mode-hook):
(org-src-mode):
(org-edit-table.el):
(org-edit-export-block):
(org-edit-src-code):
(org-edit-fixed-width-region):
* lisp/org-table.el (org-table-automatic-realign):
(org-table-copy-increment):
(org-table-formula-evaluate-inline):
(org-table-allow-automatic-line-recalculation):
(org-table-edit-field):
(orgtbl-ascii-plot):
* lisp/org-timer.el (org-timer):
* lisp/org.el (org-deadline-string):
(org-comment-string):
(org-ellipsis):
(org-show-context-detail):
(org-indirect-buffer-display):
(org-cycle-global-at-bob):
(org-insert-heading-respect-content):
(org-enable-table-editor):
(org-context-in-file-links):
(org-display-internal-link-with-indirect-buffer):
(org-file-apps):
(org-refile-targets):
(org-todo-keywords):
(org-use-fast-todo-selection):
(org-treat-insert-todo-heading-as-state-change):
(org-time-clocksum-use-fractional):
(org-time-clocksum-use-effort-durations):
(org-agenda-files):
(org-cycle-hide-archived-subtrees):
(org-cycle):
(org-global-cycle):
(org-tree-to-indirect-buffer):
(org-insert-heading):
(org-store-link):
(org-insert-link):
(org-mark-ring-push):
(org-refile):
(org-todo):
(org-show-todo-tree):
(org-reveal):
(org-check-deadlines):
(org-switchb):
(org-cdlatex-mode):
(org-toggle-latex-fragment):
(org-ctrl-c-ctrl-c):
(org-toggle-heading):
(org-indent-line):
(org-yank):
(org-speedbar-set-agenda-restriction):
* lisp/ox-html.el (org-html-htmlize-output-type):
* lisp/ox-icalendar.el (org-icalendar-combined-agenda-file):
* lisp/ox-publish.el (org-publish-project-alist):
* lisp/ox.el (org-export-in-background):
(org-export-stack-mode):
(org-export--stack-source-at-point):
(org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 17:43:54 +02:00
Nicolas Goaziou
0c0bc84190
Change "Org-mode" into "Org mode"
...
* lisp/org-agenda.el:
* lisp/org-attach.el:
* lisp/org-bbdb.el:
* lisp/org-capture.el:
* lisp/org-clock.el:
* lisp/org-entities.el:
* lisp/org-gnus.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-info.el:
* lisp/org-inlinetask.el:
* lisp/org-irc.el:
* lisp/org-list.el:
* lisp/org-mhe.el:
* lisp/org-mouse.el:
* lisp/org-table.el:
* lisp/ox-html.el:
* lisp/ox-odt.el: Use "Org mode", or "Org", instead of "Org-mode".
2016-10-11 18:00:08 +02:00
Nicolas Goaziou
2e4b66f5f5
Fix some `cl-case' uses
...
* lisp/org-capture.el (org-capture-finalize):
* lisp/org-timer.el (org-timer-set-mode-line): Symbols need not be
quoted in `cl-case'.
2016-09-25 21:08:36 +02:00
Aaron Ecay
140aacbf2f
Use ‘eq’ instead of ‘equal’ for symbols
...
* lisp/ob-C.el (org-babel-C-val-to-C-type):
* lisp/ob-core.el (org-babel-get-colnames):
(org-babel-disassemble-tables):
* lisp/ob-lua.el (org-babel-lua-var-to-lua):
(org-babel-lua-table-or-string):
* lisp/ob-python.el (org-babel-python-var-to-python):
(org-babel-python-table-or-string):
* lisp/ob-ruby.el (org-babel-ruby-var-to-ruby):
(org-babel-ruby-table-or-string):
* lisp/ob-shell.el (org-babel-sh-var-to-string):
* lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar):
* lisp/org-agenda.el (org-agenda-prepare-window):
(org-compile-prefix-format):
* lisp/org-bibtex.el (org-bibtex-headline):
* lisp/org-capture.el (org-capture):
* lisp/org-colview.el (org-columns-next-allowed-value):
* lisp/org-mhe.el (org-mhe-store-link):
(org-mhe-get-message-real-folder):
(org-mhe-get-message-folder):
(org-mhe-get-message-num):
(org-mhe-get-header):
(org-mhe-follow-link):
* lisp/org-table.el (org-define-lookup-function):
* lisp/org.el (format-spec):
* lisp/ox-odt.el (org-odt--translate-description-lists):
* lisp/ox-publish.el (org-publish-compare-directory-files):
Use `eq' instead of `equal' when comparing to symbols.
* lisp/org-timer.el (org-timer-set-mode-line):
* lisp/org-capture.el (org-capture-finalize):
Use `cl-case' instead of `(cond ((eq x 'foo) ...) ...)'.
2016-09-25 16:29:06 +01:00
Aaron Ecay
48e7f17bc6
Use assq instead of assoc with quoted symbols
...
* lisp/ob-core.el (org-babel-merge-params):
* lisp/org-agenda.el (org-agenda-prepare-window):
(org-agenda-to-appt):
* lisp/org-capture.el (org-capture-finalize):
* lisp/org.el (org-find-invisible-foreground):
(org-open-file):
(org-todo-trigger-tag-changes):
(org-back-over-empty-lines):
* lisp/ox-odt.el (org-odt-get-table-cell-styles):
Use assq instead of assoc with quoted symbols.
2016-09-23 11:20:55 +01:00
Aaron Ecay
f7c01f217b
Add obsolescence warning
...
* lisp/org-capture.el (org-capture-import-remember-templates):
Add obsolescence warning.
2016-09-03 02:11:18 +01:00
Aaron Ecay
1c18efb615
String handling improvements.
...
* lisp/org-agenda.el (org-agenda-export-csv-mapper): Use `replace-regexp-in-string'.
* lisp/org-capture.el (org-capture): Use `string-prefix-p'.
* lisp/org-compat.el (string-blank-p, string-remove-prefix):
* lisp/org-compat.el (string-remove-suffix): Add compatibility defuns
for emacs 24.3.
* lisp/org-datetree.el (org-datetree-cleanup): Use `string-suffix-p'.
* lisp/org-footnote.el (org-footnote-normalize-label): Use
`string-remove-prefix'.
* lisp/org-gnus.el (org-gnus-group-link): Use `string-prefix-p'.
* lisp/org-list.el (org-list-struct):
(org-list-get-list-type, org-list-send-item):
(org-list-use-alpha-bul-p): Use `string-match-p'.
* lisp/org.el (org-paste-subtree): Use `string-suffix-p'.
(org-open-file, org-refile-get-targets): Use `replace-regexp-in-string'.
(org-make-tags-matcher): Use `string-prefix-p'.
(org-set-tags): Use `string-(prefix,suffix)-p'.
* lisp/ox-beamer.el (org-beamer--element-has-overlay-p):
(org-beamer--format-block):
Use `string-(prefix,suffix)-p'.
* lisp/ox-html.el (org-html-fix-class-name): Use `replace-regexp-in-string'.
* lisp/ox-md.el (org-md-verbatim): Use `string-(prefix,suffix)-p'.
(org-md-paragraph): Use `string-prefix-p'.
2016-09-03 02:05:10 +01:00
Aaron Ecay
ab04bab4d6
Use org-with-wide-buffer where appropriate
...
* lisp/org-agenda.el (org-agenda-get-some-entry-text):
(org-agenda-refile, org-agenda-open-link):
(org-agenda-change-all-lines, org-agenda-clock-out):
* lisp/org-capture.el (org-capture-refile):
(org-capture-bookmark-last-stored-position):
* lisp/org-clock.el (org-with-clock-position):
(org-clock-in):
* lisp/org-table.el (org-table-recalculate-buffer-tables):
(org-table-iterate-buffer-tables):
* lisp/org.el (org-table-map-tables):
(org-outline-overlay-data, org-refresh-properties):
(org-refresh-stats-properties, org-offer-links-in-entry):
(org-refile, org-refile-check-position):
(org-refile-new-child, org-map-entries):
(org-find-exact-headline-in-buffer):
(org-reftex-citation, org-imenu-get-tree):
Use `org-with-wide-buffer'.
2016-09-03 01:44:58 +01:00
Nicolas Goaziou
de24694f05
Turn org-mode into Org or Org mode
...
Use Org or Org mode instead of org-mode or Org-mode according to
"Documentation standards".
2016-08-23 22:13:56 +02:00
Nicolas Goaziou
71a3331aaf
Move org-eww to core
...
* lisp/org-eww.el: Move file from contrib/lisp/ to lisp/.
* lisp/org.el (org-modules): Apply change.
* lisp/org-capture.el (org-capture-templates):
* doc/org.texi: Document changes.
2016-08-20 02:59:56 +02:00
Nicolas Goaziou
d2de890d3e
org-capture: Remove history for template completion
...
* lisp/org-capture.el (org-capture-fill-template): Remove history
variable, which is not strictly necessary and relies, in its current
implementation, on dynamic binding.
2016-07-29 16:00:07 +02:00
Nicolas Goaziou
c4da20a2f3
Silence byte-compiler
...
* lisp/ob-core.el (org-babel-process-params): Silence byte-compiler.
* lisp/ob-groovy.el (org-babel-groovy-evaluate):
* lisp/ob-haskell.el (org-babel-execute:haskell):
* lisp/ob-io.el (org-babel-io-evaluate):
* lisp/ob-octave.el (org-babel-octave-evaluate-external-process):
(org-babel-octave-evaluate-session):
* lisp/ob-perl.el (org-babel-perl-evaluate):
* lisp/ob-python.el (org-babel-python-evaluate-external-process):
(org-babel-python-evaluate-session):
* lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method):
(org-babel-ruby-evaluate):
* lisp/ob-scala.el:
* lisp/ob-tangle.el:
(org-babel-tangle-collect-blocks):
* lisp/org-agenda.el (org-agenda-get-category-icon):
(org-agenda-todo-yesterday):
* lisp/org-bbdb.el (org-bbdb-anniv-extract-date):
(org-bbdb-make-anniv-hash):
(org-bbdb-anniversaries-future):
* lisp/org-bibtex.el (org-bibtex-fleshout):
(org-bibtex-read):
(org-bibtex-write):
* lisp/org-capture.el (org-capture-set-target-location):
(org-capture-get-indirect-buffer):
(org-mks):
* lisp/org-clock.el (org-clock--oldest-date):
(org-clock-resolve):
(org-clock-sum):
(org-clock-special-range):
(org-clocktable-steps):
* lisp/org-ctags.el (org-ctags-create-tags):
* lisp/org-element.el (org-element--interpret-affiliated-keywords):
(org-element--cache-shift-positions):
(org-element--cache-sync):
(org-element--cache-submit-request):
* lisp/org-habit.el (org-habit-parse-todo):
* lisp/org-inlinetask.el (org-inlinetask-hide-tasks):
* lisp/org-lint.el (org-lint--generate-reports):
* lisp/org-mouse.el (org-mouse-get-context):
* lisp/org-plot.el (org-plot/gnuplot-to-grid-data):
(org-plot/gnuplot):
* lisp/ox-ascii.el (org-ascii--current-text-width):
(org-ascii--current-justification):
(org-ascii--build-caption):
(org-ascii--checkbox):
(org-ascii-item):
* lisp/ox-html.el (org-html-footnote-section):
* lisp/ox-latex.el (org-latex--make-option-string):
* lisp/ox-odt.el (org-odt-toc):
(org-odt-add-automatic-style):
(org-odt-format-label):
(org-odt-link--inline-image):
(org-odt--render-image/formula):
(org-odt--enumerable-image-p):
(org-odt--enumerable-latex-image-p):
(org-odt--enumerable-formula-p):
(org-odt-do-format-code):
(org-odt-table-cell): Silence byte-compiler.
2016-07-25 17:10:53 +02:00
Nicolas Goaziou
5485170263
org-capture: Remove forbidden value type from "file" templates
...
* lisp/org-capture.el (org-capture-expand-file): Remove plain S-exps
from allowed values.
2016-06-24 01:11:49 +02:00
Nicolas Goaziou
d13b0745dc
Mark a few functions as obsolete
...
* lisp/ob-R.el (org-babel-variable-assignments:R):
* lisp/ob-ref.el (org-babel-ref-goto-headline-id):
* lisp/org-agenda.el (org-agenda-prepare-window):
(org-agenda-switch-to):
* lisp/org-capture.el (org-capture-goto-target):
* lisp/org-clock.el (org-clock-goto):
(org-clock-special-range):
* lisp/org-ctags.el (org-ctags-visit-buffer-or-file):
* lisp/org-eshell.el (org-eshell-open):
* lisp/org-feed.el (org-feed-show-raw-feed):
* lisp/org-id.el (org-id-goto):
* lisp/org-irc.el (org-irc-visit-erc):
* lisp/org-macs.el (org-string-nw-p):
* lisp/org-mobile.el (org-mobile-apply):
* lisp/org-src.el (org-src-switch-to-buffer):
* lisp/org.el (org-get-location):
(org-tree-to-indirect-buffer):
(org-mark-ring-goto):
(org-refile):
(org-add-log-note):
(org-revert-all-org-buffers):
(org-switchb):
(org-cycle-agenda-files):
(org-submit-bug-report):
(org-goto-marker-or-bmk):
* lisp/ox-html.el (org-html-htmlize-generate-css): Silence byte
compiler.
The following functions are marked as obsolete:
- `org-string-match-p'
- `org-number-sequence'
- `org-floor*'
- `org-pop-to-buffer-same-window'
- `org-delete-directory'
- `org-buffer-narrowed-p'
2016-06-23 10:00:00 +02:00
Nicolas Goaziou
ad766435dc
Merge branch 'maint'
2016-05-16 11:21:05 +02:00
Phil Hudson
5fc351ab78
org-capture: Support all capture template target-file variants in Customize
...
* lisp/org-capture.el (`org-capture-templates'): Adjust the
`org-capture-templates' defcustom template to support specifying the capture
target file using either a literal pathname, a function, a variable or a
form, as documented. Previously the Customize UI supported specifying only a
literal pathname.
(org-capture-templates): Clarify the documentation for the `function' method
for setting up the capture target.
* doc/org.texi (Template elements): Clarify the `function' method for setting up
the capture target.
2016-05-16 11:17:26 +02:00
Chunyang Xu
b46527a8ba
org-capture: Adapt user-error for aborting by user
...
* lisp/org-capture.el (org-capture):
(org-mks): Replace `error' with `user-error'.
When `org-capture` is aborted by user with 'q' or 'C-g', `user-error' is
better than `error' when exiting.
TINYCHANGE
2016-05-03 19:17:34 +02:00
Nicolas Goaziou
602fca424d
Merge branch 'maint'
2016-04-13 23:48:27 +02:00
Nicolas Goaziou
297315c46a
org-capture: Fix invalid table line specification
...
* lisp/org-capture.el (org-capture-place-table-line): Move point in
front of the table before trying to analyze it.
Reported-by: Christian Moe <mail@christianmoe.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106356 >
2016-04-13 23:47:36 +02:00
Kyle Meyer
4f499fff96
Merge branch 'maint'
2016-02-07 11:56:36 -05:00
Kyle Meyer
30bcff1129
org-capture: Document org-directory
...
* lisp/org-capture.el (org-capture-templates):
* doc/org.texi (Template elements): Document org-directory.
2016-02-07 11:56:04 -05:00
Nicolas Goaziou
a971366910
org-capture: Fix interactive template placeholders
...
* lisp/org-capture.el (org-capture-fill-template): Allow spaces in
interactive placeholders.
Reported-by: Charles Millar <millarc@verizon.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/104113 >
2016-01-11 23:51:54 +01:00
Nicolas Goaziou
fdbf441560
Obsolete org-icompleting-read' and
org-completing-read-no-i'
...
* lisp/org.el (org-icompleting-read, org-completing-read-no-i): Obsolete
aliases for `completing-read'
(org-iswitchb-completing-read): Remove function.
(org-sort-entries):
(org-refile-get-location):
(org-todo):
(org-deadline):
(org-occur-parameters):
(org-change-tag-in-region):
(org-fast-tag-selection):
(org-delete-property-globally):
(org-compute-property-at-point):
(org-buffer-list): Use genuine function.
* contrib/lisp/org-colview-xemacs.el (org-columns-edit-value):
(org-columns-new):
(org-insert-columns-dblock):
* contrib/lisp/org-index.el (org-index):
* contrib/lisp/ox-bibtex.el (org-bibtex-goto-citation):
* lisp/ob-core.el (org-babel-insert-header-arg):
(org-babel-goto-named-src-block):
(org-babel-goto-named-result):
(org-babel-demarcate-block):
* lisp/org-agenda.el (org-todo-list):
(org-agenda-filter-by-tag):
(org-agenda-bulk-action):
* lisp/org-attach.el (org-attach-delete-one):
(org-attach-open):
* lisp/org-bibtex.el (org-bibtex-fleshout):
(org-bibtex-create):
* lisp/org-capture.el (org-capture-fill-template):
* lisp/org-colview.el (org-columns-edit-value):
(org-columns-new):
(org-insert-columns-dblock):
* lisp/org-footnote.el (org-footnote-new):
* lisp/org-list.el (org-sort-list):
* lisp/ox-publish.el (org-publish):
* lisp/ox.el (org-export-dispatch): Use genuine function.
2016-01-10 21:16:29 +01:00
Kyle Meyer
6bc48c5f41
Update copyright years
2016-01-09 17:12:03 -05:00