0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 17:10:43 +00:00
Commit graph

11787 commits

Author SHA1 Message Date
Achim Gratz 9ab8cb1196 Merge branch 'maint' 2012-09-29 10:49:20 +02:00
Achim Gratz e6228c448e Makefile: implement target config-version
* mk/targets.mk: Implement target `config-version´ to show the version
  of Org from both make's and Emacs' perspective.  Run that target at
  the end of all `config-*´ targets.

* mk/default.mk: Add SHOWVER with the appropriate invocation of emacs
  to output the Org version.

* Makefile: Document new target `config-version´ in `helpall´.
2012-09-29 10:47:40 +02:00
Nicolas Goaziou 6e61cfc80f Merge branch 'maint' 2012-09-29 10:16:33 +02:00
Nicolas Goaziou d88344d291 org-element: Properly remove COMMENT and QUOTE keywords from title in parser
* lisp/org-element.el: Properly remove COMMENT and QUOTE keywords from
  title in parser.
* testing/lisp/test-org-element.el: Add tests.
2012-09-29 10:15:59 +02:00
Achim Gratz 1702710d57 Merge branch 'maint' 2012-09-29 10:07:13 +02:00
Achim Gratz f020f21a38 Partially revert "test-ob.el: Fix test. Delete trailing whitespaces"
This reverts the last part of commit 22c3080830.

* testing/lisp/test-ob.el (test-ob/results-do-not-replace-code-blocks):
  These two whitespace errors are intentional.  Do not remove them.
2012-09-29 10:02:36 +02:00
Bastien Guerry 97ac24417a Merge branch 'master' of orgmode.org:org-mode 2012-09-29 09:39:27 +02:00
Bastien Guerry 33ab30ca2a Merge branch 'maint' 2012-09-29 09:39:22 +02:00
Bastien Guerry 2a04d90d20 Merge branch 'maint' of orgmode.org:org-mode into maint 2012-09-29 09:38:34 +02:00
Bastien Guerry 22c3080830 test-ob.el: Fix test. Delete trailing whitespaces
* test-ob.el (test-ob/org-babel-remove-result--results-org):
Fix test.  Delete trailing whitespaces.
2012-09-29 09:38:19 +02:00
Nicolas Goaziou dadc875d9f Merge branch 'maint' 2012-09-29 08:57:08 +02:00
Nicolas Goaziou 9c92312d92 org-element: Fix parsing for headlines with only a COMMENT or QUOTE keyword
* lisp/org-element.el (org-element-headline-parser): Fix parsing for
  headlines with a single COMMENT or QUOTE keyword.
* testing/lisp/test-org-element.el: Add tests.
2012-09-29 08:54:46 +02:00
Bastien Guerry f155f5458e Merge branch 'maint' 2012-09-29 08:28:34 +02:00
Eric Schulte 7a06ed790a marginally less hacky comma escaping of org blocks
* ob.el (org-babel-insert-result): Replace key sequence with
  function call.  Use a more informative flag to the local function.
  (org-add-protective-commas): Declare a new external function.
* org-src.el (org-add-protective-commas): This should be its own
  function.
  (org-edit-src-exit): Use the new function.
