0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-24 15:32:52 +00:00
Commit graph

2605 commits

Author SHA1 Message Date
Carsten Dominik 31b19b1afc Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
	lisp/ChangeLog
2010-04-01 12:43:34 +02:00
Dan Davison af6387c5c2 Remove org-R from org-modules. 2010-03-31 13:42:44 -04:00
Dan Davison 79fa926af3 Change Customize group name.
Change Customize group variable name from org-font-lock to
org-appearance, and change group tag from "Org Font Lock" to "Org
Appearance".
2010-03-31 13:16:08 -04:00
Eric Schulte 18a1f8e98a on HTML export, latex source code added as alternative text to latex images 2010-03-31 10:23:24 -06:00
Carsten Dominik 6a5e18397f Minor fix 2010-03-31 09:26:05 +02:00
Carsten Dominik 60755599a0 Revert "Refactor refiling code"
This reverts commit 84e8434337.
2010-03-29 14:22:46 +02:00
Carsten Dominik a3f3efe82d Speed-up multiple calls to `org-diary'.
Patch by Matt Lundin

Matt writes:

> The missing piece of the puzzle is integration with "diary" and
> "cal-tex" functions via the org-diary sexp. I have found org-diary to be
> excruciatingly slow when called for anything more than a couple of days.
> I have the following line in my diary file:
>
> &%%(org-diary :timestamp :sexp)
>
> If I try to view 20 or so upcoming days in the diary by typing C-u 20 d
> on a date in the calendar, it can take upwards of 30 seconds to generate
> the diary display. This is of little consequence, since I can, after
> all, simply use the custom agenda command. But I often want to print out
> a nice LaTeX calendar of my appointments with cal-tex-cursor-month. And
> that takes upwards of 50 seconds (see attached elp-results file).
>
> Judging from the elp-results, the culprit seems to be
> org-prepare-agenda-buffers (46 seconds), which is called 31 times (once
> for each day). It seems to me that since org-diary is being called 31
> times in quick succession by the same function (diary-sexp-entry), one
> should only need to call org-prepare-agenda-buffers once.
>
> The only solution I could see to this problem was to add a test to see
> if org-diary had been called less than 1 second ago. Thus, I added the
> variable org-diary-last-run-time and a conditional in org-diary that
> only runs org-prepare-agenda-buffers if org-diary-last-run-time is less
> than 1 second in the past.
>
> With the patch, it now takes appr. 5 seconds to generate the LaTeX
> calendar with cal-tex and org-prepare-agenda-buffers is called only
> once.
2010-03-29 11:24:06 +02:00
Carsten Dominik aed051cf8c HTML export: Make better use of labels 2010-03-29 11:13:16 +02:00
Carsten Dominik 313f01d297 Do some formatting of table and figure captions
Table and figure captions are not fully processed.  Now we at least do
basic formatting, but links and footnotes still do not work.
2010-03-29 07:30:00 +02:00
Bernt Hansen 84e8434337 Refactor refiling code
Allow C-2 C-c C-w to work in the agenda.

Update agenda after refiling
  This rebuilds the agenda buffer after the refile operation completes.
  It was removing the to-be-refiled task before prompting for the location
  which felt a little strange.  While on the prompt you can't see
  the task you are refiling anymore since it was just removed from the
  agenda list and if you aborted from the refile operation
  with C-g then the task to be refiled has already been removed.
2010-03-28 22:10:24 -04:00
Bernt Hansen d21b9155eb Typo: left-over -> leftover
Since this is not an exposed variable we can rename it so that it is spelled
correctly.
2010-03-28 22:10:24 -04:00
Bernt Hansen c7bc245ef5 Reveal after goto
Occasionally when jumping to the last task we end up inside
a folded region.  This just reveals the headline to make
editing easier.
2010-03-28 22:10:24 -04:00
Dan Davison 9c09a85ab6 New faces for title, date, author and email address lines.
By default, title, author, date and email lines appear in dark blue
with the initial keywords greyed out. The title is in a larger font
than the others. This is implemented by the following new faces:

org-document-title
org-document-info
org-document-info-keyword

In addition, the variable org-hidden-keywords can be used to make the
corresponding keywords disappear.
2010-03-28 10:39:47 -04:00
Carsten Dominik 7455e6c285 Keep byte compiler happy 2010-03-28 10:01:07 +02:00
Carsten Dominik 4892c8899e Implement index generation during export
This new code will search #+INDEX lines in the buffer.  For LaTeX, it
will simple convert these into LaTeX \index{} commands.  For other
backends, it will copy thee entries to a new file, with extension
orgx.  These files can then later be post-processed to create the index.
2010-03-28 09:27:33 +02:00
Carsten Dominik b349823687 Tables: Interpret <N> as fixed width, not maximum width
Requested by Michael Brand
2010-03-27 16:13:45 +01:00
Carsten Dominik 3cc99bdc1f Fix some docstrings
Patch by David Maus.
2010-03-26 21:34:25 +01:00
Carsten Dominik 05b4fb9bcb Fix another typo 2010-03-26 11:22:56 +01:00
Carsten Dominik 7bfd1dc5ae Minor post-fixed about author and email information 2010-03-26 09:13:50 +01:00
Carsten Dominik c9cb315fab Fix some documentation issues for BEAMER export 2010-03-26 08:35:02 +01:00
Carsten Dominik b69adf6738 Freemind export: Fix odd level issue 2010-03-26 08:15:42 +01:00
Carsten Dominik 3f6a52dd8b New option to turn off export of the email address
Default is actually off.
2010-03-26 08:05:14 +01:00
Carsten Dominik d1289ba906 Fix typo in variable name.
Patch by Mikael Fornius.
2010-03-25 12:47:48 +01:00
Carsten Dominik 8586c7f2ab Store unexpanded filenames in list of agenda files. 2010-03-25 12:13:24 +01:00
Carsten Dominik 66c72c809b ASCII export: Allow to export buffers without a file name 2010-03-25 08:36:37 +01:00
Carsten Dominik f237acfd85 Add logging support for refiling
Proposal by Charles Cave.
2010-03-25 07:48:29 +01:00
Carsten Dominik 93af0ec925 Use save-excursion to remember position when updating dblocks
Magnus Henoch writes:

> This patch has been sitting in my tree for a while...  It's a fix to
> org-map-dblocks, to make it use save-excursion instead of remembering
> position values.  I need this since I have a dblock function that
> asynchronously updates dblocks from HTTP responses, and some dblocks
> ended up getting updated twice or thrice.

[...]

> My dblock-write function calls url-retrieve, to asynchronously retrieve an
> HTML page.  The callback function I pass to url-retrieve will then fill
> in the information I need into the dynamic block.
>
> So in the following case:
>
> * Find start of dblock 1, store as pos
> * Make HTTP request for dblock 1
> * Go back to pos
> * Find end of dblock 1
> * Find start of dblock 2, store as pos
> * Make HTTP request for dblock 2
> * Asynchronous event: HTTP response for dblock 1 arrives, insert lots of
>  data in dblock 1
> * Go back to pos
> * Find end of dblock 2
>
> the last step will actually find the end of dblock 1, if the amount of
> data inserted in dblock 1 is great enough that pos suddenly points
> inside it.  (Then it will of course find dblock 2 again, request its HTML
> page again, and thus insert the data twice.)
>
> An equivalent fix would be to make pos a marker instead.
2010-03-24 22:25:35 +01:00
Carsten Dominik 80d0b06fbf Attachments: Commit to git after deleting a file
Patch by David Maus
2010-03-24 22:19:55 +01:00
Carsten Dominik 7e476db196 Attachments: Remove dependence on xargs
Patch by David Maus, who writes:

> Attached patch for org-attach-commit in org-attach.el removes the
> dependency on the xargs command to remove files in the repository that
> were deleted in the attachment directory.
>
> Simply capture output of git ls-files --deleted -z in a temporary
> buffer, get the filenames from there via string-split and call git rm
> on each single file.
2010-03-24 22:17:28 +01:00
Carsten Dominik 1d4ee49c91 LaTeX export: Do not mistake table.el borders for strike-through emphasis. 2010-03-24 18:44:25 +01:00
Carsten Dominik b236220c9f Freemind export: Simplify handling of odd levels 2010-03-24 16:18:25 +01:00
Carsten Dominik c084541efa Add more options to `org-agenda-todo-ignore-with-deadline'
Patch by Lukasz Stelmach.
2010-03-24 13:13:53 +01:00
Carsten Dominik 42589b32c2 Expand file names in org-agenda-files (external file case)
Patch by Mikael Fornius.
2010-03-24 12:55:55 +01:00
Carsten Dominik 15ec1c56ad LaTeX export: Allow parenthesis before exponent of subscript
Keith writes:

> I noticed something strange and I think it's might be a bug converting
> to tex file. I've been trying to put a special symbol inside a
> bracket, e.g.
>
>  air temperature (degree Celsius)
>
> and the symbol should look like ^{\circ}C in org file. It works well
> if it is standalone. However, when I put the brackets out of it, say
> (^{\circ}C), the pdf output looks bizarre. I have checked the tex
> output and the converting results from orgmode file are
>
>  ^{\circ}C   -->   $^{\circ}$C
>  (^{\circ}C) -->   (^\{\circ}C)
2010-03-24 12:26:50 +01:00
Carsten Dominik 3598ed89d9 Don't add deadlines if the user has configured to exclude them locally
Patch by Matt Lundin
2010-03-24 12:07:29 +01:00
Dan Davison c0707b1f31 Don't leave point in hidden region after exiting code buffer. 2010-03-23 11:18:04 -04:00
Carsten Dominik fc2bdd8cf1 Fix problem when inserting a new headline
Ryan Thompson writes:

> I have found a bug. When the point is at the end of an empty headline
> and you press M-RET (or C-RET) to make a new headline, it deletes all
> the whitespace at the end of the empty headline first, which causes
> the headline to break. I'm not sure if the correct behavior is to
> leave an empty headline, or maybe just do nothing and leave the point
> at the end of the empty headline without creating a new one, but the
> correct thing is definitely *not* to break the headline.
2010-03-23 08:44:13 +01:00
Carsten Dominik a42326f57b Fix group name tag for org-indent 2010-03-23 08:31:55 +01:00
Carsten Dominik d70fb6fdba New helper functions in org-table.el 2010-03-21 20:08:01 +01:00
Carsten Dominik 75563bf71e Allow regexps in org-file-apps to capture link parameters using groups
Patch by Jan Böker.

