60b23bdeac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/htmlize.el
etc/schema/od-manifest-schema-v1.2-os.rnc
etc/schema/od-schema-v1.2-os.rnc
lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
6a758e26ff
Merge branch 'maint'
2012-12-31 09:30:19 +01:00
8897a53ff4
org-agenda.el (org-agenda-open-link): Fix bug when no link is matched
...
* org-agenda.el (org-agenda-open-link): Fix bug when no link
is matched. Return a message instead of an error.
2012-12-31 09:29:14 +01:00
839c8cdd14
Merge branch 'maint'
2012-12-30 11:35:19 +01:00
e8aaca4de6
org-agenda.el (org-agenda-priority): Fix showing priority in agenda buffers
...
* org-agenda.el (org-agenda-priority): Remove useless
parameter and fix showing priority in agenda buffers.
Thanks to Michael Brand for reporting this.
2012-12-30 11:30:21 +01:00
197881bc1a
Merge branch 'maint'
2012-12-29 09:23:28 +01:00
8477a4b215
Allow to follow internal links from the agenda
...
* org-agenda.el (org-agenda-open-link): Allow to open an
internal link by using the new `org-offer-links-in-entry'
function.
* org.el (org-offer-links-in-entry): Do not open the link
directly through `org-open-link-from-string', only offer to
select a link and return a cons with the link (as a string)
and the end of entry.
(org-open-at-point): Use `org-offer-links-in-entry' correctly.
Thanks to Memnon Anon for reporting this.
2012-12-29 09:20:35 +01:00
2792bc11a0
org-agenda.el: Docstring fixes.
...
* org-agenda.el (org-agenda-Quit, org-agenda-quit)
(org-agenda-exit, org-agenda-kill-all-agenda-buffers):
Docstring fixes.
2012-12-28 18:37:47 +01:00
a04ccc40b2
org-agenda.el: New option `org-agenda-search-view-max-outline-level'
...
* org-agenda.el (org-agenda-search-view-max-outline-level):
New option to define the max level for the entries shown by
the search view. A value of 1 means to show the top parent
of the entries.
2012-12-24 14:49:04 +01:00
e5539d4d58
Merge branch 'maint'
...
Conflicts:
lisp/ob.el
lisp/org.el
2012-12-20 15:54:52 +01:00
ab5e372926
org-agenda.el (org-agenda-finalize): Fix links activation
...
* org-agenda.el (org-agenda-finalize): Fix links activation.
2012-12-20 15:34:10 +01:00
5de94e46e4
Merge branch 'maint'
2012-12-20 13:16:47 +01:00
bfb9f9d10f
Use (point-marker) instead of (move-marker (make-marker) (point))
...
* org-agenda.el (org-agenda-get-restriction-and-command): Use `point-marker'.
* org-capture.el (org-capture-place-template): Likewise.
* org-colview-xemacs.el (org-dblock-write:columnview): Likewise.
* org-colview.el (org-dblock-write:columnview): Likewise.
* org-mobile.el (org-mobile-locate-entry): Likewise.
* org-table.el (org-table-convert-region): Likewise.
* org.el (org-update-statistics-cookies): Likewise.
* contrib/lisp/org-invoice.el (org-dblock-write:invoice): Likewise.
2012-12-20 13:16:41 +01:00
c74c62606d
Merge branch 'maint'
2012-12-19 15:34:40 +01:00
bdc95549dd
Backwards compatibility: use compatibility macro
...
* lisp/org-agenda.el (org-agenda-write): Use
org-called-interactively-p instead of called-interactively-p.
2012-12-19 15:30:23 +01:00
57e0814ac0
Merge branch 'maint'
2012-12-19 00:23:39 +01:00
1c57cd5a7d
org-agenda.el (org-agenda-skip): Only check if point is inside a code block, not at a code block.
...
* org-agenda.el (org-agenda-skip): Only check if point is
inside a code block, not at a code block.
Thanks to Eric Fraga for reporting this problem.
2012-12-19 00:23:30 +01:00
0f3264f690
org-agenda.el: Use `org-todo-keyword-faces' to highlight selected TODO keywords.
...
* org-agenda.el
(org-agenda-propertize-selected-todo-keywords): New function
to highlight the current agenda todo keywords depending on
`org-todo-keyword-faces'.
(org-todo-list): Use the new function.
TINYCHANGE
2012-12-18 18:47:49 +01:00
1bfea39fd4
Support `C-1' prefix for `org-agenda-capture' and `org-capture'.
...
* org.el (org-get-cursor-date): New optional argument
WITH-TIME to add the time of the day.
* org-capture.el (org-capture): When capturing from the agenda
and with a non-nil value for `org-capture-use-agenda-date', a
`C-1' prefix will set the capture time to the HH:MM of the
current line or the current HH:MM.
* org-agenda.el (org-agenda-capture): New optional argument
WITH-TIME: when set to 1, the capture time will be set to the
HH:MM time of the current line, or the current HH:MM time.
From an agenda buffer, C-1 k (i.e. org-agenda-capture) and
C-1 M-x org-capture RET will use the time of the day of the
current line, or the current time of the day. The date is
not changed by using this prefix.
Thanks to Rene for triggering this change.
2012-12-12 15:21:10 +01:00
5508053d63
Merge branch 'maint'
2012-12-11 18:14:00 +01:00
980e52282d
org-agenda.el (org-agenda-finalize): Fix order of link activation.
...
* org-agenda.el (org-agenda-finalize): Fix order of link
activation.
2012-12-11 17:20:33 +01:00
08e411109e
org-agenda.el (org-agenda-finalize): Activate plain links.
...
* org-agenda.el (org-agenda-finalize): Activate plain links.
2012-12-11 17:08:00 +01:00
5d673e890a
org-agenda.el (org-agenda-schedule, org-agenda-deadline): Fix redundant messages.
...
* org-agenda.el (org-agenda-schedule, org-agenda-deadline):
Fix redundant messages.
2012-12-11 16:53:44 +01:00
1a41eeae1d
org-agenda.el (org-agenda-finalize): Fix clock highlighting.
...
* org-agenda.el (org-agenda-finalize): Fix clock highlighting.
Thanks to Rares Pop who reported this.
2012-12-11 16:44:03 +01:00
4c7dcd0830
Silence byte compiler
...
* contrib/lisp/org-invoice.el (org-invoice-info-to-table,
org-invoice-list-to-table): Silence byte compiler.
* lisp/org-agenda.el (org-agenda-show-clocking-issues,
org-agenda-format-item): Silence byte compiler.
* lisp/org-colview-xemacs.el (org-agenda-columns): Silence byte
compiler.
* lisp/org-colview.el (org-agenda-columns): Silence byte compiler.
* lisp/org.el (org-properties-postprocess-alist): Silence byte
compiler.
Function renaming was necessary as of
a00a7b2918
2012-11-17 15:51:26 +01:00
a729fae0f7
org-agenda: Tiny stylistic change
...
* lisp/org-agenda.el (org-agenda-get-deadlines): Tiny stylistic
change.
2012-10-28 13:53:29 +01:00
796fca3f18
org-agenda: New option: skip deadline prewarning if scheduled in the future
...
* lisp/org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled):
Add an option to skip the deadline prewarning if the scheduled date is
in the future.
2012-10-28 11:13:53 +01:00
8866f86624
Merge branch 'maint'
2012-10-26 15:12:02 +02:00
58551f1e5f
Fix bug in org-agenda-diary-sexp-prefix
...
* lisp/org-agenda.el (org-agenda-get-sexps): Reset `extra' to nil at
beginning of re-search-forward loop, otherwise next iteration picks up
`extra' value from previous entry.
2012-10-26 14:46:24 +02:00
2608bed9ea
Merge branch 'maint'
2012-10-23 18:41:45 +02:00
93b0934d12
Fix typos fixed in Emacs (part 2)
...
Thanks to Paul Eggert for the fixes:
http://lists.gnu.org/archive/html/emacs-diffs/2012-10/msg00069.html
2012-10-23 18:41:33 +02:00
f287ab418d
Merge branch 'maint'
2012-10-13 12:54:21 +02:00
9d00dd4a88
org-agenda: Fix `org-agenda-later' when called with an argument
...
* lisp/org-agenda.el (org-agenda-later): Fix function when span is
a number and an argument was provided. Also fix typo in docstring.
2012-10-13 12:52:43 +02:00
83dbbfed28
Merge branch 'maint'
2012-10-03 11:14:16 +02:00
562aec40dd
Fix commit 1dd4228.
2012-10-03 11:14:06 +02:00
4f0b3bfe0c
Merge branch 'maint'
2012-10-02 13:07:09 +02:00
5c762bbdc6
Remove some autoloads and clean up code.
...
* org.el (turn-on-orgtbl): Moved here from org-table.el.
(org-clock-persistence-insinuate): Moved here from org-clock.el.
(org-update-all-dblocks, org-map-entries)
(org-require-autoloaded-modules, org-forward-element)
(org-backward-element, org-up-element)
(org-element-greater-elements, org-drag-element-backward)
(org-drag-element-forward, org-mark-element)
(org-narrow-to-element, org-transpose-element)
(org-unindent-buffer): Don't autoload.
* org-clock.el (org-clock-get-clocktable): Rename from
`org-get-clocktable'.
(org-clock-persistence-insinuate): Move to org.el.
* org-capture.el: Do no set `generated-autoload-file' locally.
Minor code clean up.
* org-agenda.el (org-agenda-list): Use
`org-clock-get-clocktable'. Do no set
`generated-autoload-file' locally.
* org-table.el (org-table-iterate-buffer-tables): Minor
reformatting.
(turn-on-orgtbl): Move to org.el.
* org-html.el (org-export-htmlize-generate-css): Don't autoload.
* org-timer.el (org-timer-pause-or-continue, org-timer-stop):
Ditto.
* ob-tangle.el (org-babel-tangle-lang-exts): Ditto.
* ob-lob.el (org-babel-lob-ingest): Ditto.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling): Ditto.
* org-lparse.el (org-lparse-and-open, org-lparse-batch)
(org-lparse-to-buffer, org-replace-region-by)
(org-lparse-region): Ditto.
* org-mobile.el (org-mobile-create-sumo-agenda): Ditto.
2012-10-02 10:03:15 +02:00
e4c31cf98b
Use generated-autoload-file: "org-loaddefs.el" as a local variable.
2012-10-02 08:50:46 +02:00
b134c60454
Merge branch 'maint'
...
Conflicts:
lisp/org-agenda.el
2012-10-01 17:56:11 +02:00
1dd42283b7
org-agenda.el: Fix bug: do not bypass `org-agenda-timerange-leaders'
...
* org-agenda.el (org-agenda-get-timestamps): Check if the item
is an habit when formatting it with `org-agenda-format-item'.
(org-agenda-get-blocks): Fix bug: don't assume the item is an
habit when formatting with `org-agenda-format-item'.
Thanks to George McNinch for reporting this.
2012-10-01 17:53:39 +02:00
d79227cbd1
Merge branch 'maint'
2012-09-30 20:20:36 +02:00
f95e5ff1ba
Fix a bug, allow "i" in calendar (and remove "k" from calendar)
...
* org.el (org-calendar-agenda-action-key): Delete an option.
(org-mode-map): Delete its keybinding.
(org-agenda-action-marker, org-mark-entry-for-agenda-action):
Delete.
* org-agenda.el (org-agenda-diary-entry): Don't prevent from
being used outside of Org agendas, as it can be used in
calendar buffers too.
Note that we may have to reimplement the functions related to
"k" in the calendar.
2012-09-30 20:20:22 +02:00
de65b50612
Merge branch 'maint'
2012-09-30 09:24:16 +02:00
c8c8d0e2d9
org-agenda.el: Fix file permissions.
2012-09-30 09:24:12 +02:00
a5483f2d39
Merge branch 'maint'
2012-09-29 23:46:15 +02:00
c7ffcf9246
Uncomment :version "24.3" cookies.
...
* org.el (org-url-hexify-p, org-doi-server-url)
(org-latex-preview-ltxpng-directory, org-custom-properties)
(org-sparse-tree-default-date-type): Add :version "24.3".
* org-agenda.el (org-agenda-sticky)
(org-agenda-custom-commands-contexts): Ditto.
* org-capture.el (org-capture-bookmark)
(org-capture-templates-contexts)
(org-capture-use-agenda-date): Ditto.
* org-latex.el (org-export-latex-hyperref-options-format)
(org-export-latex-link-with-unknown-path-format): Ditto.
* org-id.el (org-id-link-to-org-use-id): Ditto.
* org-datetree.el (org-datetree-add-timestamp): Ditto.
2012-09-29 23:46:02 +02:00
7d8a0c48a3
Merge branch 'maint'
2012-09-29 13:46:40 +02:00
d7be8dfad2
Remove comment from previous commit.
2012-09-29 13:46:31 +02:00
7e74b77487
Merge branch 'maint'
2012-09-29 13:44:29 +02:00
Bastien Guerry
Abdó Roig-Maranges
Dmitry Antipov
Achim Gratz
Ingo Lohmar
Nicolas Goaziou
Justus Piater
Toby S. Cubitt