6e306f65ff
Fix copyright years in maint.
2012-03-17 16:31:04 +01:00
de42649f7b
Manually revert maint to e85080.
...
e85080 is the last correct commit in the maint branch
before releasing 7.8.04. The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
73bb18ba37
Manually revert to the Release 7.8.04 tag.
2012-03-17 15:52:24 +01:00
38c5045725
Fix copyright years.
2012-03-17 14:36:25 +01:00
6e534f9c61
Manually revert back to commit e85080.
...
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.
This commit reverts back the maint branch to its state before
merging the master branch. From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
04971de4b9
Add version tag "24.1" for options introduced since Emacs 23.4 (and <= 24.1)
...
* org-exp.el (org-export-kill-product-buffer-when-displayed)
(org-export-initial-scope, org-export-date-timestamp-format)
(org-export-with-tasks, org-export-email-info)
(org-export-table-remove-empty-lines): Add version tag.
* org-mobile.el (org-mobile-files-exclude-regexp)
(org-mobile-use-encryption, org-mobile-encryption-tempfile)
(org-mobile-encryption-password, org-mobile-agendas): Add
version tag.
* ob-plantuml.el (org-plantuml-jar-path): Add version tag.
* org.el (org-babel-load-languages, org-clone-delete-id)
(org-log-buffer-setup-hook)
(org-loop-over-headlines-in-active-region)
(org-use-sub-superscripts, org-startup-with-beamer-mode)
(org-startup-with-inline-images, org-ctrl-k-protect-subtree)
(org-catch-invisible-edits)
(org-link-search-must-match-exact-headline)
(org-confirm-shell-link-not-regexp)
(org-confirm-elisp-link-not-regexp, org-log-refile)
(org-refile-use-cache)
(org-refile-active-region-within-subtree)
(org-todo-repeat-to-state, org-get-priority-function)
(org-agenda-jump-prefer-future)
(org-read-date-force-compatible-dates)
(org-use-effective-time)
(org-complete-tags-always-offer-all-agenda-tags)
(org-properties-postprocess-alist)
(org-format-latex-signal-error)
(org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command)
(org-export-latex-default-packages-alist)
(org-hidden-keywords, org-pretty-entities)
(org-pretty-entities-include-sub-superscripts)
(org-src-fontify-natively, org-effort-durations)
(org-speed-command-hook): Add version tag.
* org-html.el (org-export-html-footnote-separator)
(org-export-html-mathjax-options)
(org-export-html-mathjax-template)
(org-export-html-headline-anchor-format)
(org-export-html-preamble-format)
(org-export-html-postamble-format)
(org-export-html-table-align-individual-fields)
(org-export-html-protect-char-alist, org-export-html-divs):
Add version tag.
* org-ctags.el (org-ctags-path-to-ctags)
(org-ctags-open-link-functions)
(org-ctags-new-topic-template): Add version tag.
* ob-exp.el (org-export-babel-evaluate): Add version tag.
* org-beamer.el (org-beamer-use-parts)
(org-beamer-frame-level, org-beamer-frame-default-options)
(org-beamer-column-view-format, org-beamer-themes)
(org-beamer-environments-extra, org-beamer-fragile-re)
(org-beamer-outline-frame-title)
(org-beamer-outline-frame-options): Add version tag.
* org-wl.el (org-wl-link-remove-filter)
(org-wl-shimbun-prefer-web-links)
(org-wl-nntp-prefer-web-links, org-wl-disable-folder-check)
(org-wl-namazu-default-index): Add version tag.
* org-clock.el (org-task-overrun-text)
(org-clocktable-defaults, org-clock-clocktable-formatter)
(org-clock-clocktable-language-setup)
(org-clock-report-include-clocking-task)
(org-clock-resolve-expert): Add version tag.
* ob-lob.el (org-babel-lob-files): Add version tag.
* org-freemind.el (org-freemind-node-css-style): Add version
tag.
* org-archive.el (org-archive-reversed-order)
(org-archive-subtree-add-inherited-tags): Add version tag.
* org-bibtex.el (org-bibtex-autogen-keys, org-bibtex-prefix)
(org-bibtex-treat-headline-as-title)
(org-bibtex-export-arbitrary-fields)
(org-bibtex-key-property, org-bibtex-tags)
(org-bibtex-tags-are-keywords, org-bibtex-no-export-tags)
(org-bibtex-type-property-name): Add version tag.
* org-timer.el (org-timer-default-timer): Add version tag.
* org-taskjuggler.el (org-export-taskjuggler-extension)
(org-export-taskjuggler-project-tag)
(org-export-taskjuggler-resource-tag)
(org-export-taskjuggler-target-version)
(org-export-taskjuggler-default-project-version)
(org-export-taskjuggler-default-project-duration)
(org-export-taskjuggler-default-reports)
(org-export-taskjuggler-default-global-properties): Add
version tag.
* org-habit.el (org-habit-today-glyph)
(org-habit-completed-glyph): Add version tag.
* org-list.el (org-alphabetical-lists)
(org-list-ending-method, org-list-end-regexp)
(org-list-automatic-rules, org-list-use-circular-motion)
(org-list-indent-offset): Add version tag.
* ob-picolisp.el (org-babel-picolisp-cmd): Add version tag.
* org-icalendar.el (org-icalendar-alarm-time)
(org-icalendar-combined-description)
(org-icalendar-honor-noexport-tag)
(org-icalendar-date-time-format): Add version tag.
* org-src.el (org-src-tab-acts-natively): Add version tag.
* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
version tag.
* org-table.el (org-table-exit-follow-field-mode-when-leaving-table)
(org-table-fix-formulas-confirm)
(org-table-duration-custom-format)
(org-table-formula-field-format): Add version tag.
* org-publish.el (org-publish-sitemap-sort-files)
(org-publish-sitemap-sort-folders)
(org-publish-sitemap-sort-ignore-case)
(org-publish-sitemap-date-format)
(org-publish-sitemap-file-entry-format): Add version tag.
* ob-js.el (org-babel-js-cmd): Add version tag.
* org-docbook.el (org-export-docbook-footnote-separator)
(org-export-docbook-xslt-stylesheet): Add version tag.
* org-entities.el (org-entities-ascii-explanatory)
(org-entities-user): Add version tag.
* ob.el (org-confirm-babel-evaluate)
(org-babel-no-eval-on-ctrl-c-ctrl-c): Add version tag.
* ob-tangle.el (org-babel-tangle-lang-exts)
(org-babel-post-tangle-hook, org-babel-pre-tangle-hook)
(org-babel-tangle-body-hook)
(org-babel-tangle-comment-format-beg)
(org-babel-tangle-comment-format-end)
(org-babel-process-comment-text): Add version tag.
* org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
Add version tag.
* org-crypt.el (org-crypt-disable-auto-save): Add version tag.
* org-inlinetask.el (org-inlinetask-default-state): Add
version tag.
* ob-scheme.el (org-babel-scheme-cmd): Add version tag.
* ob-lisp.el (org-babel-lisp-dir-fmt): Add version tag.
* org-attach.el (org-attach-store-link-p): Add version tag.
* org-capture.el (org-capture-templates)
(org-capture-before-finalize-hook)
(org-capture-after-finalize-hook): Add version tag.
* org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda-time-leading-zero, org-agenda-follow-indirect)
(org-agenda-menu-two-column, org-agenda-menu-show-matcher)
(org-agenda-timegrid-use-ampm)
(org-agenda-remove-timeranges-from-blocks)
(org-agenda-inactive-leader, org-agenda-current-time-string)
(org-agenda-show-current-time-in-grid)
(org-agenda-search-view-force-full-words)
(org-agenda-search-view-always-boolean)
(org-agenda-clock-consistency-checks)
(org-agenda-include-deadlines)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-day-face-function)
(org-agenda-category-icon-alist)
(org-agenda-bulk-custom-functions)
(org-agenda-insert-diary-extract-time): Add version tag.
* org-latex.el (org-export-latex-inputenc-alist)
(org-export-latex-tag-markup)
(org-export-latex-timestamp-inactive-markup)
(org-export-latex-href-format)
(org-export-latex-hyperref-format)
(org-export-latex-footnote-separator)
(org-export-latex-quotes)
(org-export-latex-table-caption-above)
(org-export-latex-listings-w-names)
(org-export-latex-minted-langs)
(org-export-latex-listings-options)
(org-export-latex-minted-options)
(org-latex-default-figure-position, org-export-pdf-logfiles):
Add version tag.
* org-faces.el (org-faces-easy-properties)
(org-fontify-quote-and-verse-blocks, org-cycle-level-faces):
Add version tag.
* ob-ditaa.el (org-ditaa-jar-option): Add version tag.
Thanks to Glenn Morris for reporting this.
2012-02-13 15:49:28 +01:00
e44d2975ff
Fix copyright (to 2012) year and Org version (to 7.8.03).
2012-01-03 18:47:01 +01:00
4bbdfd229d
Replace org-mode-p with usual (eq major-mode 'org-mode) check
...
Additionally, replace one
(or (org-mode-p) (derived-mode-p 'org-mode))
with
(derived-mode-p 'org-mode)
cause that is reflexive anyway (returns true, if the current mode is
org-mode).
Delete one check testing for org-mode or org derived mode
2011-10-22 11:29:24 +02:00
58f1dbccf8
Remove the "Version" header in Org libraries (leave it in org.el).
...
Also remove blank lines before the ";;; org*el ends here" declarations.
Having a "Version" header forced us to update every file when releasing a
new version of Org; it also forced us to update every file when merging Org
with Emacs trunk, thus cluttering the diffs between the previously merged
version and the new one with useless information.
Glenn Morris suggested this in emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
2011-08-17 14:42:34 +02:00
7a18799e25
Remove arch-tag at the bottom of files.
2011-08-15 20:04:38 +02:00
904ed18bc2
Fix copyright years for elisp files in core and contrib.
...
Also add "This file is not part of GNU Emacs." when this is the case.
2011-08-15 15:23:11 +02:00
7340cee33a
Update website to show 7.7 as current release
2011-07-28 10:33:35 +00:00
9c05a7c781
Bump to version 7.6
2011-07-06 21:06:03 +02:00
11f19abcf2
org-timer: fix bug with `org-timer-item'
...
* lisp/org-timer.el (org-timer-item): save-excursion prevents
`org-list-struct' to get the list structure when point isn't on the
first line of the item.
2011-03-08 10:40:46 +01:00
11a10bdfe7
Update website to show 7.5 as current release
2011-03-07 14:27:39 +00:00
bd68169b4b
org-list: reorder file, rename functions, improve comments
...
* lisp/ob.el (org-babel-result-end): apply renaming.
* lisp/org-exp.el (org-export-mark-list-properties): apply renaming.
* lisp/org-list.el (org-list-prevs-alist): renamed from
org-list-struct-prev-alist.
(org-list-parents-alist): renamed from org-list-struct-parent-alist.
(org-list-write-struct): renamed from org-list-struct-fix-struct.
(org-list-parse-list, org-sort-list, org-list-indent-item-generic,
org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
org-move-item-down, org-next-item, org-previous-item,
org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
apply renaming.
(org-get-bullet): removed function, as it is not needed anymore.
2011-02-18 12:45:11 +01:00
a02d2ad13e
org-list: separate tasks needed to insert a new item more clearly
...
* lisp/org-list.el (org-list-insert-item-generic): change arguments.
The function now accepts structure and previous items alist. This
allow to insert an item programmatically more easily.
(org-insert-item): Apply changes to org-list-insert-item-generic. The
function now takes care about repairing structure and updating
checkboxes.
* lisp/org-timer.el (org-timer-item): Apply changes to
org-list-insert-item-generic. The function now takes care about
repairing structure.
2011-02-18 12:45:11 +01:00
ddcd5d480f
org-list: rewrite of insert-item code.
...
* org-list.el (org-list-separating-blank-lines-number): use new
accessors.
(org-list-insert-item-generic): use list structures to insert a new
item.
(org-list-exchange-items): refactor and comment code. Now return new
struct instead of modifying it, as list sorting would sometimes eat
first item.
(org-move-item-down,org-move-item-up): reflect changes to
`org-list-exchange-items'.
(org-insert-item): as `org-in-item-p' also computes item beginning
when applicable, reuse the result.
* org-timer.el (org-timer-item): as `org-in-item-p' also computes item
beginning when applicable, reuse the result.
2011-02-18 12:45:08 +01:00
846a2d13d3
Code cleanup: use (org-mode-p) when possible.
2011-02-15 05:18:22 +01:00
3ceee2fefe
Timer: Run a hook when relative timer is continued
...
* lisp/org-timer.el (org-timer-continue-hook): Define the variable
(org-timer-pause-or-continue): Run hook after relative timer is
continued
There was a hook run when the relative timer is paused (and for most
other actions), but none for continuing afterwards.
One use for this would be to pause/continue playback in a media-player
app with the same keystroke used to pause/continue the timer.
TINYCHANGE
Patch by Christian Moe
2010-12-20 13:18:27 +01:00
7666ba421f
Version number back to 7.4
2010-12-10 18:49:40 +01:00
76a25715c9
Bump version number to 7.5
2010-12-10 18:43:10 +01:00
6630edbd0f
Set version number to 7.3
2010-11-07 14:52:14 +01:00
82af72eef7
Push version number to 7.02trans
2010-10-29 09:11:46 +02:00
840570c2a3
Update Changes.org and org.texi to reflect changes in org-timer.el
...
Update org.texi with a new section: Countdown timer.
Update ORGWEBPAGE/Changes.org with a section about timer/clock.
Also fix a small typo in a org-timer.el.
2010-10-27 18:20:27 +02:00
413caacfd7
Require org-clock.el where needed.
...
Also declare org-notify instead of org-show-notification.
This was reported by Łukasz Stelmach <lukasz.stelmach@iem.pw.edu.pl>
See http://article.gmane.org/gmane.emacs.orgmode/29900
2010-09-07 02:28:06 +02:00
7c73bf1f74
Remove bzg-test function.
2010-09-06 22:20:46 +02:00
4f95c5469c
`org-timer-set-timer': allow to run even before the first heading.
...
In this case, the notification will tell the user in what file the timer
was set.
2010-09-03 15:35:15 +02:00
8f173ce843
Make `org-timer-cancel-timer' turn off the modeline countdown.
...
Also bind `org-timer-cancel-timer' to `C-c C-x :' in org-mode.
We may want to bind this command in org-agenda-mode as well but
I don't have any good idea of a keybinding now.
2010-09-03 15:26:47 +02:00
58a49d1739
`org-timer-set-timer': display a countdown in the modeline for.
...
This was requested long time ago by Frederic Couchet and more recently
by Łukasz Stelmach.
2010-09-02 23:40:44 +02:00
f1d19d5e75
org-timer: Fix the docstring.
2010-09-02 22:32:32 +02:00
eebd8eb022
Fixed bug in `org-in-item-p' with point at an heading just beyond list.
...
* org-list.el (org-in-item-p): Handle case when point is at an
heading.
* org-list.el (org-list-make-subtree): Add protection when used
outside of list
* org-list.el (org-insert-item): Removed useless hack now
`org-in-item-p' is fixed.
* org-timer.el (org-timer-item): Removed useless hack now
`org-in-item-p' is fixed.
2010-09-01 19:05:49 +02:00
a42f8066d4
Can't insert new item after `org-list-bottom-point' anymore.
2010-09-01 19:05:48 +02:00
abb490c572
Internal functions stay with org-list- prefix.
2010-09-01 19:05:47 +02:00
905ad49e9a
Fixed some corner-case when inserting item.
2010-09-01 19:05:47 +02:00
3dfc889cce
Refactoring.
2010-09-01 19:05:47 +02:00
53c4b53e8f
Less latency in org-timer-item.
...
* org-timer.el (org-timer-item): Refactoring. Compute timer string
before inserting it in the buffer
* org-timer.el (org-timer): added an optional argument to return timer
string instead of inserting it.
2010-09-01 19:05:47 +02:00
8eece59f9e
Refactoring and increased protection on item insertion.
...
* org-list.el (org-insert-item-internal): New function to handle
positionning and contents of an item being inserted at a specific
pos. It is not possible anymore to split a term in a description
list or a checkbox when inserting a new item.
* org-list.el (org-insert-item): Refactored by using the new
`org-insert-item-internal' function.
* org-timer.el (org-timer-item): Refactored by using the new
`org-insert-item-internal' function.
2010-09-01 19:05:46 +02:00
2dd3b8a2a8
Better support for timer lists. Trying to insert a new item with point
...
in a special block now move before block.
* org-list.el (org-insert-item): Move before any special block in a
list prior to add a new item.
* org-timer.el (org-timer-item): When in a timer list, insert a new
timer item like `org-insert-item'. If in another list, send an
error. Otherwise, start a new timer list.
2010-09-01 19:05:46 +02:00
2b8aa4c406
Position items with relative timer at the right place.
...
* org-timer.el (org-timer-item): Insert description list item at the
right column.
* org-list.el (org-insert-item): Insert the right number of blank
lines before a relative timer.
2010-09-01 19:05:46 +02:00
6268cceec3
Mention release 7.01 on the website, push release number to 7.01trans
2010-07-19 08:33:24 +02:00
c0947c8d67
Docstring fixes part 6
2010-07-18 17:04:15 +02:00
eecb03c9c6
Use correct variable when calculating `org-timer-start-time'
...
* org-timer.el (org-timer-start): Use correct variable when
calculating `org-timer-start-time'.
2010-07-18 07:54:48 +02:00
a85cb37d47
* org-timer.el (org-timer-set-timer): Fix typo in the docstring.
2010-06-08 09:35:07 +02:00
b27c1c5113
Fix whitespace problems
2010-06-07 08:35:10 +02:00
59badeeaaf
`org-timer-set-timer': new prefix argument.
...
Called with a numeric prefix argument, `org-timer-set-timer' uses
this numeric value as the duration of the timer.
Called with a `C-u' prefix argument, use `org-timer-default-timer'
without prompting the user for a duration.
With two `C-u' prefix arguments, use `org-timer-default-timer'
without prompting the user for a duration and automatically
replace any running timer."
2010-05-28 12:38:29 +02:00
3685d6b496
`org-timer-set-timer': fix bug about cancelling timer.
2010-05-24 15:11:14 +02:00
baaf431f85
Use the type "number" for the new variable org-timer-default-timer
2010-05-20 16:24:44 +02:00
3bf121f8b1
Define and use a new variable: org-timer-default-timer
...
This variable defaults to nil. When non-nil, this is the default
value when the user is prompted for a timer.
This patch also improves org-timer-set-timer so that the user can
replace the current timer by a new one.
2010-05-20 16:16:31 +02:00
c86a3fc4aa
Push version number to 6.36trans
2010-05-09 06:24:20 +02:00
88100d1580
Release 6.36a
2010-05-09 06:13:54 +02:00
43bf1bbbd7
Push version number to 6.35trans
2010-04-15 12:24:55 +02:00
6f3026edf1
Release 6.35g
2010-04-08 20:15:15 +02:00
a589c7a22e
Release 6.35f
2010-04-08 10:36:32 +02:00
50e5924d8a
Release 6.35e
2010-04-07 16:33:52 +02:00
f722763f8a
Release 6.35d
2010-04-07 16:26:42 +02:00
d65ed03be6
Update copyright notices and fix wrong version tags
2010-04-07 16:26:10 +02:00
cafbe1d038
Release 6.35c
2010-04-07 08:58:25 +02:00
b213c0f31e
Release 6.35b
2010-04-07 07:54:14 +02:00
08d0d2fa20
Release 6.35
2010-04-06 09:16:36 +02:00
1759ccd4db
Update org-timer.el so that we only allow one timer.
...
Also get rid of a bug: as timers where not properly canceled,
`org-timer-show-remaining-time' was not giving the proper result.
Thanks to Frédéric Couchet for this catch.
2010-02-25 16:03:38 +01:00
91f5139273
One more hook in org-timer.el
2010-02-20 20:31:44 +01:00
65561fc344
Cleanup
2010-02-20 18:04:24 +01:00
73f85e8b65
Add some hooks to org-timer.el
...
Patch by Austin Frank.
2010-02-20 16:14:32 +01:00
06e74afce3
Version number to 6.34trans
2010-01-20 10:13:21 +01:00
a1709ba641
Release 6.34c
2010-01-18 00:10:11 +01:00
2f2f9441d4
Release 6.34b
2010-01-14 23:06:55 +01:00
c077142241
Release 6.34a
2010-01-12 08:53:44 +01:00
288c724335
Release 6.34
2010-01-10 10:57:53 +01:00
275b6627a6
Release 3.34
2010-01-10 10:54:52 +01:00
62a7301a5e
Push release number to 6.33trans
2009-11-20 20:20:31 +01:00
24061fddd1
Release 6.33f
2009-11-20 15:15:05 +01:00
37e9b1c51f
Release 6.33e
2009-11-20 13:58:31 +01:00
24a49967f1
Release 6.33d
2009-11-20 12:34:50 +01:00
c7371cc7fe
Push version number to 6.33trans
2009-11-15 09:46:43 +01:00
6bc6379dfe
Release 6.33c
2009-11-15 08:00:52 +01:00
6c977c41c3
Release 6.33b
2009-11-14 16:25:31 +01:00
b8a6721a68
Release 6.33a
2009-11-13 23:22:18 +01:00
5ca6635993
Push version number to 6.33a
2009-11-13 22:54:22 +01:00
82ee0cc583
Release 6.33
2009-11-13 07:10:51 +01:00
0042080e4c
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
1962a53c80
Set variables org-timer-timer[123] correctly.
...
Patch by Stephan Schmitt
2009-11-05 16:11:57 +01:00
58562167b4
Version number to 6.32trans
2009-10-27 18:23:19 +01:00
e0949896f7
Release 6.32b
2009-10-27 18:22:28 +01:00
037b685d50
Push version number to 6.32trans
2009-10-27 09:25:30 +01:00
fcd2ef541f
Release 6.32
2009-10-26 08:57:21 +01:00
6b0a251eea
Push version number to 6.31trans
2009-10-01 11:57:17 +02:00
1b37d5e07c
Release 6.31a
2009-10-01 09:13:58 +02:00
c11e0b44ae
Release 6.31
2009-09-30 16:03:17 +02:00
291a6db848
Release number back to 6.30trans
2009-09-04 10:39:01 +02:00
12ab55ca43
Release 6.30d
2009-09-03 13:53:46 +02:00
adfa87282d
Push version number to 6.30trans
2009-09-03 08:10:36 +02:00
63e1714288
Release 6.30c
2009-09-02 14:40:56 +02:00
1152565013
Avoid using time-to-seconds
2009-09-02 14:37:47 +02:00
fc332703bf
Release 6.30b
2009-09-02 11:33:10 +02:00
1d04b205e6
Release 6.30a
2009-09-02 09:00:23 +02:00
db70cdb13b
Release 6.30
2009-09-01 06:09:23 +02:00
754694dd4b
Use org-notify to show a notification and possibly play a sound.
2009-08-24 02:44:29 +08:00
bfdd3d3fd3
Push version number to 6.29trans
2009-08-06 12:07:20 +02:00
0864163024
Release 6.29c
2009-08-06 06:26:23 +02:00
Bastien Guerry
Tassilo Horn
emacs
Nicolas Goaziou
Carsten Dominik
Phil Rooke
David Maus
Bernt Hansen