Commit Graph

6537 Commits

Author SHA1 Message Date
Dave Abrahams a84fa6eccd org.el: Make links more readable when selecting them for insertion.
* org.el (org-link-prettify): New function to prettify links
while displaying them with `org-insert-link'.
(org-insert-link): Use the new function.

TINYCHANGE
2012-04-21 00:43:02 +02:00
Feng Shu a9d3ce0bcd Allow to use imagemagick for previewing LaTeX fragements.
* org.el (org-latex-create-formula-image-program): New option
to use either dvipng or imagemagick to convert and preview
LaTeX fragments.
(org-preview-latex-fragment, org-format-latex): Handle the new
option.
(org-create-formula-image-with-dvipng): Rename from
`org-create-formula-image'.
(org-create-formula-image-with-imagemagick): New defun to
handle LaTeX preview with imagemagick.
(org-latex-color, org-latex-color-format): New defuns to
handle color conversions.

* org-latex.el (org-latex-to-pdf-process, org-export-as-pdf):
Allow to use imagemagick to convert LaTeX fragments.

* org-html.el (org-export-html-preprocess): Ditto.

* org-exp.el (org-export-with-LaTeX-fragments): Ditto.

* org.texi (@LaTeX{} fragments): Document imagemagick as an
alternative to dvipng.
2012-04-21 00:42:59 +02:00
Bastien Guerry ec921a2a68 Support hourly repeat cookies.
* org.el (org-repeat-re)
(org-clone-subtree-with-time-shift, org-auto-repeat-maybe)
(org-deadline, org-schedule, org-matcher-time)
(org-time-stamp, org-read-date, org-read-date-get-relative)
(org-display-custom-time, org-get-wdays)
(org-time-string-to-absolute, org-closest-date)
(org-timestamp-change): Allow to set hourly repeat cookie.
Send an error when an hourly repeat cookie is set and no hour
is specified in the timestamp.

* org.texi (Repeated tasks): Document repeat cookies for
years, months, weeks, days and hours.

* org-agenda.el (org-agenda-get-timestamps): Match hourly
repeat cookies.

* org-icalendar.el (org-print-icalendar-entries): Handle
hourly repeat cookies.

Thanks a lot to Takafumi Arakaki for this idea and for a preliminary
version of this patch.
2012-04-21 00:42:56 +02:00
Achim Gratz e102e411e4 doc/Makefile: rename/add auto-generated files to be compatible with Emacs
* doc/Makefile: rename auto-generated file "git-describe.texi" to
  "org-version.inc" to allow for easier inclusion into Emacs.

* doc/org.texi: include "org-version.inc" instead of
  "git-describe.texi".

* lisp/Makefile: new auto-generated file org-version.el with autoload
  cookies.  The version strings will be pulled during autoload
  extraction into org-install.el (standalone org-mode) or
  ../loaddefs.el (Emacs).
2012-04-20 21:04:14 +02:00
Achim Gratz 1751d2d7f9 need to require find-func instead of just declare-function
* lisp/org.el: require find-func and remove declare-function for
       find-library-name, otherwise autoloaded org-version doesn't
       show all info correctly.
2012-04-20 21:04:14 +02:00
Achim Gratz d5914ad47f make sure org-install.el does not get compiled
lisp/Makefile: add local variable section to org-install.el so
     that it is never compiled
2012-04-20 21:04:13 +02:00
Achim Gratz 24fa46a9e5 more robust shell code for install/clean-install
{etc,lisp}/Makefile: use shell instead of make for looping, make
	code more robust
2012-04-20 21:04:11 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 1e343f7f3b update target descriptions, target "all" now automatically cleans .elc before compilation
* targets.mk: target "all" for lisp directory does now the same as
	"compile", i.e. it cleans .elc file first
	* Makefile: describe all targets and re-arrange the target groups
2012-04-20 21:04:10 +02:00
Achim Gratz 510a51310b use batch-byte-recompile-directory instead of batch-byte-compile
* lisp/Makefile: use batch-byte-recompile-directory instead of
	batch-byte-compile; remove pattern rule for compiling single file
	from source
	* lisp/Makefile: add compile-dirty to list of phony targets
2012-04-20 21:04:10 +02:00
Achim Gratz cb8600b1ba show installation path or org-install.el to avoid mishaps with multiple installations
* lisp/org.el (org-version): show the full path to org-install.el
	in the version string to avoid confusion if multiple installations
	exist or a previously loaded org-install.el has already defined a
	version string that is now out of date.
