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

2882 commits

Author SHA1 Message Date
Dan Davison ed4eb9d150 * lisp/org-src.el: Prevent fixed-width region edit buffers
being created as read-only.
2010-06-05 12:35:19 +01:00
Carsten Dominik f70956ff5a Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-06-04 21:02:41 +02:00
Bernt Hansen dc602f3b2e Emacs 22 support - use org-string-match-p
* contrib/lisp/org-special-blocks.el (org-special-blocks-make-special-cookies):
Emacs 22 doesn't have string-match-p
* lisp/org-freemind.el (org-freemind-write-mm-buffer):
(org-freemind-get-node-style):
Emacs 22 doesn't have string-match-p
* lisp/org-html.el (org-html-make-link):
Use new org-string-match-p for compatibility
2010-06-04 21:01:29 +02:00
Eric Schulte c2c3e98004 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-06-04 07:31:58 -06:00
Carsten Dominik add40f96f1 Stop iCalendar export from failing with sexp dates
* lisp/org-icalendar.el (org-ical-ts-to-string): Catch error when
parsing tie string.
2010-06-04 13:13:54 +02:00
Carsten Dominik 1eb974ed62 Fix problem with calendar popping up in a different frame
* lisp/org.el (org-read-date): Bind `calendar-setup' to nil for the
scope of this command.
2010-06-04 12:57:39 +02:00
Carsten Dominik 420dd96768 Fix the date prompt for american-style dates
* lisp/org.el (org-read-date-analyze): Fix regular expression for
matching american dates

Daniel E. Doherty writes:

> In playing around with the date prompt (C-.), I ran across the following
> puzzling behavior from rather simple inputs.
>
> I entered the following on June 1, 2010.  Here is a date entered as
> "3/15": <2011-03-15 Tue>.  It interpreted it as the upcoming March 15 as
> expected.
>
> But here is a date entered as "5/21": <2021-06-05 Sat>.  Note how it
> interpreted the "21" as the year 2021, not at all what I expected from
> the documentation or the analogous "3/15" example.
>
> Maybe there is some underlying logic here that I'm not getting.  Perhaps
> it has to do with how 2-digit years are interpreted?
>
> What's going on here?  I am using org-version 6.36trans on emacs 23.1.

What was going on here is that the regular expression for matching
american-style dates was wrong.  It was looking for month numbers in
the second field and day numbers in the first field - wrong, of
course.
2010-06-04 12:35:41 +02:00
Carsten Dominik 6bad6fc737 Fix some issues in the entity and subscript code
* lisp/org-macs.el (org-rm-props): Add org-emphasis to the properties
that must be removed.
* lisp/org.el (org-do-emphasis-faces): Add org-emphasis property to
items that have emphasis done wit font-lock.
(org-fontify-entities): Do not do anything in commented lines.
(org-unfontify-region): Decompose the region as well, because we do
composition during font-lock.
(org-raise-scripts): Do nothing inside an emphasis string.

Reported by Eric Fraga in http://article.gmane.org/gmane.emacs.orgmode/25940
2010-06-04 08:25:50 +02:00
Carsten Dominik 48dfb47f52 Introduce a help function for entities
* lisp/org-entities.el (org-entities-help): New command.
2010-06-03 18:17:08 +02:00
Carsten Dominik 73f04ce48e Fix clickable images in HTML export
* lisp/org-html.el (org-export-as-html): Add the code to create
clickable images.
2010-06-03 10:27:58 +02:00
Carsten Dominik 0618aeafb3 Make raising and lowering not mess up table alignment
* lisp/org-compat.el (org-string-match-p):
(org-looking-at-p): New functions.
* lisp/org-table.el (org-table-align): Handle raised text with
invisible characters.
* lisp/org.el (org-script-display): Add raise properties for tables.
(org-raise-scripts): Handle raising differently inside tables.

Pretty display of subscripts and superscripts no longer messes up
table alignment.  This is achieved by two things:

1. Inside tables, the raised characters are not made smaller, they
   remains at the same size.  Instead they are raise/lowered more, by
   a full half character height to still be clearly readable as
   subscript or superscript.

2. The invisible characters are taken into account when computing the
   field width.
2010-06-03 10:24:04 +02:00
Carsten Dominik fd1d2992f6 Make it possible to protect hidden subtrees to be killed by `C-k'
* lisp/org.el (org-ctrl-k-protect-subtree): New option.
(org-kill-line): Protect hidden subtrees if the user wants it.
* doc/org.texi (Headlines): Mention the special behavior of C-k
in headlines.

