mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-12-11 09:20:32 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
Eric Schulte
commit
74667673c6
@ -1,3 +1,7 @@
|
||||
2010-05-06 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* Makefile (DOCFILES): Add pdflayout.sty
|
||||
|
||||
2010-04-28 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* Document that lines with formatting cookies will be removed
|
||||
|
||||
3
Makefile
3
Makefile
@ -117,7 +117,8 @@ LISPFILES0 = $(LISPF:%=lisp/%)
|
||||
LISPFILES = $(LISPFILES0) lisp/org-install.el
|
||||
ELCFILES0 = $(LISPFILES0:.el=.elc)
|
||||
ELCFILES = $(LISPFILES:.el=.elc)
|
||||
DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir doc/.nosearch \
|
||||
DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir \
|
||||
doc/pdflayout.sty doc/.nosearch \
|
||||
doc/orgguide.texi doc/orgguide.pdf
|
||||
CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
|
||||
TEXIFILES = doc/org.texi
|
||||
|
||||
@ -6,9 +6,89 @@
|
||||
|
||||
#+STARTUP: indent hidestars
|
||||
|
||||
* Version 6.35
|
||||
|
||||
* Version 6.36
|
||||
|
||||
:PROPERTIES:
|
||||
:VISIBILITY: content
|
||||
:CUSTOM_ID: v6.36
|
||||
:END:
|
||||
|
||||
** Details
|
||||
*** Inline display of linked images
|
||||
|
||||
Images can now be displayed inline. The key C-c C-x C-v does
|
||||
toggle the display of such images. Note that only image links
|
||||
that have no description part will be inlined.
|
||||
|
||||
*** Implement offsets for ordered lists
|
||||
|
||||
If you want to start an ordered plain list with a number
|
||||
different from 1, you can now do it like this:
|
||||
|
||||
: 1. [@start:12] will star a lit a number 12
|
||||
|
||||
*** Extensions to storing and opening links to Wanderlust messages
|
||||
|
||||
- Remove filter conditions for messages in a filter folder
|
||||
|
||||
If customization variable `org-wl-link-remove-filter' is non-nil,
|
||||
filter conditions are stripped of the folder name.
|
||||
|
||||
- Create web links for messages in a Shimbun folder
|
||||
|
||||
If customization variable `org-wl-shimbun-prefer-web-links' is
|
||||
non-nil, calling `org-store-link' on a Shimbun message creates a
|
||||
web link to the messages source, indicated in the Xref: header
|
||||
field.
|
||||
|
||||
- Create web links for messages in a nntp folder
|
||||
|
||||
If customization variable `org-wl-nntp-prefer-web-links' is
|
||||
non-nil, calling `org-store-link' on a nntp message creates a web
|
||||
link either to gmane.org if the group can be read trough gmane or
|
||||
to googlegroups otherwise. In both cases the message-id is used as
|
||||
reference.
|
||||
|
||||
- Open links in namazu search folder
|
||||
|
||||
If `org-wl-open' is called with one prefix, WL opens a namazu
|
||||
search folder for message's message-id using
|
||||
`org-wl-namazu-default-index' as search index. If this variable is
|
||||
nil or `org-wl-open' is called with two prefixes Org asks for the
|
||||
search index to use.
|
||||
|
||||
Thanks to David Maus for these changes.
|
||||
|
||||
*** Org-babel: code block body expansion for table and preview
|
||||
|
||||
In org-babel, code is "expanded" prior to evaluation. I.e. the
|
||||
code that is actually evaluated comprises the code block
|
||||
contents, augmented with the extra code which assigns the
|
||||
referenced data to variables. It is now possible to preview
|
||||
expanded contents, and also to expand code during during
|
||||
tangling. This expansion takes into account all header arguments,
|
||||
and variables.
|
||||
|
||||
A new key-binding C-c M-b p bound to
|
||||
`org-babel-expand-src-block' can be used from inside of a
|
||||
source code block to preview its expanded contents (which can
|
||||
be very useful for debugging). tangling
|
||||
|
||||
The expanded body can now be tangled, this includes variable
|
||||
values which may be the results of other source-code blocks, or
|
||||
stored in headline properties or tables. One possible use for
|
||||
this is to allow those using org-babel for their emacs
|
||||
initialization to store values (e.g. usernames, passwords,
|
||||
etc…) in headline properties or in tables.
|
||||
|
||||
Org-babel now supports three new header arguments, and new
|
||||
default behavior for handling horizontal lines in tables
|
||||
(hlines), column names, and rownames across all languages.
|
||||
|
||||
|
||||
* Version 6.35
|
||||
:PROPERTIES:
|
||||
:CUSTOM_ID: v6.35
|
||||
:END:
|
||||
|
||||
@ -433,7 +513,7 @@ Extension: \.pdf::\([0-9]+\)\'
|
||||
Command: evince "%s" -p %1
|
||||
#+end_example
|
||||
|
||||
Thanks to Jan Böcker for a patch to this effect.
|
||||
Thanks to Jan Böcker for a patch to this effect.
|
||||
|
||||
** Clocking
|
||||
|
||||
@ -535,7 +615,7 @@ So when you are prompted for a date, you can now answer like this
|
||||
|
||||
There is now only a single free timer supported by org-timer.el.
|
||||
Thanks to Bastien for cleaning this up, after a bug report in
|
||||
this area by Frédéric Couchet.
|
||||
this area by Frédéric Couchet.
|
||||
|
||||
*** Remember: Allow to file as sibling of current clock
|
||||
|
||||
@ -574,7 +654,7 @@ around org-babel.
|
||||
evaluated.
|
||||
- No longer adding extension during tangling when filename is
|
||||
provided.
|
||||
Thanks to Martin G. Skjæveland and Nicolas Girard for prompting this.
|
||||
Thanks to Martin G. Skjæveland and Nicolas Girard for prompting this.
|
||||
- Added `org-babel-execute-hook' which runs after code block
|
||||
execution.
|
||||
- Working directories and remote execution
|
||||
@ -594,7 +674,7 @@ around org-babel.
|
||||
if found will execute on the remote machine in the specified
|
||||
remote directory.
|
||||
- Tramp syntax can be used to tangle to remote files.
|
||||
Thanks to Maurizio Vitale and Rémi Vanicat.
|
||||
Thanks to Maurizio Vitale and Rémi Vanicat.
|
||||
- org-R removed from contrib.
|
||||
- gnuplot can now return it's string output -- when session is
|
||||
set to "none".
|
||||
@ -648,7 +728,7 @@ call function to do something special with text links.
|
||||
|
||||
Thanks to Paul Sexton for this contribution.
|
||||
|
||||
**** Add Jan Böcker's org-docview.el
|
||||
**** Add Jan Böcker's org-docview.el
|
||||
|
||||
This new module allows links to various file types using docview,
|
||||
where Emacs displays images of document pages. Docview link
|
||||
@ -657,7 +737,7 @@ page 131 of the Org-mode manual:
|
||||
|
||||
: [[docview:~/.elisp/org/doc/org.pdf::131][Org-Mode Manual]]
|
||||
|
||||
Thanks to Jan Böcker for this contribution.
|
||||
Thanks to Jan Böcker for this contribution.
|
||||
|
||||
**** New link types that force special ways of opening the file
|
||||
|
||||
|
||||
@ -122,9 +122,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
|
||||
- <2009-12-15 Tue>: iPhone App [[http://mobileorg.ncogni.to/][MobileOrg]] version 1.1 available
|
||||
- <2009-11-13 Fri>: Release 6.33
|
||||
|
||||
* Current Version (6.35i)
|
||||
* Current Version (6.36)
|
||||
|
||||
The current version is 6.35i. To see what has changed in recent
|
||||
The current version is 6.36. To see what has changed in recent
|
||||
releases, check this detailed list of [[file:Changes.html][user-visible changes]].
|
||||
|
||||
This package works on Emacs 23 and 22, and (with minor restrictions)
|
||||
@ -136,7 +136,7 @@ recent version, but may lag a bit behind the website release.
|
||||
|
||||
** The standard distribution
|
||||
|
||||
Download as [[file:org-6.35i.zip][zip file]] or [[file:org-6.35i.tar.gz][gzipped tar archive]]. These archives contain
|
||||
Download as [[file:org-6.36.zip][zip file]] or [[file:org-6.36.tar.gz][gzipped tar archive]]. These archives contain
|
||||
both the Lisp file org.el and the documentation in PDF and (TeX)Info
|
||||
formats. Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]].
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
The is a distribution of Org, a plain text notes and project planning
|
||||
tool for Emacs.
|
||||
|
||||
The version of this release is: 6.35trans
|
||||
The version of this release is: 6.36trans
|
||||
|
||||
The homepage of Org is at http://orgmode.org
|
||||
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
2010-05-08 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* orgcard.tex: Document inline image toggling.
|
||||
|
||||
* org.texi (Handling links): Document inline image toggling.
|
||||
|
||||
2010-05-07 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org.texi (Updating the table): Document new buffer-wide
|
||||
table commands.
|
||||
|
||||
2010-04-26 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org.texi (Conflicts): Document new work-around for windmove.el.
|
||||
|
||||
23
doc/org.texi
23
doc/org.texi
@ -3,8 +3,8 @@
|
||||
@setfilename ../../info/org
|
||||
@settitle The Org Manual
|
||||
|
||||
@set VERSION 6.35trans
|
||||
@set DATE April 2010
|
||||
@set VERSION 6.36trans
|
||||
@set DATE May 2010
|
||||
|
||||
@c Version and Contact Info
|
||||
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage}
|
||||
@ -2466,6 +2466,11 @@ hline are left alone, assuming that these are part of the table header.
|
||||
Iterate the table by recomputing it until no further changes occur.
|
||||
This may be necessary if some computed fields use the value of other
|
||||
fields that are computed @i{later} in the calculation sequence.
|
||||
@item M-x org-table-recalculate-buffer-tables
|
||||
Recompute all tables in the current buffer.
|
||||
@item M-x org-table-iterate-buffer-tables
|
||||
Iterate all tables in the current buffer, in order to converge table-to-table
|
||||
dependencies.
|
||||
@end table
|
||||
|
||||
@node Advanced features, , Updating the table, The spreadsheet
|
||||
@ -2978,14 +2983,14 @@ to the current directory using @samp{../}. Otherwise an absolute path
|
||||
is used, if possible with @samp{~/} for your home directory. You can
|
||||
force an absolute path with two @kbd{C-u} prefixes.
|
||||
@c
|
||||
@item C-c C-l @r{(with cursor on existing link)}
|
||||
@item C-c C-l @ @r{(with cursor on existing link)}
|
||||
When the cursor is on an existing link, @kbd{C-c C-l} allows you to edit the
|
||||
link and description parts of the link.
|
||||
@c
|
||||
@cindex following links
|
||||
@kindex C-c C-o
|
||||
@kindex RET
|
||||
@item C-c C-o @r{or} @key{RET}
|
||||
@kindex @key{RET}
|
||||
@item C-c C-o @ @r{(or, if @code{org-return-follows-link} is set, also} @key{RET}
|
||||
@vindex org-file-apps
|
||||
Open link at point. This will launch a web browser for URLs (using
|
||||
@command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
|
||||
@ -3016,6 +3021,14 @@ Like @kbd{mouse-2}, but force file links to be opened with Emacs, and
|
||||
internal links to be displayed in another window@footnote{See the
|
||||
variable @code{org-display-internal-link-with-indirect-buffer}}.
|
||||
@c
|
||||
@cindex inlining images
|
||||
@cindex images, inlining
|
||||
@kindex C-c C-x C-v
|
||||
@item C-c C-x C-v
|
||||
Toggle the inline display of linked images. Normally this will only inline
|
||||
images that have no description part in the link, i.e. images that will also
|
||||
be inlined during export. When called with a prefix argument, also display
|
||||
images that do have a link description.
|
||||
@cindex mark ring
|
||||
@kindex C-c %
|
||||
@item C-c %
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
% Reference Card for Org Mode
|
||||
\def\orgversionnumber{6.35trans}
|
||||
\def\orgversionnumber{6.36trans}
|
||||
\def\versionyear{2010} % latest update
|
||||
\def\year{2010} % latest copyright year
|
||||
|
||||
@ -442,6 +442,7 @@ formula, \kbd{:=} a field formula.
|
||||
\key{find next link}{C-c C-x C-n}
|
||||
\key{find previous link}{C-c C-x C-p}
|
||||
\key{edit code snippet of file at point}{C-c '}
|
||||
\key{toggle inline display of linked images}{C-c C-x C-v}
|
||||
|
||||
{\bf Internal Links}
|
||||
|
||||
@ -749,8 +750,8 @@ your own key as shown under INSTALLATION.
|
||||
$^2$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line,
|
||||
press \kbd{C-c C-c} with the cursor still in the line to update.
|
||||
|
||||
$^3$ Keybinding affected by {\tt org-support-shift-select} and {\tt
|
||||
org-replace-disputed-keys}.
|
||||
$^3$ Keybinding affected by {\tt org-support-shift-select} and
|
||||
{\tt org-replace-disputed-keys}.
|
||||
|
||||
\copyrightnotice
|
||||
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
2010-05-09 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org.el (org-sparse-tree): Make `C-c / t' search for all TODO
|
||||
keywords, and `C-c / T' for a specific one.
|
||||
|
||||
2010-05-08 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org.el (org-mode): Fix comment syntax settings.
|
||||
|
||||
* org-src.el (org-edit-src-allow-write-back-p): Define
|
||||
variable.
|
||||
|
||||
* org.el (org-inline-image-overlays): New variable.
|
||||
(org-toggle-inline-images, org-display-inline-images)
|
||||
(org-remove-inline-images): New commands.
|
||||
(org-mode-map): Define a key for `org-toggle-inline-images'.
|
||||
|
||||
2010-05-08 David Maus <dmaus@ictsoc.de>
|
||||
|
||||
* org-wl.el (org-wl-message-field): New function. Return
|
||||
content of header field in message entity.
|
||||
(org-wl-store-link): Call `org-wl-store-link-folder' or
|
||||
`org-wl-store-link-message' depending on major-mode.
|
||||
(org-wl-store-link-folder): New function. Store link to
|
||||
Wanderlust folder.
|
||||
(org-wl-store-link-message): New function. Store link to
|
||||
Wanderlust message.
|
||||
(org-wl-store-link-message): Store link to message while
|
||||
visiting message.
|
||||
(org-wl-open): Don't try to jump to message when opening a
|
||||
folder link.
|
||||
|
||||
2010-05-08 David Maus <dmaus@ictsoc.de>
|
||||
|
||||
* org.el (org-replace-escapes): Avoid infinite loop when
|
||||
replace string contains escape sequence it replaces.
|
||||
|
||||
2010-05-08 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org-crypt.el (org-crypt-key-for-heading): Use symmetric
|
||||
encryption when now key is set.
|
||||
|
||||
2010-05-07 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org-table.el (org-table-recalculate-buffer-tables)
|
||||
(org-table-iterate-buffer-tables): New commands.
|
||||
|
||||
* org.el (org-check-for-hidden): When there is a region, skip
|
||||
the check.
|
||||
|
||||
2010-05-02 Dan Davison <davison@stats.ox.ac.uk>
|
||||
|
||||
* org-src.el (org-edit-src-code): allow-write-back-p had
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: John Wiegley <johnw@newartisans.com>
|
||||
;; Keywords: org data task
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
;; Thomas Baumann <thomas dot baumann at ch dot tum dot de>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
;;
|
||||
;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;;
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
|
||||
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
|
||||
;; Keywords: org, wp, tex
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Bastien Guerry <bzg at altern dot org>
|
||||
;; Carsten Dominik <carsten dot dominik at gmail dot com>
|
||||
;; Keywords: org, wp, remember
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Emacs Lisp Archive Entry
|
||||
;; Filename: org-crypt.el
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;; Keywords: org-mode
|
||||
;; Author: John Wiegley <johnw@gnu.org>
|
||||
;; Maintainer: Peter Jones <pjones@pmade.com>
|
||||
@ -45,6 +45,7 @@
|
||||
;; decrypt it. This makes it possible to leave secure notes that
|
||||
;; only the intended recipient can read in a shared-org-mode-files
|
||||
;; scenario.
|
||||
;; If the key is not set, org-crypt will default to symmetric encryption.
|
||||
;;
|
||||
;; 3. To later decrypt an entry, use `org-decrypt-entries' or
|
||||
;; `org-decrypt-entry'. It might be useful to bind this to a key,
|
||||
@ -97,7 +98,7 @@ heading. This can also be overridden in the CRYPTKEY property."
|
||||
(or (org-entry-get nil "CRYPTKEY" 'selective)
|
||||
org-crypt-key
|
||||
(and (boundp 'epa-file-encrypt-to) epa-file-encrypt-to)
|
||||
(error "No crypt key set"))))
|
||||
(message "No crypt key set, using symmetric encryption."))))
|
||||
|
||||
(defun org-encrypt-entry ()
|
||||
"Encrypt the content of the current headline."
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;;; Version: 1.0
|
||||
|
||||
;; Keywords: org, wp
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Emacs Lisp Archive Entry
|
||||
;; Filename: org-docbook.el
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
|
||||
;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
|
||||
;; Keywords: org, wp, docbook
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Ulf Stegemann <ulf at zeitform dot de>
|
||||
;; Keywords: outlines, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;; Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Eric Schulte
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
;; Tassilo Horn <tassilo at member dot fsf dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: John Wiegley <johnw at gnu dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
|
||||
;; Keywords: erc, irc, link, org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Emacs Lisp Archive Entry
|
||||
;; Filename: org-latex.el
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;; Author: Bastien Guerry <bzg AT altern DOT org>
|
||||
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
|
||||
;; Keywords: org, wp, tex
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
;; Bastien Guerry <bzg AT altern DOT org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: John Wiegley <johnw@gnu.org>
|
||||
;; Christopher Suckling <suckling at gmail dot com>
|
||||
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
;;
|
||||
;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
|
||||
;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
|
||||
;; Keywords: tables, plotting
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
;; Author: Ross Patterson <me AT rpatterson DOT net>
|
||||
;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
|
||||
;; Keywords: org, emacsclient, wp
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: David O'Toole <dto@gnu.org>
|
||||
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
|
||||
;; Keywords: hypermedia, outlines, wp
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -402,6 +402,10 @@ This splices all the components into the list."
|
||||
(push p rtn)))
|
||||
(nreverse (org-publish-delete-dups (delq nil rtn)))))
|
||||
|
||||
|
||||
(defvar sitemap-alphabetically)
|
||||
(defvar sitemap-sort-folders)
|
||||
(defvar sitemap-ignore-case)
|
||||
(defun org-publish-compare-directory-files (a b)
|
||||
"Predicate for `sort', that sorts folders-first/last and
|
||||
eventually alphabetically."
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
;; Dan Davison <davison at stats dot ox dot ac dot uk>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -166,6 +166,7 @@ For example, there is no ocaml-mode in Emacs, but the mode to use is
|
||||
(define-key org-src-mode-map "\C-c'" 'org-edit-src-exit)
|
||||
(defvar org-edit-src-force-single-line nil)
|
||||
(defvar org-edit-src-from-org-mode nil)
|
||||
(defvar org-edit-src-allow-write-back-p nil)
|
||||
(defvar org-edit-src-picture nil)
|
||||
(defvar org-edit-src-beg-marker nil)
|
||||
(defvar org-edit-src-end-marker nil)
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -2685,6 +2685,36 @@ known that the table will be realigned a little later anyway."
|
||||
(throw 'exit t)))
|
||||
(error "No convergence after %d iterations" i))))
|
||||
|
||||
(defun org-table-recalculate-buffer-tables ()
|
||||
"Recalculate all tables in the current buffer."
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(save-restriction
|
||||
(widen)
|
||||
(org-table-map-tables (lambda () (org-table-recalculate t)) t))))
|
||||
|
||||
(defun org-table-iterate-buffer-tables ()
|
||||
"Iterate all tables in the buffer, to converge inter-table dependencies."
|
||||
(interactive)
|
||||
(let* ((imax 10)
|
||||
(checksum (md5 (buffer-string)))
|
||||
|
||||
c1
|
||||
(i imax))
|
||||
(save-excursion
|
||||
(save-restriction
|
||||
(widen)
|
||||
(catch 'exit
|
||||
(while (> i 0)
|
||||
(setq i (1- i))
|
||||
(org-table-map-tables (lambda () (org-table-recalculate t)) t)
|
||||
(if (equal checksum (setq c1 (md5 (buffer-string))))
|
||||
(progn
|
||||
(message "Convergence after %d iterations" (- imax i))
|
||||
(throw 'exit t))
|
||||
(setq checksum c1)))
|
||||
(error "No convergence after %d iterations" imax))))))
|
||||
|
||||
(defun org-table-formula-substitute-names (f)
|
||||
"Replace $const with values in string F."
|
||||
(let ((start 0) a (f1 f) (pp (/= (string-to-char f) ?')))
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
175
lisp/org-wl.el
175
lisp/org-wl.el
@ -7,7 +7,7 @@
|
||||
;; David Maus <dmaus at ictsoc dot de>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -86,9 +86,14 @@ googlegroups otherwise."
|
||||
(declare-function wl-summary-registered-temp-mark "ext:wl-action" (number))
|
||||
(declare-function wl-folder-goto-folder-subr "ext:wl-folder"
|
||||
(&optional folder sticky))
|
||||
(declare-function wl-folder-get-petname "ext:wl-folder" (name))
|
||||
(declare-function wl-folder-get-entity-from-buffer "ext:wl-folder"
|
||||
(&optional getid))
|
||||
(declare-function wl-folder-buffer-group-p "ext:wl-folder")
|
||||
(defvar wl-init)
|
||||
(defvar wl-summary-buffer-elmo-folder)
|
||||
(defvar wl-summary-buffer-folder-name)
|
||||
(defvar wl-folder-group-regexp)
|
||||
|
||||
(defconst org-wl-folder-types
|
||||
'(("%" . imap) ("-" . nntp) ("+" . mh) ("=" . spool)
|
||||
@ -96,7 +101,6 @@ googlegroups otherwise."
|
||||
("*" . multi) ("/" . filter) ("|" . pipe) ("'" . internal))
|
||||
"List of folder indicators. See Wanderlust manual, section 3.")
|
||||
|
||||
|
||||
;; Install the link type
|
||||
(org-add-link-type "wl" 'org-wl-open)
|
||||
(add-hook 'org-store-link-functions 'org-wl-store-link)
|
||||
@ -123,79 +127,102 @@ folder name determines the the folder type."
|
||||
nil))))
|
||||
type))
|
||||
|
||||
(defun org-wl-message-field (field entity)
|
||||
"Return content of FIELD in ENTITY.
|
||||
FIELD is a symbol of a rfc822 message header field.
|
||||
ENTITY is a message entity."
|
||||
(let ((content (elmo-message-entity-field entity field)))
|
||||
(if (listp content) (car content) content)))
|
||||
|
||||
(defun org-wl-store-link ()
|
||||
"Store a link to a WL folder or message."
|
||||
(when (eq major-mode 'wl-summary-mode)
|
||||
(let* ((msgnum (wl-summary-message-number))
|
||||
(mark-info (wl-summary-registered-temp-mark msgnum))
|
||||
(folder-name
|
||||
(if (and org-wl-link-to-refile-destination
|
||||
mark-info
|
||||
(equal (nth 1 mark-info) "o")) ; marked as refile
|
||||
(nth 2 mark-info)
|
||||
wl-summary-buffer-folder-name))
|
||||
(folder-type (org-wl-folder-type folder-name))
|
||||
(message-id (elmo-message-field wl-summary-buffer-elmo-folder
|
||||
msgnum 'message-id))
|
||||
(wl-message-entity
|
||||
(if (fboundp 'elmo-message-entity)
|
||||
(elmo-message-entity
|
||||
wl-summary-buffer-elmo-folder msgnum)
|
||||
(elmo-msgdb-overview-get-entity
|
||||
msgnum (wl-summary-buffer-msgdb))))
|
||||
(from (let ((from-field (elmo-message-entity-field wl-message-entity
|
||||
'from)))
|
||||
(if (listp from-field)
|
||||
(car from-field)
|
||||
from-field)))
|
||||
(to (let ((to-field (elmo-message-entity-field wl-message-entity
|
||||
'to)))
|
||||
(if (listp to-field)
|
||||
(car to-field)
|
||||
to-field)))
|
||||
(xref (let ((xref-field (elmo-message-entity-field wl-message-entity
|
||||
'xref)))
|
||||
(if (listp xref-field)
|
||||
(car xref-field)
|
||||
xref-field)))
|
||||
(subject (let (wl-thr-indent-string wl-parent-message-entity)
|
||||
(wl-summary-line-subject)))
|
||||
desc link)
|
||||
"Store a link to a WL message or folder."
|
||||
(cond
|
||||
((memq major-mode '(wl-summary-mode mime-view-mode))
|
||||
(org-wl-store-link-message))
|
||||
((eq major-mode 'wl-folder-mode)
|
||||
(org-wl-store-link-folder))
|
||||
(t
|
||||
nil)))
|
||||
|
||||
;; remove text properties of subject string to avoid possible bug
|
||||
;; when formatting the subject
|
||||
;; (Emacs bug #5306, fixed)
|
||||
(set-text-properties 0 (length subject) nil subject)
|
||||
(defun org-wl-store-link-folder ()
|
||||
"Store a link to a WL folder."
|
||||
(let* ((folder (wl-folder-get-entity-from-buffer))
|
||||
(petname (wl-folder-get-petname folder))
|
||||
(link (org-make-link "wl:" folder)))
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(if (and (wl-folder-buffer-group-p)
|
||||
(looking-at wl-folder-group-regexp))
|
||||
(error "Cannot store link to folder group: %s" folder))
|
||||
(org-store-link-props :type "wl" :description petname
|
||||
:link link)
|
||||
link)))
|
||||
|
||||
;; maybe remove filter condition
|
||||
(when (and (eq folder-type 'filter) org-wl-link-remove-filter)
|
||||
(while (eq (org-wl-folder-type folder-name) 'filter)
|
||||
(setq folder-name
|
||||
(replace-regexp-in-string "^/[^/]+/" "" folder-name))))
|
||||
(defun org-wl-store-link-message ()
|
||||
"Store a link to a WL message."
|
||||
(save-excursion
|
||||
(let ((buf (if (eq major-mode 'wl-summary-mode)
|
||||
(current-buffer)
|
||||
(and (boundp 'wl-message-buffer-cur-summary-buffer)
|
||||
wl-message-buffer-cur-summary-buffer))))
|
||||
(when buf
|
||||
(with-current-buffer buf
|
||||
(let* ((msgnum (wl-summary-message-number))
|
||||
(mark-info (wl-summary-registered-temp-mark msgnum))
|
||||
(folder-name
|
||||
(if (and org-wl-link-to-refile-destination
|
||||
mark-info
|
||||
(equal (nth 1 mark-info) "o")) ; marked as refile
|
||||
(nth 2 mark-info)
|
||||
wl-summary-buffer-folder-name))
|
||||
(folder-type (org-wl-folder-type folder-name))
|
||||
(wl-message-entity
|
||||
(if (fboundp 'elmo-message-entity)
|
||||
(elmo-message-entity
|
||||
wl-summary-buffer-elmo-folder msgnum)
|
||||
(elmo-msgdb-overview-get-entity
|
||||
msgnum (wl-summary-buffer-msgdb))))
|
||||
(message-id (org-wl-message-field 'message-id wl-message-entity))
|
||||
(from (org-wl-message-field 'from wl-message-entity))
|
||||
(to (org-wl-message-field 'to wl-message-entity))
|
||||
(xref (org-wl-message-field 'xref wl-message-entity))
|
||||
(subject (org-wl-message-field 'subject wl-message-entity))
|
||||
desc link)
|
||||
|
||||
;; maybe create http link
|
||||
(cond
|
||||
((and (eq folder-type 'shimbun) org-wl-shimbun-prefer-web-links xref)
|
||||
(org-store-link-props :type "http" :link xref :description subject
|
||||
:from from :to to :message-id message-id
|
||||
:subject subject))
|
||||
((and (eq folder-type 'nntp) org-wl-nntp-prefer-web-links)
|
||||
(setq link (format
|
||||
(if (string-match "gmane\\." folder-name)
|
||||
"http://mid.gmane.org/%s"
|
||||
"http://groups.google.com/groups/search?as_umsgid=%s")
|
||||
(org-fixup-message-id-for-http message-id)))
|
||||
(org-store-link-props :type "http" :link link :description subject
|
||||
:from from :to to :message-id message-id
|
||||
:subject subject))
|
||||
(t
|
||||
(org-store-link-props :type "wl" :from from :to to
|
||||
:subject subject :message-id message-id)
|
||||
(setq message-id (org-remove-angle-brackets message-id))
|
||||
(setq desc (org-email-link-description))
|
||||
(setq link (org-make-link "wl:" folder-name "#" message-id))
|
||||
(org-add-link-props :link link :description desc)))
|
||||
(or link xref))))
|
||||
;; remove text properties of subject string to avoid possible bug
|
||||
;; when formatting the subject
|
||||
;; (Emacs bug #5306, fixed)
|
||||
(set-text-properties 0 (length subject) nil subject)
|
||||
|
||||
;; maybe remove filter condition
|
||||
(when (and (eq folder-type 'filter) org-wl-link-remove-filter)
|
||||
(while (eq (org-wl-folder-type folder-name) 'filter)
|
||||
(setq folder-name
|
||||
(replace-regexp-in-string "^/[^/]+/" "" folder-name))))
|
||||
|
||||
;; maybe create http link
|
||||
(cond
|
||||
((and (eq folder-type 'shimbun) org-wl-shimbun-prefer-web-links xref)
|
||||
(org-store-link-props :type "http" :link xref :description subject
|
||||
:from from :to to :message-id message-id
|
||||
:subject subject))
|
||||
((and (eq folder-type 'nntp) org-wl-nntp-prefer-web-links)
|
||||
(setq link (format
|
||||
(if (string-match "gmane\\." folder-name)
|
||||
"http://mid.gmane.org/%s"
|
||||
"http://groups.google.com/groups/search?as_umsgid=%s")
|
||||
(org-fixup-message-id-for-http message-id)))
|
||||
(org-store-link-props :type "http" :link link :description subject
|
||||
:from from :to to :message-id message-id
|
||||
:subject subject))
|
||||
(t
|
||||
(org-store-link-props :type "wl" :from from :to to
|
||||
:subject subject :message-id message-id)
|
||||
(setq message-id (org-remove-angle-brackets message-id))
|
||||
(setq desc (org-email-link-description))
|
||||
(setq link (org-make-link "wl:" folder-name "#" message-id))
|
||||
(org-add-link-props :link link :description desc)))
|
||||
(or link xref)))))))
|
||||
|
||||
(defun org-wl-open (path)
|
||||
"Follow the WL message link specified by PATH.
|
||||
@ -228,9 +255,9 @@ for namazu index."
|
||||
;; beginning of the current line. So, restore the point
|
||||
;; in the old buffer.
|
||||
(goto-char old-point))
|
||||
(and (wl-summary-jump-to-msg-by-message-id (org-add-angle-brackets
|
||||
article))
|
||||
(wl-summary-redisplay)))))
|
||||
(and article (wl-summary-jump-to-msg-by-message-id (org-add-angle-brackets
|
||||
article))
|
||||
(wl-summary-redisplay)))))
|
||||
|
||||
(provide 'org-wl)
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
||||
108
lisp/org.el
108
lisp/org.el
@ -6,7 +6,7 @@
|
||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||
;; Keywords: outlines, hypermedia, calendar, wp
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 6.35trans
|
||||
;; Version: 6.36trans
|
||||
;;
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
@ -108,7 +108,7 @@
|
||||
|
||||
;;; Version
|
||||
|
||||
(defconst org-version "6.35trans"
|
||||
(defconst org-version "6.36trans"
|
||||
"The version number of the file org.el.")
|
||||
|
||||
(defun org-version (&optional here)
|
||||
@ -1295,8 +1295,7 @@ implementation is bad."
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom org-return-follows-link nil
|
||||
"Non-nil means on links RET will follow the link.
|
||||
Needs to be set before org.el is loaded."
|
||||
"Non-nil means on links RET will follow the link."
|
||||
:group 'org-link-follow
|
||||
:type 'boolean)
|
||||
|
||||
@ -4422,7 +4421,6 @@ The following commands are available:
|
||||
(org-set-tag-faces 'org-tag-faces org-tag-faces))
|
||||
;; Calc embedded
|
||||
(org-set-local 'calc-embedded-open-mode "# ")
|
||||
(modify-syntax-entry ?# "<")
|
||||
(modify-syntax-entry ?@ "w")
|
||||
(if org-startup-truncated (setq truncate-lines t))
|
||||
(org-set-local 'font-lock-unfontify-region-function
|
||||
@ -4451,8 +4449,10 @@ The following commands are available:
|
||||
'org-block-todo-from-checkboxes))
|
||||
|
||||
;; Comment characters
|
||||
; (org-set-local 'comment-start "#") ;; FIXME: this breaks wrapping
|
||||
(org-set-local 'comment-start "#")
|
||||
(org-set-local 'comment-padding " ")
|
||||
(modify-syntax-entry ?# "<")
|
||||
(modify-syntax-entry ?\n ">")
|
||||
|
||||
;; Align options lines
|
||||
(org-set-local
|
||||
@ -11402,7 +11402,8 @@ POS may also be a marker."
|
||||
This command can create sparse trees. You first need to select the type
|
||||
of match used to create the tree:
|
||||
|
||||
t Show entries with a specific TODO keyword.
|
||||
t Show all TODO entries.
|
||||
T Show entries with a specific TODO keyword.
|
||||
m Show entries selected by a tags/property match.
|
||||
p Enter a property name and its value (both with completion on existing
|
||||
names/values) and show entries with that property.
|
||||
@ -11412,7 +11413,7 @@ b Show deadlines and scheduled items before a date.
|
||||
a Show deadlines and scheduled items after a date."
|
||||
(interactive "P")
|
||||
(let (ans kwd value)
|
||||
(message "Sparse tree: [/]regexp [t]odo-kwd [m]atch [p]roperty [d]eadlines [b]efore-date [a]fter-date")
|
||||
(message "Sparse tree: [/]regexp [t]odo [T]odo-kwd [m]atch [p]roperty [d]eadlines\n [b]efore-date [a]fter-date")
|
||||
(setq ans (read-char-exclusive))
|
||||
(cond
|
||||
((equal ans ?d)
|
||||
@ -11422,6 +11423,8 @@ a Show deadlines and scheduled items after a date."
|
||||
((equal ans ?a)
|
||||
(call-interactively 'org-check-after-date))
|
||||
((equal ans ?t)
|
||||
(org-show-todo-tree nil))
|
||||
((equal ans ?T)
|
||||
(org-show-todo-tree '(4)))
|
||||
((member ans '(?T ?m))
|
||||
(call-interactively 'org-match-sparse-tree))
|
||||
@ -15463,6 +15466,52 @@ SNIPPETS-P indicates if this is run to create snippet images for HTML."
|
||||
"Return string to be used as color value for an RGB component."
|
||||
(format "%g" (/ value 65535.0)))
|
||||
|
||||
;; Image display
|
||||
|
||||
|
||||
(defvar org-inline-image-overlays nil)
|
||||
(make-variable-buffer-local 'org-inline-image-overlays)
|
||||
|
||||
(defun org-toggle-inline-images (&optional include-linked)
|
||||
"Toggle the display of inline images.
|
||||
INCLUDE-LINKED is passed to `org-display-inline-images'."
|
||||
(interactive "P")
|
||||
(if org-inline-image-overlays
|
||||
(progn
|
||||
(org-remove-inline-images)
|
||||
(message "Inline image display turned off"))
|
||||
(org-display-inline-images include-linked)
|
||||
(if org-inline-image-overlays
|
||||
(message "%d images displayed inline"
|
||||
(length org-inline-image-overlays))
|
||||
(message "No images to display inline"))))
|
||||
|
||||
(defun org-display-inline-images (&optional include-linked)
|
||||
"Display inline images.
|
||||
Normally only links without a description part are inlined, because this
|
||||
is how it will work for export. When INCLUDE-LINKED is set, also links
|
||||
with a description part will be inlined."
|
||||
(interactive "P")
|
||||
(org-remove-inline-images)
|
||||
(goto-char (point-min))
|
||||
(let ((re (concat "\\[\\[\\(file:\\|\\./\\)\\(~?" "[-+./_0-9a-zA-Z]+"
|
||||
(substring (org-image-file-name-regexp) 0 -2)
|
||||
"\\)\\]" (if include-linked "" "\\]")))
|
||||
file ov)
|
||||
(while (re-search-forward re nil t)
|
||||
(setq file (expand-file-name (match-string 2)))
|
||||
(when (file-exists-p file)
|
||||
(setq ov (make-overlay (match-beginning 0) (match-end 0)))
|
||||
(overlay-put ov 'display (create-image file))
|
||||
(overlay-put ov 'face 'default)
|
||||
(push ov org-inline-image-overlays)))))
|
||||
|
||||
(defun org-remove-inline-images ()
|
||||
"Remove inline display of images."
|
||||
(interactive)
|
||||
(mapc 'delete-overlay org-inline-image-overlays)
|
||||
(setq org-inline-image-overlays nil))
|
||||
|
||||
;;;; Key bindings
|
||||
|
||||
;; Make `C-c C-x' a prefix key
|
||||
@ -15632,6 +15681,7 @@ SNIPPETS-P indicates if this is run to create snippet images for HTML."
|
||||
(org-defkey org-mode-map "\C-c\C-x\C-r" 'org-clock-report)
|
||||
(org-defkey org-mode-map "\C-c\C-x\C-u" 'org-dblock-update)
|
||||
(org-defkey org-mode-map "\C-c\C-x\C-l" 'org-preview-latex-fragment)
|
||||
(org-defkey org-mode-map "\C-c\C-x\C-v" 'org-toggle-inline-images)
|
||||
(org-defkey org-mode-map "\C-c\C-x\C-b" 'org-toggle-checkbox)
|
||||
(org-defkey org-mode-map "\C-c\C-xp" 'org-set-property)
|
||||
(org-defkey org-mode-map "\C-c\C-xe" 'org-set-effort)
|
||||
@ -16146,20 +16196,19 @@ this fucntion returns t, nil otherwise."
|
||||
beg end)
|
||||
(save-excursion
|
||||
(catch 'exit
|
||||
(if (org-region-active-p)
|
||||
(setq beg (region-beginning) end (region-end))
|
||||
(unless (org-region-active-p)
|
||||
(setq beg (point-at-bol))
|
||||
(beginning-of-line 2)
|
||||
(while (and (not (eobp)) ;; this is like `next-line'
|
||||
(get-char-property (1- (point)) 'invisible))
|
||||
(beginning-of-line 2))
|
||||
(setq end (point)))
|
||||
(goto-char beg)
|
||||
(goto-char (point-at-eol))
|
||||
(setq end (max end (point)))
|
||||
(while (re-search-forward re end t)
|
||||
(if (get-char-property (match-beginning 0) 'invisible)
|
||||
(throw 'exit t)))
|
||||
(setq end (point))
|
||||
(goto-char beg)
|
||||
(goto-char (point-at-eol))
|
||||
(setq end (max end (point)))
|
||||
(while (re-search-forward re end t)
|
||||
(if (get-char-property (match-beginning 0) 'invisible)
|
||||
(throw 'exit t))))
|
||||
nil))))
|
||||
|
||||
(defun org-metaup (&optional arg)
|
||||
@ -17645,17 +17694,27 @@ TABLE is an association list with keys like \"%a\" and string values.
|
||||
The sequences in STRING may contain normal field width and padding information,
|
||||
for example \"%-5s\". Replacements happen in the sequence given by TABLE,
|
||||
so values can contain further %-escapes if they are define later in TABLE."
|
||||
(let ((case-fold-search nil)
|
||||
e re rpl)
|
||||
(while (setq e (pop table))
|
||||
(let ((tbl (copy-alist table))
|
||||
(case-fold-search nil)
|
||||
(pchg 0)
|
||||
e re rpl)
|
||||
(while (setq e (pop tbl))
|
||||
(setq re (concat "%-?[0-9.]*" (substring (car e) 1)))
|
||||
(when (string-match re (cdr e))
|
||||
(let ((sref (substring (cdr e) (match-beginning 0) (match-end 0)))
|
||||
(safe "SREF"))
|
||||
(add-text-properties 0 3 (list 'sref sref) safe)
|
||||
(setcdr e (replace-match safe t t (cdr e)))))
|
||||
(while (string-match re string)
|
||||
(setq rpl (format (concat (substring (match-string 0 string) 0 -1) "s")
|
||||
(cdr e)))
|
||||
(setq string (replace-match rpl t t string))))
|
||||
(setq rpl (format (concat (substring (match-string 0 string) 0 -1) "s")
|
||||
(cdr e)))
|
||||
(setq string (replace-match rpl t t string))))
|
||||
(while (setq pchg (next-property-change pchg string))
|
||||
(let ((sref (get-text-property pchg 'sref string)))
|
||||
(when (and sref (string-match "SREF" string pchg))
|
||||
(setq string (replace-match sref t t string)))))
|
||||
string))
|
||||
|
||||
|
||||
(defun org-sublist (list start end)
|
||||
"Return a section of LIST, from START to END.
|
||||
Counting starts at 1."
|
||||
@ -18627,7 +18686,6 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
|
||||
(add-hook 'speedbar-visiting-tag-hook
|
||||
(lambda () (and (org-mode-p) (org-show-context 'org-goto))))))
|
||||
|
||||
|
||||
;;; Fixes and Hacks for problems with other packages
|
||||
|
||||
;; Make flyspell not check words in links, to not mess up our keymap
|
||||
|
||||
Loading…
Reference in New Issue
Block a user