2012-04-20 21:04:10 +02:00
Achim Gratz 6da2d089b0 move all version strings into org-install.el
* targets.mk: check for release and git version and record this
	into environment variables for use in sub-make invocations; add
	new target "compile-dirty" that does not invoke "make clean" first
	* doc/Makefile, lisp/Makefile: remove git version check, since
	they are now provided by first-level make
	* lisp/Makefile: add insertion of version information into
	org-install.el, have org-install.el depend on LISPF rather than
	LISPC so that autoloads can be produced without compiling
	everything and remove insertion into org.el and re-compilation
	during install; add new target "compile-dirty" to support
	invocation from first-level make
	* lisp/org.el (org-version): remove determination of version
	information, show "N/A" if the information is not provided via
	org-install.el
2012-04-20 21:04:10 +02:00
Achim Gratz c74d93b8c6 remove dependencies.mk since it is not needed any more
* lisp/dependencies.mk: remove file
	* lisp/Makefile: remove dependency on dependencies.mk

Rationale: since we will always start with a "make clean", the
dependencies file has become obsolete.  The dependencies had not
been updated for a long time anyway and there seems to be no way
to produce them automatically.
2012-04-20 21:04:09 +02:00
Achim Gratz 8bbf77a748 finish cleanup on infodir, some refinements on rules
* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement
2012-04-20 21:04:08 +02:00
Achim Gratz 501f9b1741 use sed instead of perl, add target clean-install
* Makefile, lisp/Makefile, doc/Makefile: add target clean-install
	to remove files in install-directories

	* default.mk: add customization variable $(SED)

	* doc/Makefile: do not remove dir while cleaning

	* lisp/Makefile: use sed instead of perl to weave git-status into
	org.el and ignore any errors while doing it.  Keep git status in
	$(GITSTATUS) to make it more clear what happens in the check.
2012-04-20 21:04:08 +02:00
Achim Gratz f29ef857ae inject git-describe version into org.el during install
* lisp/org.el (org-git-version): placeholder for recording the Git
	version of org during install
	* lisp/org.el (org-version): initialize local git-version with
	placeholder and fall through using it when org is not installed in
	a Git repository
2012-04-20 21:04:08 +02:00
Achim Gratz a5cb04dcd8 hand off ./doc to sub-make
* Makefile: use info function for output and call shell only once
* default.mk: add PDFTEX and RMR variables for customization
* lisp/Makefile: add target 'all' and create $(lispdir) if necessary
* maint-targets.mk: invoke sub-make for HTML manuals
* maint.mk: remove unsused VARIABLES
* targets.mk: invoke sub-make for ./doc and clean up some targets
2012-04-20 21:04:07 +02:00
Achim Gratz ac3162b4f0 activate local.mk and hand off ./lisp to a sub-make
* Makefile: add an optional include local.mk
* default.mk: install lisp files into org subfolder by default
* lisp/Makefile: new file to handle all make targets within lisp
* lisp/dependencies.mk: dependencies, should rather be auto-generated
* maint.mk: remove obsolete variable definitions
* targets.mk: hand off to sub-make in ./lisp, remove unused targets
2012-04-20 21:04:07 +02:00
Jambunathan K 3f427d92c8 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-20 23:15:06 +05:30
Jambunathan K 7d4e7a8763 org-odt.el: Fix handling of internal links
* lisp/org-odt.el (org-odt-format-org-link): Pay no heed to
whether the internal links destined for headlines provide a
description or not.  In fact, the `org-store-link' and
`org-insert-link' create internal links which do have a
description.

This fixes an issue where internal links terminating at an
invisible target (that is bound to a headline) was badly
rendered.  Refer following thread:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-04/msg00757.html
2012-04-20 22:46:09 +05:30
Bastien Guerry 6f78edd68c Revert "Time specifications: Allow specifying relative times"
This reverts commit 001bcb9645.
2012-04-20 14:23:06 +02:00
Bastien Guerry 41939cb04b org-clock.el (org-program-exists): Fix docstring.
* org-clock.el (org-program-exists): Fix docstring.