Scott Otterson writes:

> For what must be the dozenth time, I've just accidentally deleted a
> large tree by typing C-k while in a headline.
>
> This is really easy to do because emacs users have "C-k deletes to the
> end of the line" worn deeply into their neural pathways -- it's so
> automatic for me that the keystroke is close to subconscious.  A
> mistaken C-k is especially hard to detect because org-mode displays
> the result exactly like what your subconscious expects, that is, a
> collapsed headline is deleted to the end -- and the tree underneath is
> wiped out with no noticeable warning.
>
> Feature request: add an option preventing tree deletion with C-k
> without user confirmation.  Actually, I'd like an option to prevent it
> period.
>
> If this option is already in there, then you're encouraged to tell me
> to RTFM.  But then also please tell me where it is, because I can't
> find it.

Carsten replies

> This is now possible due to the variable
> `org-ctrl-k-protect-subtree'.  But I predict that you are going to set
> it to nil again soon :D
2010-06-03 00:18:44 +02:00
Carsten Dominik 70d24c5d03 Implement pretty display of sub- and superscripts.
* doc/org.texi (Subscripts and superscripts): Document that `C-c C-x \'
will also format sub and superscripts.
* doc/orgcard.tex: Document that `C-c C-x \'
will also format sub and superscripts.
* lisp/org.el (org-use-sub-superscripts):
(org-pretty-entities-include-sub-superscripts): Move here from
org-exp.el.
(org-set-regexps-and-options): Parse subscript option and set
`org-use-sub-superscripts' as a local variable.
(org-match-sexp-depth):
(org-create-multibrace-regexp):
(org-match-substring-regexp):
(org-match-substring-with-braces-regexp): Moved here from org-exp.el
(org-set-font-lock-defaults): Call `org-raise-scripts'.
(org-remove-font-lock-display-properties): New function.
(org-unfontify-region): Call
`org-remove-font-lock-display-properties'.
(org-script-display): New constant.
(org-raise-scripts): New function.

When turning on entity display with `C-c C-x \', sub- and superscripts
will also be displayed in a smaller font, and raised/lowered.
2010-06-03 00:06:19 +02:00
Eric Schulte c4d385681f make org-show-block-all interactive as is org-hide-block-all 2010-06-02 15:03:53 -06:00
Carsten Dominik 31a9b70dfb Fix indentation 2010-06-02 15:02:36 +02:00
Carsten Dominik 5f23a22959 Fix whitespace issues 2010-06-01 17:16:37 +02:00
Carsten Dominik bc53b3da3b Minor fixes
* lisp/org-latex.el (org-export-latex-fontify): Avoid fontifying
several stars in a row.
* lisp/org.el (org-emphasis-alist): Mention
`org-export-docbook-emphasis-alist' in the docstring.
2010-06-01 09:43:03 +02:00
Carsten Dominik d34786f227 Move a function to org.el
* lisp/org.el (org-find-olp): Move the function here, from org-mobile.el
2010-05-31 18:57:01 +02:00
Carsten Dominik ea3cdc75f8 Improve MobileOrg documentation
* doc/org.texi (MobileOrg): Improve documentation about MobileOrg,
move all webdav server configuration to the FAQ.
2010-05-31 09:14:58 +02:00
Carsten Dominik 27ec3527f2 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-05-30 22:17:40 +02:00
Carsten Dominik b1b066b5f7 Fix some customization issues in org-beamer.el patch by Jan Moringen
* lisp/org-beamer.el (org-beamer-column-view-format):
(org-beamer-themes): Allow nil value, fix customize tags
(org-insert-beamer-options-template): Handle nil values of theme and
column view format.
2010-05-30 22:17:29 +02:00
Tassilo Horn 185625c810 org-gnus.el: Mention also Gmane in org-gnus-prefer-web-links
* org-gnus.el (org-gnus-prefer-web-links): Mention also Gmane
in the doc string.
2010-05-28 15:46:37 -06:00
David Maus 963f830b2e Escape percent character.
* org.el (org-fixup-message-id-for-http): Escape percent
character.
2010-05-28 15:46:32 -06:00
Carsten Dominik a082001643 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-05-28 17:34:12 +02:00
Carsten Dominik e90fe668ac Rename org-beamer-settings-template
* lisp/org-beamer.el (org-insert-beamer-options-template):
Renamed from `org-beamer-settings-template'.
2010-05-28 17:34:01 +02:00
Bastien Guerry 59badeeaaf `org-timer-set-timer': new prefix argument.
Called with a numeric prefix argument, `org-timer-set-timer' uses
this numeric value as the duration of the timer.

Called with a `C-u' prefix argument, use `org-timer-default-timer'
without prompting the user for a duration.