Jan writes:

> What is this?
> =============
>
> This patch changes the way extension regexps in `org-file-apps' are
> handled. Instead of against the file name, the regexps are now matched
> against the whole link, and you can use grouping to extract link
> parameters which you can then use in a command string to be executed.
>
> For example, to allow linking to PDF files using the syntax
> file:/doc.pdf::<page number>, you can add the following entry to
> org-file-apps:
>
> Extension: \.pdf::\([0-9]+\)\'
> Command:   evince "%s" -p %1
>
> In a command string to be executed, the parameters can be referenced
> using %1, %2, etc.  Lisp forms can access them using (string-match n link).
>
>
> Where to get it?
> ================
> Either apply the patch by hand or
>
> git pull git://github.com/jboecker/org-mode.git org-file-apps-parameters
>
>
> What's next? / Feedback
> =======================
>
> - Find the bugs. Since this messes with links, a central concept of Org,
> I probably have missed some edge cases; so please test this and
> report if it works for you.
>
> I also appreciate any feedback on code quality or the design decisions
> made. I am learning elisp along the way, so you may be able to write
> some changes in a more idiomatic and/or elegant way.
>
> - Add a mechanism for org-mode modules to add default values to
> org-file-apps, similar to the variables org-file-apps-defaults-*.
> This could be used by modules to define their own extensions to the
> syntax of file: links.
>
> - Modify org-docview.el to use this and deprecate the docview: link syntax.
>
>
> What does it (intentionally) break?
> ===================================
>
> This patch introduces a backwards-incompatible change. If LINE or SEARCH
> is given, the file is no longer guaranteed to open in emacs: if IN-EMACS
> is nil and an entry in org-file-apps matches, that takes precedence.
>
> A grep of the lisp/ and contrib/ directories showed that no code in the
> org-mode distribution was relying on this behaviour; whereever LINE or
> SEARCH is given, IN-EMACS is also set to t.
>
> I decided against adding an additional parameter because that would be
> redundant; the original link as seen by org-open-at-point can be
> reconstructed from PATH, LINE and SEARCH.
>
> I am not that sure if this is the right way to do this, but it seems to
> break as little as possible while hopefully avoiding to add too much
> complexity.
2010-03-21 18:10:00 +01:00
Carsten Dominik 19113c46c9 Minor fix 2010-03-21 08:28:37 +01:00
Carsten Dominik 7ef096f397 Make `org-reveal' also decrypt encrypted entries
Thanks to Richard Riley for triggering this change.
2010-03-21 08:16:08 +01:00
Carsten Dominik a36b60a6e8 Improve level cycling function
Patch by Ryan Thompson.
2010-03-21 07:52:23 +01:00
Carsten Dominik 749fc76c2d No extra newline after time planning line 2010-03-19 19:51:58 +01:00
Carsten Dominik 2b14934fe8 HTML export: Fix linking to targets in external files
Dan Davison writes:

> Bug report
> ==========
> If I have this:
>
> A [[file:zz.org::#mytarget][link]] to a target with a custom ID
>
> and export it to HTML, I get
>
> A <a href="zz.html##mytarget">link</a> to a target with a custom ID
>
> which (in firefox on linux) links to the file but does not jump to the
> target. However, if I change the '##' to '#' then firefox jumps to the
> correct location. Is this an org bug?
>
> Very tentatively proposed patch
> ===============================
> I've investigated a bit (notes below), resulting in this proposed patch:
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/lisp/org-html.el b/lisp/org-html.el
> index aa70408..5ee5b19 100644
> --- a/lisp/org-html.el
> +++ b/lisp/org-html.el
> @@ -1110,7 +1110,7 @@ lang=\"%s\" xml:lang=\"%s\">
>                     (abs-p (file-name-absolute-p filename))
>                     thefile file-is-image-p search)
>                (save-match-data
> -                 (if (string-match "::\\(.*\\)" filename)
> +                 (if (string-match "::#?\\(.*\\)" filename)
>                      (setq search (match-string 1 filename)
>                            filename (replace-match "" t nil filename)))
>                  (setq valid
> --8<---------------cut here---------------end--------------->8---
>
> Doc patch
> =========
> The link above (file:zz.org::#mytarget) was created by C-c l on a
> heading with a CUSTOM_ID property. However, I couldn't see where in the
> manual links of this form are documented. Do we need to add this link
> type to section 4.7 "Search options in file links", e.g.
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/doc/org.texi b/doc/org.texi
> index f49f056..c8cc1a5 100644
> --- a/doc/org.texi
> +++ b/doc/org.texi
> @@ -3116,6 +3116,7 @@ link, together with an explanation:
> [[file:~/code/main.c::255]]
> [[file:~/xx.org::My Target]]
> [[file:~/xx.org::*My Target]]
> +[[file:~/xx.org::#my-custom-id]]
> [[file:~/xx.org::/regexp/]]
> @end example
>
> @@ -3130,6 +3131,8 @@ link will become an HTML reference to the corresponding named anchor in
> the linked file.
> @item *My Target
> In an Org file, restrict search to headlines.
> +@item #my-custom-id
> +Link to a heading with a @code{CUSTOM_ID} property
> @item /regexp/
> Do a regular expression search for @code{regexp}.  This uses the Emacs
> command @code{occur} to list all matches in a separate window.  If the
> --8<---------------cut here---------------end--------------->8---
>
> Notes
> =====
> At line 1134 of org-html.el there is
>
> 			(setq thefile (concat thefile "#"
> 					      (org-solidify-link-text
> 					       (org-link-unescape search)))))
>
> during evaluation of which 'search is bound to "#mytarget", which
> suggested that the problem might be in the regexp parsing creating
> 'search.
2010-03-19 18:04:23 +01:00
Carsten Dominik e45c431ce9 Refile: Catch invalid target specification
Patch by Jason Dunsmore.
2010-03-19 14:09:30 +01:00
Carsten Dominik b79e7790f9 Fix time extraction when inserting diary entries with `i d' 2010-03-18 06:36:49 +01:00
Carsten Dominik 72b33420b8 New variable for extracting time when adding diary entries
Patch by Stephen Eglen.
2010-03-17 16:54:58 +01:00
Carsten Dominik b2343cef32 Fix cursor position after changing bullet types 2010-03-17 16:11:13 +01:00
Carsten Dominik 582d28ab82 Make URLs not escape the questionmark 2010-03-17 12:02:02 +01:00