1 2008-11-01 Carsten Dominik <dominik@science.uva.nl>
3 * org-agenda.el (org-agenda-remove-marked-text): New function.
4 (org-agenda-mark-filtered-text)
5 (org-agenda-unmark-filtered-text): New functions.
6 (org-write-agenda): Remove fltered text.
8 * org.el (org-make-tags-matcher): Give access to TODO "property"
11 2008-10-29 Carsten Dominik <dominik@science.uva.nl>
13 * org.el (org-link-frame-setup): Add `org-gnus-no-new-news' as an
15 (org-store-link-props): Make sure adding to the plist works
18 * org-gnus.el (org-gnus-no-new-news): New function.
19 (org-gnus-follow-link): Allow the article ID to be a message-id,
20 in addition to allowing article numbers. Message IDs make much
22 (org-gnus-store-link): Use message-id to create link.
24 2008-10-28 Carsten Dominik <dominik@science.uva.nl>
26 * org.el (org-emphasize): Reverse the selection array.
27 (org-emphasis-alist): Set <code> tags for the verbatim
30 * org-remember.el (org-remember-handler): Fix bug with
31 prefix-related changing of the note storage target.
33 * org-exp.el (org-print-icalendar-entries): Make the exported
34 priorities compatible with RFC 2445.
36 * org-clock.el (org-clock-save): Insert time stamp without
37 dependence on time-stamp.el.
39 2008-10-27 Carsten Dominik <dominik@science.uva.nl>
41 * org.el ("saveplace"): If saveplace puts point into an invisible
42 location, make it visible.
43 (org-make-tags-matcher): Allow inactive time stamps in time
45 (org-yank-adjusted-subtrees): New option.
46 (org-yank): Incorporate adjusting trees.
47 (org-paste-subtree): New argument FOR-YANK which will cause
48 insertion at point without backing up over white lines, and leave
49 point at the end of the inserted text. Also if the cursor is
50 at the beginning of a headline, use the same level or the inserted
53 * org-publish.el (org-publish-get-base-files-1): Deal correctly
56 2008-10-26 Carsten Dominik <dominik@science.uva.nl>
58 * org-exp.el (org-export-select-tags, org-get-current-options):
61 2008-10-25 Carsten Dominik <dominik@science.uva.nl>
63 * org-compat.el (org-fit-window-to-buffer): New function.
65 * org-agenda.el (org-format-agenda-item)
66 (org-agenda-filter-make-matcher): Make sure tags are stored and
69 2008-10-23 Carsten Dominik <dominik@science.uva.nl>
71 * org.el (org-insert-todo-heading): Fix bug with force-heading
74 2008-10-23 James TD Smith <ahktenzero@mohorovi.cc>
76 * org-clock.el (org-clock-in-resume): Add a custom option to
77 toggle starting the clock from an open clock line.
78 (org-clock-in): When clocking in to an entry, if
79 `org-clock-in-resume' is set, check if the first clock line is
80 open and if so, start the clock from the time in the clock line.
81 (org-clock-persist): Add a custom option to toggle clock
83 (org-clock-persist-query-save): Add a custom option to toggle
84 asking the user if they want to save the running clock when
86 (org-clock-persist-query-resume): Add a custom option to toggle
87 asking the user if they want to resume the saved clock when Emacs
89 (org-clock-save): Add a function to save clock data.
90 This includes the contents of `org-clock-history' and the buffer
91 and position of the currently clocked task, if any.
92 (org-clock-load): Add a function to load clock data.
93 This populates `org-clock-history', and resumes the saved clocked
95 (org-clock-persistence-insinuate): Add a method to set up the
96 hooks for clock persistence.
98 2008-10-22 Carsten Dominik <dominik@science.uva.nl>
100 * org-exp.el (org-export-as-ascii): Handle the case that we are
101 publishing from an indirect buffer.
103 * org-table.el (org-table-copy-down): Fix bug with time stamp
106 * org-mouse.el (org-mouse-features): New option.
107 (org-mode-hook): Turn on features depending on
108 `org-mouse-features'.
110 * org.el (org-insert-heading-respect-content): Force heading
112 (org-insert-heading): keep the folding state of the heading before
115 2008-10-21 Carsten Dominik <dominik@science.uva.nl>
117 * org-archive.el (org-archive-to-archive-sibling): Handle top
118 level headlines better.
120 2008-10-21 Bastien Guerry <bzg@altern.org>
122 * org-export-latex.el (org-export-latex-classes): Added
123 \usepackage{graphicx} to the default list of packages.
125 2008-10-21 Carsten Dominik <dominik@science.uva.nl>
127 * org-agenda.el (org-agenda-filter): Renamed from
128 `org-agenda-filter-tags'.
130 2008-10-20 Carsten Dominik <dominik@science.uva.nl>
132 * org.el (org-entry-properties): Add CATEGORY property, iven if it
133 is not defined as a property in this entry.
134 (org-add-log-note): Mask prefix argument when immediately storing
137 * org-agenda.el (org-agenda-filter-effort-default-operator): New
140 2008-10-19 James TD Smith <ahktenzero@mohorovi.cc>
142 * org.el (org-add-log-setup): Bugfix; code to find insertion point
143 after drawers was skipping ahead one line too many, so notes were
144 inserted after the first note instead of before it.
146 2008-10-18 Carsten Dominik <dominik@science.uva.nl>
148 * org-agenda.el (org-agenda-filter-tags,org-agenda-filter-form):
150 (org-prepare-agenda): Reset the filter tags.
151 (org-agenda-filter-by-tag, org-agenda-filter-by-tag-show-all):
152 Show filter tags in mode line.
154 * org-table.el (orgtbl-to-html): Bind `html-table-tag' for the
157 * org-export-latex.el (org-latex-entities-regexp): New constant.
158 (org-export-as-pdf): Use two calls to `shell-command'.
160 2008-10-17 Carsten Dominik <dominik@science.uva.nl>
162 * org-export-latex.el (org-export-latex-treat-sub-super-char):
163 Honor the {} value of the subsuperscript setting. Make sure that
164 longer subsuperscripts are typeset in a roman font.
166 * org.el (org-clock-update-time-maybe): Compute negative clock
169 2008-10-16 Carsten Dominik <dominik@science.uva.nl>
171 * org.el (org-add-log-setup): Respect
172 `org-log-state-notes-insert-after-drawers'.
173 (org-log-state-notes-insert-after-drawers): New option.
174 (org-todo-trigger-tag-changes): New function.
175 (org-todo): Call `org-todo-trigger-tag-changes'.
177 2008-10-15 James TD Smith <ahktenzero@mohorovi.cc>
179 * org.el (org-add-log-setup): Only skip drawers if the are
180 immediately after the scheduling keywords.
182 * org-clock.el (org-clock-in-switch-to-state): Allow this to be a
184 (org-clock-in): If `org-clock-in-switch-to-state' is a function,
185 call it with the current todo state to get the state to switch to
187 (org-clock-in): Use org-indent-line-function to indent clock lines.
188 (org-clock-find-position): Fix indentation of empty clock drawers.
190 2008-10-15 Carsten Dominik <dominik@science.uva.nl>
192 * org-publish.el (org-publish-org-to): Handle case when
193 org-export-to-pdf does return a file name, not a buffer.
194 (org-publish-org-to-pdf): New function.
196 * org-export-latex.el (org-export-as-pdf)
197 (org-export-as-pdf-and-open): New commands.
199 * org-table.el (org-table-eval-formula): Avoid parsing Calc's HMS
202 * org-export-latex.el (org-export-latex-lists): Ignore lists-like
203 things in protexted regions.
205 2008-10-14 Carsten Dominik <dominik@science.uva.nl>
207 * org-export-latex.el (org-export-latex-preprocess): Improve
208 quoting of LaTeX environments.
210 2008-10-10 Carsten Dominik <dominik@science.uva.nl>
212 * org.el (org-edit-fixed-width-region): Exclude final newline from
215 * org-export-latex.el (org-export-latex-subcontent): Add labels to
216 sections, to make internal links work.
217 (org-export-latex-fontify-headline): Do not remove all text
218 properties, to make sure that target properties survive this
221 * org-exp.el (org-export-preprocess-string): Change sequence of
222 modifications, to make sure links are prepared before the LaTeX
223 conversions do happen.
225 2008-10-09 Carsten Dominik <dominik@science.uva.nl>
227 * org-attach.el (org-attach-delete-all): Renamed from
228 `org-attch-delete'. Add a security query before deleting the
229 entire directory. New optional argument FORCE can overrule the
231 (org-attach-delete-one): New command.
233 2008-10-08 Carsten Dominik <dominik@science.uva.nl>
235 * org-attach.el (org-attach-file-list): Fix bug with directory.
237 2008-10-07 Carsten Dominik <dominik@science.uva.nl>
239 * org.el (org-apps-regexp-alist): New function.
240 (org-file-apps): Add auto-mode to the default value.
241 (org-open-file): Use the new structure of org-file-apps.
243 * org-attach.el (org-attach): Support the new keys.
244 (org-attach-method): New option.
246 2008-10-06 Carsten Dominik <dominik@science.uva.nl>
248 * org-bbdb.el (org-bbdb-anniversaries): Fix but with 29 Feb/1
251 * org.el (org-remove-uniherited-tags): Fix reverse interpretation
252 of the list value o `org-use-tag-inheritance'.
254 * org-attach.el (org-attach-auto-tag): New option.
255 (org-attach-tag, org-attach-untag): New functions.
256 (org-attach-attach, org-attach-new, org-attach-sync): Call
258 (org-attach-delete): Call `org-attach-untag'.
260 2008-10-04 Carsten Dominik <dominik@science.uva.nl>
262 * org-table.el (orgtbl-self-insert-command): Make this work for
265 2008-10-02 Carsten Dominik <dominik@science.uva.nl>
267 * org.el (org-add-log-setup): Limit searc for drawers to entry
268 text, not to subtree.
270 * org-clock.el (org-clock-heading-for-remember): New variable.
271 (org-clock-in): Set `org-clock-heading-for-remember'.
273 2008-10-01 James TD Smith <ahktenzero@mohorovi.cc>
275 * org-remember.el (org-remember-apply-template): Add new
276 expansions: %k, %K for currently clocked task and a link to the
277 currently clocked task, and %< to file notes in the currently
280 2008-10-01 Carsten Dominik <dominik@science.uva.nl>
282 * org-export-latex.el (org-export-latex-make-header): Also insert
283 the content of the property :latex-header-extra.
285 * org-exp.el (org-infile-export-plist): Put the content of
286 #+LATEX_HEADER: into the property :latex-header-extra.
288 * org-colview.el (org-columns-get-format-and-top-level): Remove
289 resetting the marker.
291 * org-colview-xemacs.el (org-columns-get-format-and-top-level):
292 Remove resetting the marker.
294 * org.el (org-entry-property-inherited-from): Improve docstring.
295 (org-entry-get-with-inheritance): Reset marker before starting the
298 * org-exp.el (org-infile-export-plist): Allow multiple STYLE lines.
300 2008-09-30 Carsten Dominik <dominik@science.uva.nl>
302 * org.el (org-entry-get-multivalued-property)
303 (org-entry-protect-space, org-entry-restore-space): New
305 (org-file-apps-defaults-macosx): Let postscript files be opened by
307 (org-time-stamp-inactive): Call `org-time-stamp'.
308 (org-time-stamp): New argument `inactive'. Also edit inacive
309 stamps. Convert time stamp type.
310 (org-open-file): Interpret the `default' value for the `command'
313 * org-id.el (org-id-int-to-b36-one-digit)
314 (org-id-b36-to-int-one-digit, org-id-int-to-b36)
315 (org-id-b36-to-int, org-id-time-to-b36): Modified from b62 to
318 2008-09-29 Carsten Dominik <dominik@science.uva.nl>
320 * org-id.el (org-id-reverse-string): New function.
321 (org-id-new): Use `org-id-reverse-string' to make sure the
322 beginning chars of the ID are mutating fast. This allows to use a
323 directory structure to spread things better.
324 (org-id-prefix): Changed default to nil.
326 * org-list.el (org-move-item-down, org-move-item-up): Remember and
327 restore the column of the cursor position.
329 * org-remember.el (org-remember-apply-template): Remove properties
332 2008-09-27 Carsten Dominik <dominik@science.uva.nl>
334 * org-wl.el (org-wl-open): Remove useless call to
335 `wl-thread-open-all'.
337 * org-remember.el (org-remember-handler): Fix bug with `bottom'
340 2008-09-26 Carsten Dominik <dominik@science.uva.nl>
342 * org-bbdb.el (org-bbdb-anniversaries): Require bbdb in
343 `org-bbdb-anniversaries'.
345 * org.el (org-get-next-sibling, org-forward-same-level): New
346 functions, similar to the outline versions, but invisible headings
349 2008-09-25 Bastien Guerry <bzg@altern.org>
351 * org.el (org-auto-repeat-maybe): Insert a space between
352 the timestamp's type and the timestamp itself.
354 2008-09-24 Carsten Dominik <dominik@science.uva.nl>
356 * org-table.el (org-table-sum): Do not format the result with %g,
357 it does rounding when there are too many digits.
359 * org.el (org-map-entries): Protect the keyword-selecting variables.
361 2008-09-23 Bastien Guerry <bzg@altern.org>
363 * org-agenda.el (org-agenda-to-appt): Make sure the function check
364 against all agenda files.
366 2008-09-23 Carsten Dominik <dominik@science.uva.nl>
368 * org-list.el: New file, aggregating list functions from org.el
369 and org-export-latex.el.
371 * org.el (org-edit-src-region-extra): New option.
373 2008-09-22 Carsten Dominik <dominik@science.uva.nl>
375 * org-agenda.el (org-agenda-to-appt): Fix bug with appointment
378 2008-09-22 Bastien Guerry <bzg@altern.org>
380 * org-export-latex.el (org-export-latex-keywords-maybe): Bug fix.
382 2008-09-22 James TD Smith <ahktenzero@mohorovi.cc>
384 * org-plot.el (org-plot/gnuplot): Make tables starting with a
385 hline work correctly.
386 (org-plot/gnuplot-script): Put commas at the end of each script
389 2008-09-20 James TD Smith <ahktenzero@mohorovi.cc>
391 * org.el (org-get-refile-targets): Replace links with their
393 (org-imenu-get-tree): Replace links with their descriptions.
395 * org-remember.el (org-remember-apply-template): Add a new
396 expansion for adding properties to remember items.
398 * org.el (org-add-log-setup): Skip over drawers (properties,
399 clocks etc) when adding notes.
401 * org-agenda.el (org-agenda-get-closed): show durations of clocked
402 items as well as the start and end times.
404 * org-compat.el (org-get-x-clipboard-compat): Add a compat
405 function for fetching the X clipboard on XEmacs and GNU Emacs 21.
407 * org-remember.el (org-get-x-clipboard): Use the compat
408 function to get clipboard values when x-selection-value is
409 unavailable. Use substring-no-properties instead of
410 set-text-properties to remove text properties from the clipboard
413 * lisp/org-clock.el (org-update-mode-line): Support limiting the
414 modeline clock string, and display the full todo value in the
415 tooltip. Set a local keymap so mouse-3 on the clock string goes to
416 the currently clocked task.
417 (org-clock-string-limit): Add a custom value for the maximum
418 length of the clock string in the modeline.
419 (org-clock-mode-map): Add a keymap for the modeline string
421 2008-09-21 Carsten Dominik <dominik@science.uva.nl>
423 * org-compat.el (org-propertize): New function.
425 2008-09-20 Bastien Guerry <bzg@altern.org>
427 * org-export-latex.el (org-export-latex-tables): protect exported
428 tables from further special chars conversion.
429 (org-export-latex-preprocess): Preserve LaTeX environments.
430 (org-list-parse-list): Parse descriptive lists.
431 (org-list-to-generic, org-list-to-latex, org-list-to-html)
432 (org-list-to-texinfo): Export descriptive lists.
433 (org-quote-chars): Remove.
434 (org-export-latex-keywords-maybe): Use `replace-regexp-in-string'.
435 (org-export-latex-list-beginning-re): Rename to
436 `org-list-beginning-re'
437 (org-list-item-begin): Rename to `org-list-item-beginning'
439 2008-09-20 Carsten Dominik <dominik@science.uva.nl>
441 * org.el (org-refile): Allow refiling to the last entry in the
443 (org-get-tags-at): Fix bug when inheritance is turned off.
445 2008-09-19 Carsten Dominik <dominik@science.uva.nl>
447 * org.el (org-indent-line-function): No longer check for src
448 regions, this is too much overhead.
450 * org-agenda.el (org-agenda-highlight-todo): Fix bugs with keyword
453 * org.el (org-scan-tags): Make sure that tags matching is not case
454 sensitive. TODO keyword matching is case sensitive, however, to
455 avoid confusion with similar words that are not meant to be
458 2008-09-18 Carsten Dominik <dominik@science.uva.nl>
460 * org.el (org-get-local-tags-at): New function.
461 (org-get-local-tags): New function.
463 * org-exp.el (org-export-get-categories): New function.
465 * org-agenda.el (org-sorting-choice)
466 (org-agenda-sorting-strategy, org-agenda-get-todos)
467 (org-agenda-get-timestamps, org-agenda-get-deadlines)
468 (org-agenda-get-scheduled, org-agenda-get-blocks)
469 (org-entries-lessp): Implement sorting by TODO state.
470 (org-cmp-todo-state): New defsubst.
472 * org-colview.el (org-colview-construct-allowed-dates): New
474 (org-columns-next-allowed-value): Use
475 `org-colview-construct-allowed-dates'.
477 * org-colview-xemacs.el (org-colview-construct-allowed-dates): New
479 (org-columns-next-allowed-value): Use
480 `org-colview-construct-allowed-dates'.
482 2008-09-17 Carsten Dominik <dominik@science.uva.nl>
484 * org.el (org-protect-slash): New function.
485 (org-get-refile-targets): Use `org-protect-slash'.
487 * org-agenda.el (org-global-tags-completion-table): New variable.
489 * org-exp.el (org-export-handle-export-tags): New function.
490 (org-export-preprocess-string): Call
491 `org-export-handle-export-tags'.
493 * org-plot.el: New file.
495 * org-publish.el (org-publish-expand-components): Function removed.
496 (org-publish-expand-projects): Allow components to have components.
498 2008-09-13 Carsten Dominik <dominik@science.uva.nl>
500 * org.el (org-indent-line-function): Do not indent in regions that
501 are external source code.
502 (org-yank-and-fold-if-subtree): New function.
504 * org-agenda.el (org-agenda-todayp): New function.
505 (org-agenda-get-deadlines, org-agenda-get-scheduled): Use
508 * org.el (org-insert-heading-respect-content)
509 (org-insert-todo-heading-respect-content): New commands.
510 (org-insert-heading-respect-content): New option.
511 (org-insert-heading): Respect `org-insert-heading-respect-content'.
513 * org-clock.el (org-clock-find-position): Make sure the note after
514 the clock line gets moved into the new clock drawer.
516 2008-09-11 Carsten Dominik <dominik@science.uva.nl>
518 * org-id.el (org-id-new): New option.
520 2008-09-08 Carsten Dominik <dominik@science.uva.nl>
522 * org-table.el (org-table-copy-down): Avoid overflow during
523 increment. Use prefix argument 0 to temporarily disable the
526 2008-09-07 Carsten Dominik <dominik@science.uva.nl>
528 * org-exp.el (org-export-as-html): Do not turn on the major mode
529 if the buffer will be killed anyway.
530 (org-get-current-options): Exclude the #+TEXT field.
531 (org-export-as-html): Make sure text before the first headline is
534 * org-publish.el (org-publish-org-to): Tell the exporter that this
535 buffer will be killed, so it is not necessary to do major mode
538 * org-archive.el (org-archive-to-archive-sibling): Show empty
539 lines after folding the archive sibling.
541 * org.el (org-log-note-extra): New variable.
543 2008-09-05 Bastien Guerry <bzg@altern.org>
545 * org.el (org-additional-option-like-keywords): Added keywords for
546 the _QUOTE, _VERSE and _SRC environments.
548 * org-export-latex.el (org-export-latex-preprocess): Fix bug when
549 exporting _QUOTE and _VERSE environments.
551 2008-09-05 Carsten Dominik <dominik@science.uva.nl>
553 * org-agenda.el (org-agenda-filter-by-tag): New command.
555 * org-exp.el (org-get-current-options): Remove angular brackets
558 * org.el (org-edit-fixed-width-region): New function.
559 (org-edit-fixed-width-region): Also try
560 `org-edit-fixed-width-region'.
561 (org-edit-fixed-width-region-mode): New option.
562 (org-activate-code): Only interprete lines starting with colon
563 plus a space as example lines.
565 * org-remember.el (org-remember-templates): Add nil instead of
566 empty strings to fix the length of remember templates.
568 * org-table.el (org-calc-default-modes): Fix the time format for
569 calc, from 12 hour to 24 hour clock.
571 2008-09-04 Carsten Dominik <dominik@science.uva.nl>
573 * org-agenda.el (org-agenda-get-deadlines)
574 (org-agenda-get-scheduled): Avoid `time-of-day' extraction for
575 entries that are pre-warnings of deadlines or reminders.
577 * org.el (org-sort-entries-or-items): Make numeric and alpha
578 comparisons ignore any TODO keyword and priority cookie.
580 * org-remember.el (org-remember-handler): Reinterpretation of the
583 2008-09-03 Carsten Dominik <dominik@science.uva.nl>
585 * org-agenda.el (org-agenda-get-scheduled): Use new
586 `org-scheduled' face.
588 * org-faces.el (org-scheduled): New face.
590 * org-wl.el (org-wl-open): Remove incorrect declaration.
592 * org-gnus.el (org-gnus-store-link): Support for :to information
595 * org-exp.el (org-export-as-html): Fixed typo in creator
597 (org-export-protect-examples): New parameter indent. Insert extra
598 spaces only when this parameter is specified.
599 (org-export-preprocess-string): Call `org-export-protect-examples'
600 with an indentation parameter when exporting to ASCII.
602 * org-remember.el (org-remember-templates)
603 (org-remember-apply-template): Allow the file component to be a
606 * org.el (org-goto-local-search-headings): Renamed from
607 `org-goto-local-search-forward-headings'. Added the possibility
610 2008-09-02 Carsten Dominik <dominik@science.uva.nl>
612 * org-export-latex.el (org-export-latex): New customization
615 * org-agenda.el (org-write-agenda): Erase buffer for txt export.
617 2008-09-01 Carsten Dominik <dominik@science.uva.nl>
619 * org-exp.el (org-html-do-expand): Allow {} to terminate
622 2008-07-29 Carsten Dominik <dominik@science.uva.nl>
624 * org.el (org-buffer-list): Select buffers based on major mode,
627 2008-07-26 Carsten Dominik <dominik@science.uva.nl>
629 * org-agenda.el (org-agenda-align-tags): Fix bug with malformed
632 * org-colview.el (org-columns-display-here): Use
633 `org-columns-modify-value-for-display-function'.
635 * org-colview-xemacs.el (org-columns-display-here): Use
636 `org-columns-modify-value-for-display-function'.
638 2008-07-25 Carsten Dominik <dominik@science.uva.nl>
640 * org.el (org-columns-modify-value-for-display-function): New option.
652 * org-publish.el (org-publish-file): Make sure the directory match
653 for the publishing directory works correctly.
655 * org-agenda.el (org-agenda-execute-calendar-command)
656 (org-agenda-diary-entry): Additional optional argument.
658 2008-07-24 Carsten Dominik <dominik@science.uva.nl>
660 * org-exp.el (org-export-as-html): Add attributes also in mailto
663 * org.el (org-autoload): Add `org-dblock-write:columnview'.
672 2008-07-23 Carsten Dominik <dominik@science.uva.nl>
674 * org-exp.el (org-export-region-as-html, org-export-as-html): Make
675 sure that calls from `org-export-region-as-html' do not do the
676 special check for a subtree.
678 2008-07-22 Carsten Dominik <dominik@science.uva.nl>
680 * org-agenda.el (org-batch-store-agenda-views): Fix parsing bug.
682 2008-07-20 Juri Linkov <juri@jurta.org>
684 * org.el (narrow-map): Bind `org-narrow-to-subtree' to "s" on the
685 new keymap `narrow-map' instead of binding "\C-xns".
687 2008-07-18 Carsten Dominik <dominik@science.uva.nl>
689 * org.el (org-open-file): Use
690 `org-open-directory-means-index-dot-org'.
691 (org-open-directory-means-index-dot-org): New option.
693 2008-07-17 Carsten Dominik <dominik@science.uva.nl>
695 * org.el (org-make-link-string): Remove link attributes from
697 (org-open-at-point): Remove link attributes bevore using the path.
699 * org-exp.el (org-export-as-html): Handle link attributes.
701 * org.el (org-extract-attributes, org-attributes-to-string): New functions.
703 * org-table.el (org-table-to-lisp): New function.
705 * org.el (org-narrow-to-subtree): Do not include the final newline
706 into the narrowed region.
708 * org-agenda.el (org-agenda-custom-commands-local-options): Fixed
709 bug with user-define skipping condition.
711 2008-07-16 Carsten Dominik <dominik@science.uva.nl>
713 * org-agenda.el (org-agenda-get-restriction-and-command): Fixed typo.
715 2008-07-14 Carsten Dominik <dominik@science.uva.nl>
717 * org-exp.el (org-export-html-style-default): Automatic overflow
718 handling for pre fields.
719 (org-export-as-ascii, org-export-as-html): Change default format
722 * org-table.el (org-table-export): Offer completion for translator
723 functions, and do not require a heading above the table.
725 * org.el (org-renumber-ordered-list, org-beginning-of-item-list):
726 Cater for the case of a list starting in the first line of the
729 2008-07-09 Carsten Dominik <dominik@science.uva.nl>
731 * org-publish.el (org-publish-find-title): Bug fix.
732 (org-publish-org-index): Implement new :index-style option.
734 2008-07-07 Carsten Dominik <dominik@science.uva.nl>
736 * org-publish.el (org-publish-timestamp-filename): Use
737 SHA1-encoded file names in the timestamp directory.
739 2008-07-05 Carsten Dominik <dominik@science.uva.nl>
741 * org-publish.el (org-publish-needed-p): Be verbose about files
742 published and files skipped.
744 * org-exp.el (org-export-preprocess-string): Swap link
745 normalization and inernal link targeting.
747 * org-publish.el (org-publish-needed-p): Create timestamp
748 directory when it does not exist.
750 2008-07-04 Bastien Guerry <bzg@altern.org>
752 * org-clock.el (org-clock-out-when-done): Doc fix.
754 * org.el (org-agenda-skip-unavailable-files): Doc fix.
756 * org-exp.el (org-export-remove-comment-blocks-and-subtrees):
757 Ignore case when searching for the COMMENT cookie at export time.
759 2008-07-02 Carsten Dominik <dominik@science.uva.nl>
761 * org-exp.el (org-get-file-contents)
762 (org-get-and-remove-property): New functions.
763 (org-export-handle-include-files): Handle the new prefix options.
764 (org-export-as-html): Fix the verse environment.
766 2008-07-01 Carsten Dominik <dominik@science.uva.nl>
768 * org.el (org-time=, org-time<, org-time<=, org-time>)
769 (org-time>=, org-time<>, org-2ft): New functions.
770 (org-op-to-function): Also provide for the time testing fucntions.
772 2008-06-30 Carsten Dominik <dominik@science.uva.nl>
774 * org-exp.el (org-export-html-style-default): New constant.
776 2008-06-29 Carsten Dominik <dominik@science.uva.nl>
778 * org-exp.el (org-export-html-style-extra): New variable.
779 (org-export-splice-style): New function.
781 2008-06-26 Carsten Dominik <dominik@science.uva.nl>
783 * org-exp.el (org-export-plist-vars, org-export-as-html):
784 Implement `org-export-creator-info'.
785 (org-export-creator-info): New option.
787 2008-06-25 Carsten Dominik <dominik@science.uva.nl>
789 * org.el (org-clock-drawer-start-re, org-clock-drawer-end-re)
790 (org-property-drawer-re, org-clock-drawer-re): New constants.
792 2008-06-23 Carsten Dominik <dominik@science.uva.nl>
794 * org-exp.el (org-icalendar-use-deadline)
795 (org-icalendar-use-scheduled): New options.
796 (org-icalendar-include-todo): Default changed to t.
797 (org-print-icalendar-entries): Implement better utilization of
798 scheduling and deadline time stamps.
799 (org-export-target-internal-links, org-export-as-html): Allow file
800 lines without the "file:" prefix if the file path is an absolute
801 path or starts with ".".
803 * org-clock.el (org-clocktable-shift): Also undertand yesterday,
805 (org-clock-special-range): Also undertand yesterday, lastweek etc.
807 2008-06-18 Glenn Morris <rgm@gnu.org>
808 * org.el (org-map-entries): Let-bind `file'.
810 2008-06-19 Carsten Dominik <dominik@science.uva.nl>
812 * org.el (org-agenda-skip-archived-trees): Docstring now
813 discourages using this.
814 (org-scan-tags): Check for org-agenda-archives-mode.
815 (org-map-entries): Make sure org-agenda-archives-mode is nil.
816 (org-agenda-files): Functionality of second arg changed.
818 * org-agenda.el (org-agenda-archives-mode): New variable
819 (org-write-agenda, org-prepare-agenda, org-agenda-list)
820 (org-search-view, org-todo-list, org-tags-view)
821 (org-agenda-list-stuck-projects): Call `org-agenda-files' with
823 (org-agenda-quit): Reset the archives mode.
824 (org-agenda-archives-mode): New command.
825 (org-agenda-set-mode-name): Include archives info.
827 2008-06-18 Carsten Dominik <dominik@science.uva.nl>
829 * org.el (org-paste-subtree): Make sure the yanked headline is
830 visible if it was yanked at a visible point.
831 (org-move-item-up): Fix the bug with moving white space at the end
833 (org-show-empty-lines-in-parent): New function.
835 2008-06-16 Carsten Dominik <dominik@science.uva.nl>
837 * org-colview.el (org-columns-next-allowed-value): Bug fix.
839 * org-colview-xemacs.el (org-columns-next-allowed-value): Bug fix.
841 * org-agenda.el (org-agenda-get-closed): Get the end time into the
842 agenda prefix as well.
844 * org-publish.el (org-publish-org-index): Make a properly indented
847 * org.el (org-calendar-agenda-action-key): New option.
848 (org-get-cursor-date): New function.
849 (org-mark-entry-for-agenda-action): New command.
850 (org-overriding-default-time): New variable.
851 (org-read-date): Respect `org-overriding-default-time'.
853 * org-remember.el (org-remember-apply-template): Respect the
854 ovverriding default time.
856 * org-agenda.el (org-agenda-action-marker): New variable.
857 (org-agenda-action): New command.
858 (org-agenda-do-action): New function.
860 2008-06-15 Carsten Dominik <dominik@science.uva.nl>
862 * org.el (org-schedule, org-deadline): Protect scheduled and
863 deadline tasks against changes that accidently remove the
864 repeater. Also show a message with the new date when done.
866 2008-06-15 Carsten Dominik <dominik@science.uva.nl>
868 * org.el (org-beginning-of-line): Cater for the case when there
869 are tags but no headline text.
870 (org-align-tags-here): Convert to tabs only when indent-tabs-mode
873 2008-06-13 Carsten Dominik <dominik@science.uva.nl>
875 * org-mhe.el (org-mhe-get-message-folder-from-index): Make sure
876 the return value is nil instead of "nil" when there is no match.
878 * org-exp.el (org-insert-centered): Use fill-column instead of
880 (org-export-as-ascii): Use string-width to measure the width of
883 * org.el (org-diary-to-ical-string): No longer kill buffer
884 FROMBUF, this is now done by the caller.
886 * org-exp.el (org-print-icalendar-entries): Move the call to
887 `org-diary-to-ical-string' out of the loop, and kill the buffer
890 * org-remember.el (org-remember-visit-immediately): Position
891 cursor after moving to the note.
892 (org-remember-apply-template): Use a text property to record the
894 (org-remember-handler): Align tags after pasting the note.
896 2008-06-12 Carsten Dominik <dominik@science.uva.nl>
898 * org-bbdb.el (org-bbdb-follow-anniversary-link): New function.
900 * org-agenda.el (org-agenda-open-link): If there is an
901 org-bbdb-name property in the current line, jump to that bbdb
904 * org-bbdb.el (org-bbdb-anniversaries): Add the bbdb-name as a
905 text property, so that the agenda knows where this entry comes
908 * org-agenda.el (org-agenda-clock-in): Fixed bug in the
909 interaction between clocking-in from the agenda, and automatic
910 task state switching.
912 * org-macs.el (org-with-point-at): Bug fix in macro defintion.
914 * org.el (org-beginning-of-line, org-end-of-line): Make sure the
915 zmacs-region stays after this command in XEmacs.
917 2008-06-11 Carsten Dominik <dominik@science.uva.nl>
919 * org.el (org-scan-tags): Allow new values for ACTION parameter.
921 * org-remember.el (org-remember-templates): Fix bug in
922 customization type definition.
924 * org.el (org-map-entries): New function.
926 2008-06-11 verhuur82 <verhuur82@macbook-van-verhuur82.local>
928 * org-agenda.el (org-agenda-skip-comment-trees): New option.
929 (org-agenda-skip): Respect `org-agenda-skip-comment-trees'.
931 2008-06-10 Carsten Dominik <dominik@science.uva.nl>
933 * org-remember.el (org-jump-to-target-location): New variable.
934 (org-remember-apply-template): Set
935 `org-remember-apply-template' if requested by template.
936 (org-remember-handler): Start an idle timer to jump to
939 * org-exp.el (org-get-current-options): Add the FILETAGS setting.
941 * org.el (org-set-regexps-and-options): Fix bug with parsing of
943 (org-get-tags-at): Add the content of `org-file-tags'.
945 * org-exp.el (org-export-handle-comments): Fix bug with several
946 comment lines after each other.
947 (org-number-to-roman, org-number-to-counter): New functions.
948 (org-export-section-number-format): New option.
950 2008-06-09 Carsten Dominik <dominik@science.uva.nl>
952 * org-exp.el (org-export-protect-examples): Catch the case of a
953 missing end_example line.
955 * org.el (org-set-regexps-and-options): Set `org-file-properties' and
956 `org-file-tags' to nil.
958 * org-colview.el (org-columns-next-allowed-value): Handle next
959 argument NTH to directly select a value.
961 * org-colview-xemacs.el (org-columns-next-allowed-value): Handle next
962 argument NTH to directly select a value.
964 2008-06-08 Carsten Dominik <dominik@science.uva.nl>
966 * org-agenda.el (org-agenda-scheduled-leaders): Fix docstring.
968 2008-05-30 Carsten Dominik <dominik@science.uva.nl>
970 * org.el (org-columns-ellipses): New option.
972 2008-05-29 Carsten Dominik <dominik@science.uva.nl>
974 * org-colview.el (org-columns-add-ellipses): New function.
975 (org-columns-compact-links): New function.
976 (org-columns-cleanup-item): Call `org-columns-compact-links'.
977 (org-columns-display-here): Call `org-agenda-columns-cleanup-item'
979 (org-columns-edit-value): Fixed bug with editing values from
981 (org-columns-redo): Also redo the agenda itself.
983 2008-05-28 Carsten Dominik <dominik@science.uva.nl>
985 * org-agenda.el (org-agenda-columns-remove-prefix-from-item): New
988 * org-colview.el (org-agenda-columns-cleanup-item): New function.
990 * org-exp.el (org-export-ascii-preprocess): Renamed from
991 `org-export-ascii-clean-string'.
992 (org-export-kill-licensed-text)
993 (org-export-define-heading-targets)
994 (org-export-handle-invisible-targets)
995 (org-export-target-internal-links)
996 (org-export-remove-or-extract-drawers)
997 (org-export-remove-archived-trees)
998 (org-export-protect-quoted-subtrees)
999 (org-export-protect-verbatim, org-export-protect-examples)
1000 (org-export-select-backend-specific-text)
1001 (org-export-mark-blockquote-and-verse)
1002 (org-export-remove-comment-blocks-and-subtrees)
1003 (org-export-handle-comments, org-export-mark-radio-links)
1004 (org-export-remove-special-table-lines)
1005 (org-export-normalize-links)
1006 (org-export-concatenate-multiline-links)
1007 (org-export-concatenate-multiline-emphasis): New functions,
1008 obtained from spliiting the export preprocessor.
1010 * org-table.el (org-table-recalculate): Improve error message if
1011 the row number is invalid.
1013 2008-05-27 Carsten Dominik <dominik@science.uva.nl>
1015 * org-archive.el (org-archive-save-context-info): Fix bugs in
1016 customization setup and docstring.
1018 * org-exp.el (org-export-html-style): Changed the size of in the
1019 <pre> element to 90%.
1021 2008-05-26 Carsten Dominik <dominik@science.uva.nl>
1023 * org.el (org-find-src-example-start): Function removed.
1024 (org-edit-src-find-region-and-lang): New function.
1026 2008-05-25 Carsten Dominik <dominik@science.uva.nl>
1028 * org.el (org-edit-src-exit): New function.
1029 (org-exit-edit-mode): New minor mode.
1031 * org-exp.el (org-export-preprocess-string): Fix bug with removing
1032 comment-like lines from protected examples.
1034 * org.el (org-edit-src-example, org-find-src-example-start)
1035 (org-protect-source-example, org-edit-special): New functions.
1037 2008-05-24 Carsten Dominik <dominik@science.uva.nl>
1039 * org-publish.el (org-publish-project-alist): Fix typo in
1041 (org-publish-project-alist): Handle :index-title property.
1043 2008-05-21 Carsten Dominik <dominik@science.uva.nl>
1045 * org-export-latex.el (org-export-as-latex): Make sure region
1046 bounds are correct. Parse subtree properties relating to export.
1048 * org-exp.el (org-export-add-options-to-plist): New function.
1049 (org-infile-export-plist): Use `org-export-add-options-to-plist'.
1051 2008-05-20 Carsten Dominik <dominik@science.uva.nl>
1053 * org.el (org-default-properties): Add EXPORT_FILE_NAME and
1056 * org-exp.el (org-export-get-title-from-subtree)
1057 (org-export-as-ascii, org-export-as-html): Make sure the original
1058 region-beginning and region-end are used, even after moving
1060 (org-export-get-title-from-subtree): Also try the EXPORT_TITLE
1063 * org-remember.el (org-remember-last-stored-marker): New variable.
1064 (org-remember-goto-last-stored): Use `org-goto-marker-or-bmk'.
1065 (org-remember-handler): Also use marker to remember
1066 last-stored position.
1068 * org.el (org-goto-marker-or-bmk): New function.
1070 2008-05-19 Carsten Dominik <dominik@science.uva.nl>
1072 * org.el (org-file-properties): Renamed from `org-local-properties'.
1073 (org-scan-tags): Take file tags into account.
1074 (org-tags-match-list-sublevels): Default changed to t.
1076 * org-exp.el (org-export-as-html): Close paragraph after a
1079 * org.el (org-update-parent-todo-statistics): New function.
1081 * org-exp.el (org-icalendar-store-UID): New option.
1082 (org-icalendar-force-UID): Option removed.
1083 (org-print-icalendar-entries): IMplement UIDs.
1085 2008-05-18 Carsten Dominik <dominik@science.uva.nl>
1087 * org-mhe.el (org-mhe-follow-link): Fix bug in mhe searches.
1089 2008-05-16 Carsten Dominik <dominik@science.uva.nl>
1091 * org-faces.el (org-column): Document how this face is being used
1092 and why sometimes the background faces shine through.
1094 * org-mhe.el (org-mhe-follow-link): Improve handling of searches.
1096 * org-publish.el (org-publish-attachment): Create publishing
1097 directory if it does not yet exist.
1099 * org-table.el (org-calc-default-modes): Change default number
1100 format to (float 8).
1102 * org.el (org-olpath-completing-read): New function.
1103 (org-time-clocksum-format): New option.
1104 (org-minutes-to-hh:mm-string): Use `org-time-clocksum-format'.
1106 * org-clock.el (org-clock-display, org-clock-out)
1107 (org-update-mode-line): Use `org-time-clocksum-format'.
1109 * org-colview-xemacs.el (org-columns-number-to-string): Use
1110 `org-time-clocksum-format'.
1112 * org-colview.el (org-columns-number-to-string): Use
1113 `org-time-clocksum-format'.
1115 2008-05-15 Carsten Dominik <dominik@science.uva.nl>
1117 * org-id.el: New file, move from contrib to core.
1119 * org-exp.el (org-icalendar-force-UID): New option.
1121 2008-05-14 Carsten Dominik <dominik@science.uva.nl>
1123 * org-exp.el (org-print-icalendar-entries): Make sure DTEND is
1124 shifted by one day if theere is a date range without an end
1127 * org.el (org-try-structure-completion): New function.
1129 2008-05-13 Carsten Dominik <dominik@science.uva.nl>
1131 * org.el (org-set-font-lock-defaults): Improve fontification of
1133 (org-insert-item): Handle description lists.
1134 (org-adaptive-fill-function): Improve auto indentation in
1137 * org-exp.el (org-export-as-html, org-export-preprocess-string):
1138 Implement VERSE environment.
1139 (org-export-preprocess-string): Implement the COMMENT
1142 * org-export-latex.el (org-export-latex-preprocess): Implement
1145 2008-05-12 Carsten Dominik <dominik@science.uva.nl>
1147 * org-jsinfo.el (org-infojs-opts-table): Add entry for FIXED_TOC
1150 2008-05-10 Carsten Dominik <dominik@science.uva.nl>
1152 * org-table.el (orgtbl-to-tsv, orgtbl-to-csv): New functions.
1154 * org.el (org-quote-csv-field): New functions.
1156 * org-table.el (org-table-export-default-format): Remove :splice
1157 from default format, we get the same effect by not specifying
1159 (org-table-export): Improve setup, distinguish better between
1160 interactive and non-interactive use, allow specifying the format
1161 on the fly, better protection against wrong file names.
1162 (orgtbl-to-generic): Fix documentation. Do not require :tstart
1163 and :tend when :splice is omitted.
1165 2008-05-09 Bernt Hansen <bernt@norang.ca>
1167 * org-clock.el (org-clock-select-task): Make sure the selection
1168 letters are 1-9 and A-Z, no special characters.
1170 2008-05-09 Carsten Dominik <dominik@science.uva.nl>
1172 * org-exp.el (org-export-htmlize): New group.
1173 (org-export-htmlize-output-type)
1174 (org-export-htmlize-css-font-prefix): New options.
1175 (org-export-htmlize-region-for-paste): New function.
1176 (org-export-htmlize-generate-css): New command.
1178 2008-05-08 Juanma Barranquero <lekktu@gmail.com>
1180 * org/org.el (org-modules, org-format-latex-options):
1181 * org/org-archive.el (org-archive-stamp-time)
1182 (org-archive-save-context-info):
1183 * org/org-faces.el (org-hide):
1184 * org/org-irc.el (org-irc-parse-link):
1185 * org/org-macs.el (org-call-with-arg, org-autoload):
1186 * org/org-mew.el (org-mew-store-link):
1187 * org/org-remember.el (org-remember-store-without-prompt)
1188 (org-remember-templates): Fix typos in docstrings.
1190 * org/org-info.el (org-info-store-link): Remove leftover docstring.
1192 * org/org-bbdb.el (org-bbdb-export): Remove leftover docstring.
1193 (org-bbdb-anniversary-field, org-bbdb-extract-date-fun)
1194 (org-bbdb-anniv-split): Fix typos in docstrings.
1196 * org/org-publish.el (org-publish-project-alist): Doc fixes.
1197 (org-publish-use-timestamps-flag): Reflow docstring.
1198 (org-publish-files-alist): Fix typos in docstring.
1200 2008-05-08 Carsten Dominik <dominik@science.uva.nl>
1202 * org.el (org-set-visibility-according-to-property): New function.
1203 (org-ctrl-c-ctrl-c): Do not restart org-mode, just get the options
1204 and compute the regular expressions, and update font-lock.
1205 (org-property-re): Allow a dash in property names.
1207 * org-archive.el (org-extract-archive-file): Insert the file name
1208 without the path into the format, to allow the location format to
1209 contain a subdirectory.
1211 * org-agenda.el (org-agenda-post-command-hook): If point is at end
1212 of buffer, and the `org-agenda-type' property undefined, use the
1213 value from the character before.
1215 * org.el (org-add-planning-info): Don't let indentation for
1216 would-be timestamp become extra whitespace at the end of headline.
1218 2008-05-07 Carsten Dominik <dominik@science.uva.nl>
1220 * org.el (org-remove-double-quotes, org-file-contents): New
1223 * org-exp.el (org-infile-export-plist): Also parse the
1224 contents of #+SETUPFILE files, recursively.
1226 * org.el (org-set-regexps-and-options): Also parse the
1227 contents of #+SETUPFILE files, recursively.
1229 * org-exp.el (org-export-handle-include-files): New function.
1230 (org-export-preprocess-string): Call
1231 `org-export-handle-include-files'.
1233 * org.el (org-delete-property-globally)
1234 (org-delete-property, org-set-property): Ignore case during
1236 (org-set-property): Use `org-completing-read' instead of
1239 * org.el (org-complete-expand-structure-template): New,
1240 experimental function.
1241 (org-structure-template-alist): New, experimental option.
1242 (org-complete): Call `org-complete-expand-structure-template'.
1244 2008-05-06 Bastien Guerry <bzg@altern.org>
1246 * org-export-latex.el (org-export-latex-preprocess): Added
1247 support for blockquotes.
1249 2008-05-05 Carsten Dominik <dominik@science.uva.nl>
1251 * org.el (org-read-date-analyze): Catch the case where only a
1254 2008-05-04 Carsten Dominik <dominik@science.uva.nl>
1256 * org.el (org-set-font-lock-defaults): Make the description
1259 * org-exp.el (org-export-as-html, org-close-li): Implement
1262 2008-05-04 Jason Riedy <jason@acm.org>
1264 * org-table.el (*orgtbl-default-fmt*): New variable.
1265 (orgtbl-format-line): Use the value of *orgtbl-default-fmt*
1266 when there is no other fmt available.
1268 (orgtbl-to-generic): Allow an explicitly nil :tstart or
1269 :tend to suppress the appropriate string.
1271 (orgtbl-to-orgtbl): New function for translating to another orgtbl
1274 2008-05-02 Carsten Dominik <dominik@science.uva.nl>
1276 * org.el (org-read-date-analyze): "." as an alias for "+0" in
1279 * org-clock.el (org-clock-save-markers-for-cut-and-paste):
1282 * org-agenda.el (org-agenda-save-markers-for-cut-and-paste):
1285 2008-05-01 Carsten Dominik <dominik@science.uva.nl>
1287 * org-clock.el (org-clock-find-position): Don't include notes
1290 * org-archive.el (org-archive-subtree): No longer remove an
1291 extra line after cutting the subtree. `org-cut-subtree' already
1294 * org-remember.el (org-remember-handler): Only kill the target
1295 buffer if it does not contain the running clock.
1297 * org.el (org-markers-to-move): New variable.
1298 (org-save-markers-in-region, org-check-and-save-marker)
1299 (org-reinstall-markers-in-region): New function.
1300 (org-move-subtree-down, org-copy-subtree): Remember relative
1301 marker positions before cutting.
1302 (org-move-subtree-down, org-paste-subtree): Restore relative
1303 marker positions after pasting.
1305 * org-remember.el (org-remember-clock-out-on-exit): New option.
1306 (org-remember-finalize): Clock out only if the setting in
1307 `org-remember-clock-out-on-exit' requires it.
1308 (org-remember-handler): Do the cleanup in the buffer, to make sure
1309 that the clock marker remains in tact.
1311 2008-04-29 Carsten Dominik <dominik@science.uva.nl>
1313 * org-clock.el (org-clock-goto): Widen buffer if necessary.
1314 (org-clock-in): Make sure that also tasks outside the narrowed
1315 region will be clocked in correctly.
1316 (org-clock-insert-selection-line): Widen the buffer so that we can
1317 find the correct task heading.
1319 * org.el (org-base-buffer): New function.
1321 * org-exp.el (org-icalendar-cleanup-string): Make sure ',"
1322 and ";" are escaped.
1323 (org-print-icalendar-entries): Also apply
1324 `org-icalendar-cleanup-string' to the headline, not only to the
1327 2008-04-28 Carsten Dominik <dominik@science.uva.nl>
1329 * org-exp.el (org-export-preprocess-hook): New hook.
1330 (org-export-preprocess-string): Call
1331 `org-export-preprocess-hook'.
1333 * org.el (org-font-lock-hook): New variable.
1334 (org-font-lock-hook): New function.
1335 (org-set-font-lock-defaults): Call `org-font-lock-hook'.
1339 ;; add-log-time-zone-rule: t
1342 Copyright (C) 2008 Free Software Foundation, Inc.
1344 This file is part of GNU Emacs.
1346 GNU Emacs is free software: you can redistribute it and/or modify
1347 it under the terms of the GNU General Public License as published by
1348 the Free Software Foundation, either version 3 of the License, or
1349 (at your option) any later version.
1351 GNU Emacs is distributed in the hope that it will be useful,
1352 but WITHOUT ANY WARRANTY; without even the implied warranty of
1353 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1354 GNU General Public License for more details.
1356 You should have received a copy of the GNU General Public License
1357 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
1359 ;; arch-tag: a9bdcf06-7c2d-4b5a-bf7a-c5e7b706f67c