b5554077cb
org-clock.el: New function `org-clock-sum-custom'
...
* org-clock.el (org-clock-sum-today): Use `headline-filter'.
Remove interactive form.
(org-clock-display): Change the meaning of prefix argument:
one prefix arg shows today's time; two prefix args show clocks
from a custom range; three prefix args show the total time in
the echo area.
(org-clock-sum-custom): New function.
(org-clock-sum): Remove interactive form.
2014-04-20 15:09:32 +02:00
51c37c5c19
Merge branch 'maint'
...
Conflicts:
lisp/org-clock.el
2014-04-18 21:33:52 +02:00
7c5cf02e2f
Fix `org-clock-put-overlay' again.
2014-04-18 21:30:12 +02:00
d52572d1bc
Merge branch 'maint'
...
Conflicts:
lisp/org-clock.el
2014-04-18 16:41:29 +02:00
bcbc97d902
Fix `org-clock-put-overlay'
2014-04-18 16:35:27 +02:00
13230e3a66
org-clock.el (org-clock-put-overlay): Minor enhancements
...
* org-clock.el (org-clock-put-overlay): Don't use a line of
dots anymore. Enhance display of time.
Thanks to Noah Slater for suggesting this.
2014-04-17 13:10:09 +02:00
9448fa263b
Merge branch 'maint'
...
Conflicts:
lisp/org-clock.el
2014-04-17 11:42:16 +02:00
17fb85b12c
org-clock.el (org-clock-put-overlay): Fix display when `org-indent-mode' is on
...
* org-clock.el (org-clock-put-overlay): Fix display when
`org-indent-mode' is on.
Thanks to Christoph Groth for reporting this.
2014-04-17 11:38:53 +02:00
8f19a42304
Minor enhancements to displaying clocks as overlays
...
* org-faces.el (org-clock-overlay): Use a gray background and
don't inherit the foreground.
* org-clock.el (org-clock-put-overlay): Don't add the stars.
2014-04-17 10:19:58 +02:00
132da2db35
Let sort-by-time handle [H]H:MM strings and add a :sort parameter for clocktables
...
* org-clock.el (org-clocktable-write-default): New parameter
":sort" to sort a column by a sorting type. E.g., a value of
:sort (1 . ?a) will sort the first column alphabetically. The
sorting line is the third one, table-wise, which is usually
the first line that contains user data.
* org.texi (The clock table): Document the new :sort
parameter.
* org.el (org-do-sort): Recognize [H]H:MM strings as time
values and allow sort-by-time to process them.
* org-table.el (org-table-sort-lines): Mention that sorting by
time also recognize [H]H:MM time values.
2014-04-16 18:23:47 +02:00
bf27c6b71f
Merge branch 'maint'
2014-03-24 06:29:26 +01:00
c4bca1c384
Fix 3a233aa
2014-03-24 06:29:14 +01:00
9bb4dd6e0a
Merge branch 'maint'
2014-03-20 09:45:09 +01:00
8bab38bcba
Fix 3a233aa
...
Thanks to Alexey Lebedeff for providing the fix.
2014-03-20 09:44:56 +01:00
719b6ec77d
Merge branch 'maint'
2014-03-19 10:49:01 +01:00
3a233aa6d9
org-clock.el (org-clock-get-table-data): Bugfix
...
* org-clock.el (org-clock-get-table-data): When :link is `t'
in the clocktable parameters, bracket links in the clocktable
should only contain their description, other C-c C-o will try
to open the bracket link at point instead of the headline.
Thanks to Alexey Lebedeff for providing a preliminary patch for this.
2014-03-19 10:48:44 +01:00
9059c8fae0
When computing clock table, remove arbitrary limit on hierarchy depth.
...
* org-clock.el (org-clock-sum): Enlarge array of per-level clock
totals as needed on demand.
2014-03-03 13:26:15 +01:00
f8e1745440
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
7d9a883b50
Update copyright years again.
...
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
eb79f0e35d
Merge branch 'maint'
2014-01-06 11:02:31 +01:00
2755f8d954
Backport spelling fixes from Emacs r115885
...
* org-clock.el (org-clock-cancel-hook)
(org-clock-leftover-time): Fix typo in docstring.
2014-01-06 11:02:18 +01:00
c41f5075ac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
2014-01-05 06:28:07 +01:00
096ff7e078
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
9214000c21
Merge branch 'maint'
...
Conflicts:
doc/org.texi
2013-11-17 09:17:39 +01:00
a6210cc9c2
Backport Paul's fixes from Emacs trunk (1/2)
...
See http://article.gmane.org/gmane.emacs.diffs/123123
2013-11-17 09:12:41 +01:00
668ba5de0e
Merge branch 'maint'
2013-11-15 06:56:10 +01:00
bf012136bd
Remove org-autoload.
...
* org-macs.el (org-autoload): Delete.
* org-docview.el ("docview"): Fix declarations and require
doc-view directly.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling, org-id-new):
* org-colview.el:
(org-colview-initial-truncate-line-value)
(org-columns-open-link, org-string-to-number):
* org-clock.el:
(org-clock-put-overlay, org-count-quarter, org-clock-loaded):
* org-archive.el (org-get-local-archive-location):
* org-agenda.el (org-agenda-todo-custom-ignore-p):
Autoload.
Those functions were autoloaded from within calls to `org-autoload'
in org.el, we now autoload them from where they live.
2013-11-15 06:55:28 +01:00
487057fc26
Fix conflicts from previous merge
2013-11-12 21:11:23 +01:00
71884cc039
Merge branch 'maint'
...
Conflicts:
lisp/ob-C.el
lisp/ob-clojure.el
lisp/ob-core.el
lisp/ob-lisp.el
lisp/org-clock.el
2013-11-12 21:00:49 +01:00
f95641c443
Backport changes from Emacs revs 115081 and 115082
...
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 20:57:31 +01:00
6202ec7b3b
Remove need to declare drawers before using them
...
* lisp/org-agenda.el (org-agenda-prepare): Remove reference to
`org-drawers-for-agenda'.
(org-agenda-show-1): Remove reference to `org-drawers'.
* lisp/org-clock.el (org-clock-remove-empty-clock-drawer,
org-clock-cancel): Apply signature change to
`org-remove-empty-drawer-at'.
* lisp/org-element.el (org-element--list-struct): Use
`org-drawer-regexp' instead of `org-drawers'.
* lisp/org-feed.el (org-feed-drawer): Update docstring according to
change.
* lisp/org-list.el (org-in-item-p, org-list-context): Use
`org-drawer-regexp' instead of `org-drawers'.
* lisp/org-mobile.el (org-mobile-create-index-file): Remove reference
to `org-drawers-for-agenda'.
* lisp/org-pcomplete.el (pcomplete/org-mode/drawer): Remove function.
* lisp/org.el (org-drawer-regexp): Make variable global.
(org-drawers): Remove variable.
(org-set-regexps-and-options): Ignore DRAWER keyword.
(org-cycle): Use `org-drawer-regexp' instead of `org-drawers'.
(org-cycle-hide-drawers): Add an optional argument to ignore some
drawers.
(org-remove-empty-drawer-at): Remove second argument. Rewrite
function.
(org-clone-subtree-with-time-shift): Apply signature change to
`org-remove-empty-drawer-at'.
(org-toggle-ordered-property): Apply `org-delete-property' signature
change.
(org-map-entries): Remove reference to `org-drawers-for-agenda'.
(org-entry-delete): Remove optional argument. Small refactoring.
(org-insert-drawer): Remove reference to `org-drawers'.
(org-delete-property): Apply `org-entry-delete' signature change.
(org-in-drawer-p): Rewrite function.
* testing/lisp/test-org-element.el: Update tests.
* testing/lisp/test-org.el: Update tests.
* testing/lisp/test-ox.el: Update tests.
2013-10-31 21:19:40 +01:00
d73bde62fe
Fix incorrect time calculation for `org-extend-today-until'
...
* lisp/org-clock.el (org-clock-get-sum-start): Fix bad date
math, affecting mode line and clock tables.
Patch by Ian Kelling
2013-10-17 07:41:49 +02:00
5aed072d3b
Center currently clocked headline to top of screen
...
* org-clock.el (org-clock-goto-before-context): New option.
(org-clock-goto): Use that option.
2013-09-13 08:08:42 +02:00
4b749075f4
Center currently clocked headline close to top of screen
...
* lisp/org-clock.el (org-clock-goto): Recenter to thrd line
Patch modified from proposal by Sebastien Vauban.
2013-08-30 18:14:53 +02:00
83b6cfcaec
Merge branch 'maint'
2013-08-08 14:32:34 +02:00
ab8bfb8460
org-clock: Fix defcustom type for two variables
...
* lisp/org-clock.el (org-clock-total-time-cell-format,
org-clock-file-time-cell-format): Use correct type.
2013-08-08 14:32:01 +02:00
483977e016
Merge branch 'maint'
2013-07-30 12:44:56 +02:00
2710267ed7
o org-clock.el (org-clock-notify-once-if-expired): Honor `org-clock-sound'
...
* org-clock.el (org-clock-notify-once-if-expired): Honor
`org-clock-sound'.
TINYCHANGE
2013-07-30 12:44:43 +02:00
f1b99adbaf
Merge branch 'maint'
2013-05-21 12:40:52 +02:00
030e968982
Fix previous commit
2013-05-21 12:37:05 +02:00
9eb5fd5dc0
org-clock.el (org-clock-modify-effort-estimate): Clarify docstring
...
* org-clock.el (org-clock-modify-effort-estimate): Clarify
docstring.
Thanks to Ken Mankoff for raising this.
2013-05-21 12:33:36 +02:00
a84c01642b
Fix customization types of variables
...
* contrib/lisp/org-wl.el (org-wl-namazu-default-index): Fix custom type.
* lisp/ob-lob.el (org-babel-lob-files): Fix custom type.
* lisp/org-agenda.el (org-agenda-export-html-style):
(org-agenda-ndays):
(org-agenda-inactive-leader):
(org-agenda-day-face-function):
(org-agenda-auto-exclude-function): Fix custom type.
* lisp/org-bibtex.el (org-bibtex-prefix): Fix custom type.
* lisp/org-clock.el (org-clock-heading-function):
(org-show-notification-handler): Fix custom type.
* lisp/org-footnote.el (org-footnote-auto-adjust): Fix custom type.
* lisp/org-protocol.el (org-protocol-default-template-key): Fix custom type.
* lisp/org.el (org-make-link-description-function):
(org-link-translation-function):
(org-link-frame-setup):
(org-refile-target-verify-function):
(org-get-priority-function):
(org-use-fast-tag-selection):
(org-columns-modify-value-for-display-function):
(org-sparse-tree-default-date-type): Fix custom type.
* lisp/ox-html.el (org-html-postamble):
(org-html-postamble-format):
(org-html-preamble-format): Fix custom type.
* lisp/ox-odt.el (org-odt-content-template-file): Fix custom type.
* lisp/ox.el (org-export-with-archived-trees):
(org-export-initial-scope): Fix custom type.
Thanks to Glenn Moris for reporting these. He used cus-test.el
to find them.
2013-05-09 15:19:02 +02:00
3dd3100794
org-clock.el (org-clock-in): Don't forward by one character when setting the marker in the clock history
...
* org-clock.el (org-clock-in): Don't forward by one character
when setting the marker in the clock history.
This was done to prevent the marker from being broken when a user
manually insert some text right one it. I cannot reproduce this
manual marker modification problem, so let's remove this ugly
exception, as it is not consistent with other clock markers.
Thanks to Bernt Hansen for pointing this out.
2013-04-24 10:47:16 +02:00
13deb41a3a
org-clock.el (org-clock-select-task): Remove successive duplicates in the clock history to consider
...
* org-clock.el (org-clock-select-task): Remove successive
duplicates in the clock history to consider.
Thanks to Sébastien Vauban for pointing at this.
2013-04-13 10:21:16 +02:00
78b5dd8d56
org-clock.el (org-clock-insert-selection-line): Don't display the clockout time
...
* org-clock.el (org-clock-insert-selection-line): Don't
display the clockout time.
This partially reverts commit ff4b7a47
2013-04-12 08:21:48 +02:00
ff4b7a4784
org-clock.el (org-clock-select-task): Throw a user error when the clock history is empty
...
* org-clock.el (org-clock-select-task): Throw a user error
when the clock history is empty.
2013-04-10 10:08:45 +02:00
749829d591
org-clock.el (org-clock-select-task): Fix window to buffer
...
* org-clock.el (org-clock-select-task): Fix window to buffer.
Hide the cursor.
(org-clock-insert-selection-line): Add the clock-out time.
Thanks to Bernt Hansen for reporting the issue about the window.
2013-04-09 19:36:14 +02:00
ee422561c8
org-clock.el (org-clock-resolve): Enhance the content of the help window
...
* org-clock.el (org-clock-resolve): Enhance the content of the
help window.
2013-04-08 21:25:09 +02:00
Bastien Guerry
Ilya Shlyakhter
Nicolas Goaziou
Carsten Dominik
Sebastien Vauban
oleh