Thanks to Sébastien Vauban for reporting this.
2012-04-20 13:20:42 +02:00
Bastien Guerry d89823a75b org-clock.el: New option `org-clock-file-time-cell-format'.
* org-clock.el (org-clock-file-time-cell-format): New option.
(org-clocktable-write-default): Use it.
2012-04-20 13:06:46 +02:00
Adam Spiers 1685087f5f org.el: Display a message when no clock is active.
* org-clock.el (org-clock-modify-effort-estimate): Display a
message when no clock is currently active.

TINYCHANGE
2012-04-20 12:41:11 +02:00
Bastien Guerry 9f5699e1aa org.el: New face `org-date-selected' for the selected calendar day.
* org-faces.el (org-date-selected): New face.

* org.el (org-date-ovl): Use `org-date-selected'.

This fixes a problem with bold faces enlarging the calendar window
unduely.  See http://patchwork.newartisans.com/patch/1286/
2012-04-20 12:38:07 +02:00
Ilya Shlyakhter 001bcb9645 Time specifications: Allow specifying relative times
* org.el (org-parse-time-string): Allow strings supported by tags/properties
matcher (eg <now>, <yesterday>, <-7d>) if the time starts with < and ends
with >.  This means that e.g. in the clocktable parameters you can specify
:tstart "<-1w>" :tend "<now>".

TINYCHANGE
2012-04-20 12:20:27 +02:00
Toby S. Cubitt f426dadef0 Agenda: Add new todo-unblocked and nottodo-unblocked skip conditions
* lisp/org-agenda.el (org-agenda-skip-if, org-agenda-skip-if-todo):
Add new todo-unblocked and nottodo-unblocked skip conditions.  These
match as for todo and nottodo, but only for unblocked todo items.

TINYCHANGE

This patch adds two new tests to `org-agenda-skip-if': 'todo-unblocked
and 'nottodo-unblocked.  These match like 'todo and 'nottodo, but only on
unblocked todo items.  This type of test is useful when compiling custom
agenda views containing lists of currently actionable todo items.

Whilst it's possible to code such tests in `org-agenda-custom-commands'
directly (well, Elisp is Turing-complete: you can in principle code
anything!), it's far less convenient than a simple `org-agenda-skip-if'
test which can reuse much of the existing machinery.

Note that the attached patch applies on top of my other "Fix
org-agenda-skip-if bug" patch, though this new feature is independent of
that bug-fix.
2012-04-20 12:12:42 +02:00
George Kettleborough 37fafb7b9e Option for clock and timer to be displayed in frame-title
* org-clock.el: New option `org-clock-clocked-in-display' to control
whether the current clock is displayed in the mode line and/or frame
title.

* org-timer.el: New option `org-timer-display' to control whether
the current timer is displayed in the mode line and/or frame title.

This allows the clock and timer to be displayed in the frame title instead of,
or as well as, the mode line.  This is useful for people with limited space in
the mode line but with ample space in the frame title.
2012-04-20 11:56:34 +02:00
Sebastien Vauban 0c43ba2e8d org.el: Add autoload cookie for `org-update-all-dblocks'.
* org.el (org-update-all-dblocks): Autoload function.

TINYCHANGE
2012-04-20 11:46:41 +02:00
Jérémie Courrèges-Anglas 6010e18ce4 org-latex.el: Append final newline to export buffer.
* lisp/org-latex.el: Ensure a final newline is appended to the export buffer.

TINYCHANGE
2012-04-20 11:46:36 +02:00
Harri Kiiskinen d87ec54d4b org-protocol.el: New option `org-protocol-data-separator'.
* org-protocol.el: New option.
(org-protocol-store-link, org-protocol-do-capture): Use it.

TINYCHANGE
2012-04-20 11:46:28 +02:00
Christoph Dittmann f2e40fe153 Make [fragile] work with overlay specifications.
* org-beamer.el (org-beamer-auto-fragile-frames): Make
[fragile] work with overlay specifications.

If the BEAMER_envargs property contains optional parameters together
with an overlay specification like [option]<1-2>, the exporter turns
the start of the frame into \begin{frame}<1-2>[option].  If then
[fragile] needs to be added, this becomes
\begin{frame}[fragile]<1-2>[option] and causes a LaTeX error.

With this patch [fragile] is added in a way such that the line becomes
\begin{frame}<1-2>[fragile,option].