2012-09-29 08:12:26 +02:00
Max Mikhanosha 0be5a4e0ff org-agenda.el: Speedup redisplay of an agenda item after it has been modified
* org-agenda.el (org-agenda-change-all-lines): Speedup
refresh of a single line of agenda by narrowing the agenda
buffer to just that line before calling `org-agenda-finalize'.
2012-09-29 08:09:58 +02:00
Bastien Guerry d43f7eb475 org-agenda.el: Make sure to get a property from (1- (point-max)), not (point-max))
* org-agenda.el (org-agenda-manipulate-query)
(org-agenda-goto-date, org-agenda-goto-today)
(org-agenda-find-same-or-today-or-agenda, )
(org-agenda-later, org-agenda-change-time-span)
(org-agenda-change-all-lines)
(org-agenda-execute-calendar-command)
(org-agenda-goto-calendar, org-agenda-convert-date): Make sure
to get a property from (1- (point-max)), not (point-max)).

Thanks to Juan Pechiar for reporting a related problem.
2012-09-29 08:09:21 +02:00
Bastien Guerry 8e15063364 Small fixes to the guide and the manual
* org.texi (Installation, Feedback, Batch execution):
Use (add-to-list 'load-path ... t) for the contrib dir.

* orgguide.texi (Activation): No need to add org-mode to
auto-mode-alist since Emacs 22.2.
2012-09-29 07:27:51 +02:00
Bastien Guerry da606d8aaa org-src.el: Fix commit e279e9 2012-09-29 07:21:12 +02:00
Bastien Guerry 74c027a741 Merge branch 'master' of orgmode.org:org-mode 2012-09-29 07:10:33 +02:00
Bastien Guerry 40fdea9b0d Merge branch 'maint' 2012-09-28 19:06:35 +02:00
Bastien Guerry 4224cb3336 ob-dot.el (org-babel-execute:dot): Throw an error when there is no :file parameter
* ob-dot.el (org-babel-execute:dot): Throw an error when there
is no :file parameter.
2012-09-28 19:06:17 +02:00
Nicolas Goaziou e5488204f3 org-e-publish: Mirror changes made to org-publish.el
* contrib/lisp/org-e-publish.el (org-e-publish-cache-ctime-of-src):
  Change signature.
(org-e-publish-update-timestamp,
org-e-publish-cache-file-needs-publishing): Apply signature change.

See commit f71db4e509.
2012-09-28 19:00:00 +02:00
Bastien Guerry 7360000871 Merge branch 'maint' 2012-09-28 18:31:41 +02:00
Bastien Guerry b1f498487a org-table.el: Convert time-stamps to inactive time-stamp so that Calc can handle them correctly
* org-table.el (org-table-eval-formula): Convert time-stamps
to inactive time-stamp so that Calc can handle them correctly.

Thanks to Daniel E. Doherty for reporting this.
2012-09-28 18:22:38 +02:00
Bastien Guerry cf5281297b Merge branch 'maint' 2012-09-28 18:05:46 +02:00
Max Mikhanosha ecdc4d14c8 org.el: Don't set org-hide foreground to "invisible-bg"
* org.el (org-mode): Don't set org-hide's foreground
to "invisible-bg".
(org-find-invisible-foreground): New function.
2012-09-28 18:05:35 +02:00
Bastien Guerry 55436135e7 Merge branch 'maint' 2012-09-28 17:59:33 +02:00
Bastien Guerry 6e7b6cae4f org-table.el: Warn with a message when formulas have been updated
* org-table.el (org-table-fix-formulas): Warn with a message
when formulas have been updated.
2012-09-28 17:59:22 +02:00
Bastien Guerry fe7f964b49 Merge branch 'maint' 2012-09-28 17:47:53 +02:00
Bastien Guerry 222eae4033 Fix error messages: don't use a dot at the end 2012-09-28 17:47:48 +02:00
Bastien Guerry 75820c49de Merge branch 'maint' 2012-09-28 17:21:50 +02:00
Nicolas Goaziou ac25422286 ob-org: By default, export code from Org src blocks
* lisp/ob-org.el (org-babel-default-header-args:org): By default,
  export code from Org src blocks.
2012-09-28 17:21:37 +02:00
Bastien Guerry cbe4cfc99a Merge branch 'maint' 2012-09-28 17:08:46 +02:00
Bastien Guerry 79d3c289da org-e-html.el (org-e-html-final-function): Turn on html-mode', not nxml-mode'
* org-e-html.el (org-e-html-final-function): Turn on
`html-mode', not `nxml-mode'.
2012-09-28 17:08:37 +02:00
Bastien Guerry f71db4e509 org-publish.el (org-publish-cache-ctime-of-src): Fix reference to relative symlinks
* org-publish.el (org-publish-cache-ctime-of-src): Delete
the base-dir argument and use (file-name-directory file) to
get the file's directory.
(org-publish-update-timestamp)
(org-publish-cache-file-needs-publishing): Call
`org-publish-cache-ctime-of-src' with only one argument.

Thanks to T.F. Torrey who suggested a fix for this.
2012-09-28 17:07:22 +02:00
Bastien Guerry 16441f6f40 Merge branch 'maint' 2012-09-28 16:51:34 +02:00
Bastien Guerry 807137acdd org.el (org-follow-timestamp-link): Fix bug when using sticky agenda
* org.el (org-follow-timestamp-link): Fix bug when using
sticky agenda.  Add a docstring.

Thanks to Christoph Lange for reporting this.
2012-09-28 16:51:21 +02:00
Bastien Guerry b56acb69ff org-fixup.el (org-make-local-mk): Fix typo in comment
* org-fixup.el (org-make-local-mk): Fix typo in comment.
2012-09-28 16:40:00 +02:00
Bastien Guerry 132414b11c Merge branch 'maint' 2012-09-28 16:37:34 +02:00
Bastien Guerry 3a11d64d23 org-agenda.el (org-agenda-sticky): Don't use a function to set. Add a :version string.
* org-agenda.el (org-agenda-sticky): Don't use a function to
set.  Add a :version string.
2012-09-28 16:37:23 +02:00
Memnon Anon 213e2934c1 Add a link to documentation
* doc/org.texi (Tracking your habits): Point to the
  "Tracking TODO state changes" section.

As suggested by Jonas Stein.

TINYCHANGE
2012-09-28 15:51:56 +02:00
Bastien Guerry 2bd95b6bfc Merge branch 'maint' 2012-09-28 10:05:20 +02:00
Bastien Guerry c173b19b05 mk/server.mk: Use /elpa/ instead of /pkg/daily/ 2012-09-28 10:05:10 +02:00
Bastien Guerry acca5ddbae Merge branch 'maint' 2012-09-28 08:29:47 +02:00
Bastien Guerry e8b45bb947 Rebind org-agenda-priority' to C-c ," in agenda mode (`C-u C-c ,' now shows priority)
* org.el (org-priority): Use a new argument to show priority
instead of setting it.
(org-show-priority): New function to show priority both in
normal Org buffers and in Org Agenda buffers.
(org-speed-commands-default): Use "," as a speed command for
setting priority.