With two `C-u' prefix arguments, use `org-timer-default-timer'
without prompting the user for a duration and automatically
replace any running timer."
2010-05-28 12:38:29 +02:00
Carsten Dominik e7a3e1a223 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-05-28 09:18:37 +02:00
Carsten Dominik 4917ae9362 Fix typo
* lisp/org.el (org-show-context): Fix typo
2010-05-28 08:16:39 +02:00
Carsten Dominik a9a5e6b848 Fix id creation bug when remember is called from agenda
* lisp/org.el (org-store-link): Don't call org-store-link
interactively when called through remember from the agenda

Samuel Wales writes:

> For months, I found ID properties where they didn't belong.
> Finally I found that they are added when I do M-x
> org-remember in an agenda buffer, to the headline under
> point.  Feels like a bug.  [...]
2010-05-28 08:15:49 +02:00
David Maus 5349014e82 org.el: Remove duplicate code in `org-clone-subtree-with-time-shift'.
Operating on the clone (e.g. remove/recreated ID property) is
independent on whether the subtree is cloned with time shift or not.
2010-05-26 22:54:29 -06:00
David Maus a3e5a2f7e4 org-w3m.el: Get text property directly, not using macro `w3m-anchor'. 2010-05-26 22:53:36 -06:00
Sebastian Rose af080027fc file protocol in HTML links
The appended patch removes the protocol part from link URIs, if the
protocol is file. Neccessary, to show images again and make links work.
2010-05-26 22:48:06 -06:00
Tassilo Horn 54d513ee0c org.el (org-agenda-file-p): New predicate function.
The new function `org-agenda-file-p' checks if a given file is an org
agenda file.  Such a function is very useful in hooks, for example if
you want to export agenda files automatically when saving:

(defun th-org-mode-init ()
  ;; Update appointments and export to iCalendar when saving.
  (when (org-agenda-file-p)
    (add-hook 'after-save-hook 'th-org-agenda-to-appt t t)
    (add-hook 'after-save-hook 'org-export-icalendar-this-file t t)))
(add-hook 'org-agenda-mode-hook 'th-org-agenda-mode-init)
2010-05-26 22:46:34 -06:00
Michael Sperber 8b174b0d36 PATCH: Fix minor XEmacs compatibility issue
I'd appreciate if this one could be applied.  I'll fix XEmacs to accept
#B<binary> in the future, but I'd appreciate this one anyway.  Doesn't
really add complexity ...
2010-05-26 22:43:43 -06:00
Eric Schulte 2b08e18b93 added indent macro declaration to `org-save-outline-visibility' 2010-05-26 19:44:29 -06:00
Matt Lundin bb912d6d7c Fix org-refile-cache-check-set
Org-refile-cache fails when org-refile-use-outline-path is set to file.
Specifically, org-refile-cache-check-set throws a markerp error when it
encounters file targets, since they have nil instead a marker object.
This patch applies the test only to targets with markers (i.e.,
headings).
2010-05-26 14:14:47 -06:00
Matt Lundin 4c6012f831 Don't build org-refile-cache if org-refile-use-cache is nil
The function org-get-refile-targets was building org-refile-cache even
if org-refile-use-cache was set to nil. This caused every refile
attempt to call org-refile-cache-clear and to produce the message
"Refile cache has been cleared."
2010-05-26 14:11:04 -06:00
Julien Danjou 8c5f8a4d25 Do not expand title in <title> markups
If we expand `title', we may have HTML markup between the <title>
markups, which is not valid.

Signed-off-by: Julien Danjou <julien@danjou.info>
2010-05-26 14:10:28 -06:00
Julien Danjou a153f5a31d Fix docstring for org-export-html-{pre, post}amble
Signed-off-by: Julien Danjou <julien@danjou.info>
2010-05-26 14:09:13 -06:00
Carsten Dominik 8dd4bafd8e Restore Emacs 22 compability
* org-html.el (org-html-make-link): Use string-match,
string-match-p is not compatible with Emacs 22.
2010-05-25 13:49:45 +02:00
Carsten Dominik 31c14d58b6 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-05-25 11:38:55 +02:00
David Maus d7e15f0c88 Serialize the publishing cache
* lisp/org-publish.el (org-publish-write-cache-file):
Write a serialized version of the cache hash.
(org-publish-initialize-cache): Reset the cache hash before creating a
new one.Serialize publishing project cache with `puthash' expressions.
2010-05-25 11:38:42 +02:00
Michael Sperber 67b5a92c78 Fix org-src saving mechanism for XEmacs
write-contents-hooks is not buffer-local by default in XEmacs 21.4.
2010-05-24 09:20:23 -04:00
Bastien Guerry 3685d6b496 `org-timer-set-timer': fix bug about cancelling timer. 2010-05-24 15:11:14 +02:00
Carsten Dominik 7831cb7885 Don't add url type if link is relative.
* org-html.el (org-html-make-link): Don't add url type if link
is relative.
2010-05-23 11:59:27 +02:00
Carsten Dominik a49a64575b Document the use of `org-list-demote-modify-bullet'.
* doc/org.texi (Plain lists): Document
`org-list-demote-modify-bullet'.

* lisp/org-list.el (org-list-demote-modify-bullet): Improve docstring
by showing an example.

This change was triggered by a request by Livin Stephen Sharma.
2010-05-23 07:11:01 +02:00
Carsten Dominik 5b68cf4c4f Allow to skip steps in clock reports that have zero time
* org-clock.el (org-dblock-write:clocktable): Return total time.
(org-clocktable-steps): Skip step when time is zero and the
:stepskip0 property is set.

Rainer Stengele writes:

> Creating clocktables for each day of a month is an excellent feature
> in org!  Problem for me is that many resulting tables have a total
> time of 0:00.  The problem is not really the zero time I spent but the
> appearance of the tables with zero total time.
>
> Is there a possibility to skip getting such tables?  Rational: I do
> not need to show my boss or customer days where I spent 0:00 time on
> the project.

Now you can set :stepskip0 to achieve this.
2010-05-22 08:18:20 +02:00
John Wiegley 7e2158651d Added forward var decl to quiet compiler warning
* lisp/org.el (org-property-drawer-re): Forward declaration to avoid
  compiler warning.
2010-05-21 13:39:34 -04:00
Bernt Hansen 4f9c82fcf7 Fix typo in org-list-demote-modify-bullet docstring 2010-05-21 11:14:09 -04:00
John Wiegley a0a5b10f7a Revert "org.el (org-remove-inline-images): Call `clear-image-cache'."
This reverts commit 0c42220ca0.
2010-05-21 05:01:39 -04:00