TINYCHANGE
2012-04-20 11:46:22 +02:00
Bastien Guerry d1f1c586d5 Fix merge conflict. 2012-04-20 11:43:27 +02:00
Bastien Guerry 7d7144819f org.el (org-mode): Don't use `buffer-face-mode' by default.
* org.el (org-mode): Don't use `buffer-face-mode' by default.

Still set `org-default' as the face for `buffer-face-mode-face' in
case the user turn `buffer-face-mode' on.
2012-04-20 11:41:24 +02:00
Zachary Kanfer 963f5968d3 org.el (org-read-date-display): Fix bug when displaying the overlay.
* org.el (org-read-date-display): Fix bug when displaying the
overlay.

TINYCHANGE
2012-04-20 11:38:27 +02:00
Madan Ramakrishnan ec56dc8ead org-agenda.el: Fix `org-agenda-bulk-toggle'.
* org-agenda.el (org-agenda-bulk-mark): Truly make arg optional as
advertised by the function.

Problem here was that `org-agenda-bulk-toggle' calls
`org-agenda-bulk-mark' with no parameters; however, the (max arg 1)
call inside `org-agenda-bulk-mark' will fail with no parameter.

TINYCHANGE
2012-04-20 11:35:21 +02:00
Nicolas Goaziou d17761a05a Merge branch 'hotfix' 2012-04-20 11:16:33 +02:00
Nicolas Goaziou 8b18c50d4c org-footnote: Fix positionning in HTML export without a footnote section
* lisp/org-footnote.el (org-footnote-normalize): Fix positionning in
  HTML export without a footnote section.
2012-04-20 11:12:44 +02:00
Nicolas Goaziou dbc6fd1ebf Merge branch 'hotfix' 2012-04-18 13:02:09 +02:00
Nicolas Goaziou 7d6309f132 org-list: Fix bugs relative to item indentation
* lisp/org-list.el (org-list-struct-indent): Follow
  `org-list-demote-modify-bullet' specifications for ordered bullets.
(org-list-indent-item-generic, org-indent-item-tree,
org-outdent-item-tree): Fix bug when operating on a region.
(org-outdent-item, org-indent-item): Allow to operate on a region.
* lisp/org.el (org-shiftmetaleft, org-shiftmetaright): Allow to
  operate on a region.