* org-agenda.el (org-agenda-mode-map): Bind
`org-agenda-priority' to `C-c ,' as it was before.
(org-agenda-show-priority): Delete.
(org-agenda-priority): Use a new argument to show priority
instead of setting it.

Thanks to Robert Horn for triggering this change.
2012-09-28 08:29:38 +02:00
Bastien Guerry d35c95a358 org.el (org-format-outline-path): Fix bug: add the separator string after the prefix
* org.el (org-format-outline-path): Fix bug: add the separator
string after the prefix.
2012-09-28 08:07:42 +02:00
Bastien Guerry 5ba6bd859a Merge branch 'maint' 2012-09-28 00:13:15 +02:00
Bastien Guerry b04e66a6f8 Merge branch 'master' of orgmode.org:org-mode 2012-09-28 00:13:04 +02:00
Bastien Guerry 001d2d92ba Rename some functions and move some hooks.
* org.el (org-font-lock-hook, org-set-font-lock-defaults): Add
a docstring.
(org-display-inline-remove-overlay): Rename from
`org-display-inline-modification-hook'.
(org-speed-command-activate): Rename from
`org-speed-command-default-hook'.
(org-babel-speed-command-hook): Rename from
`org-babel-speed-command-activate'.

* org-agenda.el (org-agenda-update-agenda-type): Rename from
`org-agenda-post-command-hook'.
(org-agenda-mode): Use the new name.
(org-agenda-post-command-hook): Define as obsolete function.

* org-lparse.el (org-lparse): Temporarily activate the hooks
needed for the ODT conversion.
(org-lparse-preprocess-after-blockquote): Rename from
`org-lparse-preprocess-after-blockquote-hook'.
(org-lparse-strip-experimental-blocks-maybe): Rename from
`org-lparse-strip-experimental-blocks-maybe'.
(org-lparse-preprocess-after-blockquote-hook)
(org-lparse-strip-experimental-blocks-maybe-hook): Define as
obsolete functions.
2012-09-28 00:12:53 +02:00
Bastien Guerry 92c8cd487d Merge branch 'maint' of orgmode.org:org-mode into maint 2012-09-27 23:50:02 +02:00