* testing/lisp/test-org-list.el: Add tests.
2012-04-18 13:01:44 +02:00
Bastien Guerry ee6347cc7f org-agenda.el: Bind `^' to `org-agenda-filter-by-top-category'.
* org-agenda.el (org-agenda-mode-map): Bind `^' to
`org-agenda-filter-by-top-category'.
2012-04-17 11:28:44 +02:00
Bastien Guerry 5659dbeebe Delete trailing spaces. 2012-04-17 11:25:22 +02:00
Bastien Guerry a6349c2f50 Fix compiler warnings. 2012-04-17 11:17:17 +02:00
Max Mikhanosha ec7bd3b1be Fix org-agenda-to-appt, which got broken by sticky agenda
* lisp/org-agenda.el (org-agenda-new-marker): Check for NIL org-agenda-buffer
(org-agenda-to-appt): Bind org-agenda-buffer to NIL
2012-04-16 18:55:41 -04:00
Max Mikhanosha 973efcd9c9 Merge branch 'max-sticky-agenda' 2012-04-16 05:25:06 -04:00
John Wiegley 3bd1c2e9bf Added new `org-agenda-filter-by-top-category' command 2012-04-16 03:13:22 -05:00
Eric Schulte bc473299f1 safer equality test in org-babel-header-arg-expand
* lisp/ob.el (org-babel-header-arg-expand): In new
  buffers (char-before) may return nil so use equal rather than =.
2012-04-14 09:32:57 -04:00
Max Mikhanosha 7212801808 Merged origin/master into max-sticky-agenda 2012-04-13 18:15:18 -04:00
Eric Schulte 5e4cffbb06 code-block languages may specify their own headers and values
* lisp/ob-R.el (org-babel-header-args:R): Adding values.
* lisp/ob-clojure.el (org-babel-header-args:clojure): Adding values.
* lisp/ob-lisp.el (org-babel-header-args:lisp): Adding values.
* lisp/ob-sql.el (org-babel-header-args:sql): Adding values.
* lisp/ob-sqlite.el (org-babel-header-args:sqlite): Adding values.
* lisp/ob.el (org-babel-combine-header-arg-lists): Combine lists of
  arguments and values.
  (org-babel-insert-header-arg): Use new combined header argument
  lists.
  (org-babel-header-arg-expand): Add support for completing-read
  insertion of header arguments after ":"
  (org-babel-enter-header-arg-w-completion): Completing read insertion
  of header arguments
  (org-tab-first-hook): Adding header argument completion.
  (org-babel-params-from-properties): Combining header argument lists.
* testing/lisp/test-ob.el (ob-test/org-babel-combine-header-arg-lists):
  Test the new header argument combination functionality.
2012-04-13 08:43:16 -04:00
John Wiegley 0c302d412c Add support for creating symbolic links in org-attach 2012-04-12 13:21:05 -05:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry c815eca7ad org-ascii.el: Change the underlining characters for headlines of level 1 and 2
* org-ascii.el (org-export-ascii-underline): Change the
default underlining characters for headlines of level 1 and 2.
Also introduce \. as the underline character for headlines of
level 5.

Thanks to Mathias Bauer for suggesting this.
2012-04-11 08:49:49 +02:00
Bastien Guerry 8c4ccab028 Merge branch 'hotfix' 2012-04-11 01:14:39 +02:00
Bastien Guerry 3523533e50 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix 2012-04-11 01:14:29 +02:00
Bastien Guerry 56bd9dc552 org-clock.el: Rename `org-task-overrun*' to `org-clock-task-overrun*'.
* org-clock.el (org-clock-task-overrun-text)
(org-task-overrun, org-clock-get-clock-string)
(org-clock-update-mode-line)
(org-clock-notify-once-if-expired): Rename `org-task-overrun'
and `org-task-overrun-text' to `org-clock-task-overrun' and
`org-clock-task-overrun-text' respectively.
(org-task-overrun-text): New alias.
2012-04-11 01:14:21 +02:00
Bastien Guerry 5adb7638fe Merge branch 'master' of orgmode.org:org-mode 2012-04-11 00:44:05 +02:00
Bastien Guerry c836b05084 Merge branch 'hotfix' 2012-04-11 00:43:48 +02:00
Bastien Guerry 7d8c5c66e9 org-table.el: Fix bug about handling remote references as durations.
* org-table.el (org-table-eval-formula): Fix bug about
handling remote references as durations.

Thanks to Sébastien Vauban for reporting this.
2012-04-11 00:43:05 +02:00
Bastien Guerry f42e40d978 Merge branch 'hotfix' 2012-04-10 23:39:16 +02:00
Bastien Guerry 9586c880b7 org-pcomplete.el: Fix bug in `pcomplete/org-mode/file-option'.
* org-pcomplete.el (pcomplete/org-mode/file-option): Fix bug
in `pcomplete/org-mode/file-option'.

Before this fix, completing #+ATTR worked only once, as
`org-additional-option-like-keywords' was modified.
2012-04-10 23:39:09 +02:00
Bastien Guerry dbd8745c29 Fix bug in org-pcomplete.el.
* org-pcomplete.el (org-thing-at-point): Also match line
options like LATEX_CLASS when pcompleting from LATEX_.
2012-04-10 23:37:12 +02:00
Bastien Guerry 990558eb21 Merge branch 'hotfix' 2012-04-10 22:26:18 +02:00
Bastien Guerry bfe8ec1fce org-agenda.el: Fix inconsistency in `org-agenda-filter-apply' for category filters.
* org-agenda.el (org-agenda-filter-make-matcher)
(org-agenda-filter-apply): Allow filtering entries out by
category.  Using `C-u <' from the agenda view will redisplay
the agenda without entries from categories of the current
line.

Thanks to John Wiegley for pointing this out.
2012-04-10 22:25:53 +02:00
Eric Schulte c8294348ef Merge branch 'origin-hotfix-7.8.06' 2012-04-10 16:02:16 -04:00
Eric Schulte 6c1b38182b better wrapping of main C function
Thanks to Dov Grobgeld for pointing out this fix.

* lisp/ob-C.el (org-babel-C-ensure-main-wrap): Add an explicit return
  to automatically generated main methods.
2012-04-10 16:01:54 -04:00
Bastien Guerry 5841dbd5ec Merge branch 'hotfix' 2012-04-10 20:23:29 +02:00
Bastien Guerry 3ec180b88f Revert "org-agenda.el: Remove useless prefix argument."
This reverts commit 346907b996.
2012-04-10 20:23:15 +02:00
Bastien Guerry 4611adac23 Merge branch 'hotfix' 2012-04-10 20:09:33 +02:00
Bastien Guerry 346907b996 org-agenda.el: Remove useless prefix argument.
* org-agenda.el (org-agenda-filter-by-category): Remove
useless prefix argument.

Thanks to John Wiegley for spotting this.
2012-04-10 20:09:28 +02:00
Bastien Guerry 4f4b817315 Merge branch 'hotfix' 2012-04-10 18:32:54 +02:00
Bastien Guerry d4ddcbb8b3 Revert "org.el: Include tags from `org-tag-alist' when completing with the TAB key."
This reverts commit 647396464d.
2012-04-10 18:20:04 +02:00
Bastien Guerry 1f80206166 Revert "org.el (org-fast-tag-selection): Fix an bug when listing tags for completion."
This reverts commit dca5af369c.
2012-04-10 18:10:30 +02:00
Bastien Guerry b05cbf73a0 Revert "org.el: Fix bug when gathering tag completion options."
This reverts commit e48d67ed6d.

This commit doesn't take care of tag groups.
2012-04-10 18:04:28 +02:00
Bastien Guerry 6c67af5627 Revert "org.el: Include `org-tag-alist' in the list for tag completions."
This reverts commit acc7a0b2bb.

See http://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
Bastien Guerry 4a6f76bab8 Merge branch 'hotfix' 2012-04-09 20:48:51 +02:00
Bastien Guerry 6144a83c5d Fix bug in using ̀org-cycle-level' in non-org modes.
* org.el (org-point-at-end-of-empty-headline): Only try to
match ̀org-todo-line-regexp' when the value is non-nil, e.g.
in non-org modes.

Thanks to Jambunathan for bringing this up.
2012-04-09 20:48:43 +02:00
Bastien Guerry 8ab0dedc4e Merge branch 'hotfix' 2012-04-09 20:06:21 +02:00
Bastien Guerry bf4d38b1fb org-table.el: Fix bug: make sure references to $0 are correctly handled.
* org-table.el (org-table-get-range): Fix bug: make sure
references to $0 are correctly handled.

Thanks to Nick Dokos for the suggestion.

This fixes the computation of values in this table:

| Record   |        Slope |    ConfLower |    ConfUpper |
|----------+--------------+--------------+--------------|
| GISTEMP  | 0.0173837600 | 0.0133209130 | 0.0214466060 |
| HadCrut3 | 0.0158602890 | 0.0118664610 | 0.0198541180 |

See this message/thread:
http://article.gmane.org/gmane.emacs.orgmode/54341
2012-04-09 20:04:22 +02:00
Bastien Guerry a1c3723b05 Merge branch 'hotfix' 2012-04-09 19:20:47 +02:00
Bastien Guerry e6f5c4f1be org.el: Prevent more fontification errors.
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent more
fontification errors.

Thanks to Henning Redestig for reporting this and to Nick Dokos for
digging further.
2012-04-09 19:20:37 +02:00
Bastien Guerry 17443083c0 org-table.el: Add two autoload cookies.
* org-table.el (org-table-recalculate-buffer-tables)
(org-table-iterate-buffer-tables): Add autoload cookie.

Thanks to Sébastien Vauban who suggested adding an autoload
cookie for `org-table-iterate-buffer-tables'.
2012-04-09 17:32:18 +02:00
Bastien Guerry c3cf7b1476 org.el: Exclude tables in src and example blocks.
* org.el (org-table-map-tables): Exclude tables in src and
example blocks.

Thansk to Sebastian for reporting this.
2012-04-09 17:27:32 +02:00
Bastien Guerry 1a8a39d2df Merge branch 'hotfix' 2012-04-09 16:57:19 +02:00
Matt Lundin 275905ed8d Fix hook docstring to reflect renaming of state to org-state.
* lisp/org.el: (org-after-todo-state-change-hook): Fix docstring to
  reflect name change of state to org-state.

The renamed variable can cause user hooks added to
org-after-todo-state-change-hook to break, so it is essential to have
the correct variable name in the docstring.
2012-04-09 16:57:11 +02:00
Matt Lundin 76503ed1b4 Fix org-bbdb anniversaries to work with the new BBDB
* org-bbdb.el (org-bbdb-anniv-extract-date, org-bbdb-make-anniv-hash):
  Fix org-bbdb anniversary functionality to accommodate bbdb 3.x.
  There are two major changes in bbdb 3.x that need to be taken into
  account.  The first is that `bbdb-split' reverses the order of its
  parameters in 3.x.  The second is that `bbdb-record-getprop' is
  replaced by bbdb-record-note in 3.x.
2012-04-09 12:53:08 +02:00
Bastien Guerry 14e4d7ece9 Merge branch 'hotfix' 2012-04-09 12:47:58 +02:00
Mike Sperber 8dda2fc1ee Fix bug ion `org-footnote-normalize'.
* org-footnote.el (org-footnote-normalize): Correctly pass keyword
arguments to `org-export-preprocess-string'.

TINYCHANGE
2012-04-09 12:47:44 +02:00
Mike Sperber 872a6f75c9 Only use `visual-line-mode' if it's bound.
* org.el (org-kill-line): Access `visual-line-mode' only if it's
bound.

TINYCHANGE
2012-04-09 12:46:23 +02:00
Nicolas Goaziou d6faea24d4 org-footnote: Fix bug related to sorting and folded view
* lisp/org-footnote.el (org-footnote-delete-definitions): Remove blank
  lines before the footnote definition instead of removing those after
  it.
* testing/lisp/test-org-footnote.el: Adapt tests.
2012-04-08 12:01:57 +02:00
Nicolas Goaziou 4019559ee2 org-footnote: Don't grab trailing blank lines in a footnote definition
* lisp/org-footnote.el (org-footnote-at-definition-p): Don't grab
  trailing blank lines in a footnote definition.
(org-footnote-delete-definitions): Remove both footnote definition and
trailing blank lines.
* testing/lisp/test-org-export.el (test-org-export/fuzzy-links): Fix
  a docstring.
* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
  Apply change to footnote definitions.
2012-04-06 19:14:51 +02:00
Bastien Guerry e6fdf918a4 Merge branch 'hotfix' 2012-04-06 10:53:24 +02:00
Bastien Guerry 35a5f069d8 Revert "Fix global dynamic variables in org-special-blocks.el."
This reverts commit 9054ba39d0.

The variable `line' is dynamically scoped in org-html and should
not be renamed here.
2012-04-06 10:52:34 +02:00
Stephen Eglen 76e7b07872 org-icalendar-timezone: doc string fix
* lisp/org-icalendar.el (org-icalendar-timezone): Fix typo and clarify
meaning.

Small typo (of -> or); clarify meaning of how timezone is calculated if
this variable is left as nil.

TINYCHANGE
2012-04-04 09:20:36 +02:00
Chris Gray 6fabe46cc7 Export: Allow for TOC generation if body-only is set
* lisp/org-html.el (org-export-as-html): Remove the check for
body-only in the code for generating tables of contents.

The docstring for org-export-as-html states that the body-only flag
removes everything outside the <body></body> tags (inclusive).  Since
the table of contents is inside these tags, it should be exported when
requested even if the body-only flag is set.
2012-04-04 08:54:14 +02:00
Bastien Guerry 187f77a20a org.el: Leave scheduled/deadline lines untouched when filling an adjacent paragraph.
* org.el (org-fill-paragraph): Leave scheduled/deadline lines
untouched when filling an adjacent paragraph.

Thanks to Stuart McLean for suggesting this.
2012-04-04 08:51:20 +02:00
Bastien Guerry ce06791334 Merge branch 'hotfix' 2012-04-04 08:28:45 +02:00
Bastien Guerry fc374109cd org.el: Prevent an error when trying to fontify beyond (point-max).
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent an
error when trying to fontify beyond (point-max).

TINYCHANGE

Thanks to Leo and Henning for reporting this, and to Nick Dokos
for providing the fix.
2012-04-04 08:28:17 +02:00
Bastien Guerry 72d911cfa2 Merge branch 'hotfix'
Conflicts:
	lisp/org-capture.el
	lisp/org-clock.el
2012-04-03 14:09:12 +02:00
Bastien Guerry e48d67ed6d org.el: Fix bug when gathering tag completion options.
* org.el (org-fast-tag-selection): Fix bug when gathering tag
completion options.

TINYCHANGE

Thanks to Noorul Islam K M for the patch.
2012-04-03 14:07:26 +02:00