summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-10-29 02:10:18 -0600
committerEric Schulte <schulte.eric@gmail.com>2010-10-29 02:10:18 -0600
commit93600e41a687e260a788663af8825d8830b97df9 (patch)
tree7d771e8040770861f6ff3262c891077012496524
parentc6565eaa43d398f6771edd59c2bfe7ca54e4a93e (diff)
parent82af72eef735fb6241d41d2961a8206b2507bf20 (diff)
downloadorg-mode-93600e41a687e260a788663af8825d8830b97df9.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--Makefile6
-rw-r--r--ORGWEBPAGE/Changes.org353
-rw-r--r--ORGWEBPAGE/index.org16
-rw-r--r--README_DIST2
-rw-r--r--README_maintainer85
-rwxr-xr-xUTILITIES/make_emacs_changelog55
-rw-r--r--doc/org.texi13
-rw-r--r--doc/orgcard.tex2
-rw-r--r--doc/orgguide.texi4
-rw-r--r--lisp/ob-C.el2
-rw-r--r--lisp/ob-R.el2
-rw-r--r--lisp/ob-asymptote.el2
-rw-r--r--lisp/ob-clojure.el2
-rw-r--r--lisp/ob-comint.el2
-rw-r--r--lisp/ob-css.el2
-rw-r--r--lisp/ob-ditaa.el2
-rw-r--r--lisp/ob-dot.el2
-rw-r--r--lisp/ob-emacs-lisp.el2
-rw-r--r--lisp/ob-eval.el2
-rw-r--r--lisp/ob-exp.el2
-rw-r--r--lisp/ob-gnuplot.el2
-rw-r--r--lisp/ob-haskell.el2
-rw-r--r--lisp/ob-js.el2
-rw-r--r--lisp/ob-keys.el2
-rw-r--r--lisp/ob-latex.el2
-rw-r--r--lisp/ob-ledger.el2
-rw-r--r--lisp/ob-lisp.el2
-rw-r--r--lisp/ob-lob.el2
-rw-r--r--lisp/ob-matlab.el2
-rw-r--r--lisp/ob-mscgen.el2
-rw-r--r--lisp/ob-ocaml.el2
-rw-r--r--lisp/ob-octave.el2
-rw-r--r--lisp/ob-org.el2
-rw-r--r--lisp/ob-perl.el2
-rw-r--r--lisp/ob-plantuml.el2
-rw-r--r--lisp/ob-python.el2
-rw-r--r--lisp/ob-ref.el2
-rw-r--r--lisp/ob-ruby.el2
-rw-r--r--lisp/ob-sass.el2
-rw-r--r--lisp/ob-scheme.el2
-rw-r--r--lisp/ob-screen.el2
-rw-r--r--lisp/ob-sh.el2
-rw-r--r--lisp/ob-sql.el2
-rw-r--r--lisp/ob-sqlite.el2
-rw-r--r--lisp/ob-table.el2
-rw-r--r--lisp/ob-tangle.el2
-rw-r--r--lisp/ob.el2
-rw-r--r--lisp/org-agenda.el2
-rw-r--r--lisp/org-archive.el2
-rw-r--r--lisp/org-ascii.el2
-rw-r--r--lisp/org-attach.el2
-rw-r--r--lisp/org-bbdb.el2
-rw-r--r--lisp/org-beamer.el2
-rw-r--r--lisp/org-bibtex.el2
-rw-r--r--lisp/org-capture.el2
-rw-r--r--lisp/org-clock.el8
-rw-r--r--lisp/org-colview-xemacs.el2
-rw-r--r--lisp/org-colview.el2
-rw-r--r--lisp/org-compat.el2
-rw-r--r--lisp/org-crypt.el2
-rw-r--r--lisp/org-ctags.el4
-rw-r--r--lisp/org-datetree.el2
-rw-r--r--lisp/org-docbook.el2
-rw-r--r--lisp/org-docview.el2
-rw-r--r--lisp/org-entities.el2
-rw-r--r--lisp/org-exp-blocks.el2
-rw-r--r--lisp/org-exp.el9
-rw-r--r--lisp/org-faces.el2
-rw-r--r--lisp/org-feed.el2
-rw-r--r--lisp/org-footnote.el2
-rw-r--r--lisp/org-freemind.el2
-rw-r--r--lisp/org-gnus.el2
-rw-r--r--lisp/org-habit.el2
-rw-r--r--lisp/org-html.el2
-rw-r--r--lisp/org-icalendar.el2
-rw-r--r--lisp/org-id.el2
-rw-r--r--lisp/org-indent.el2
-rw-r--r--lisp/org-info.el2
-rw-r--r--lisp/org-inlinetask.el2
-rw-r--r--lisp/org-irc.el2
-rw-r--r--lisp/org-jsinfo.el2
-rw-r--r--lisp/org-latex.el43
-rw-r--r--lisp/org-list.el2
-rw-r--r--lisp/org-mac-message.el2
-rw-r--r--lisp/org-macs.el2
-rw-r--r--lisp/org-mew.el2
-rw-r--r--lisp/org-mhe.el2
-rw-r--r--lisp/org-mks.el2
-rw-r--r--lisp/org-mobile.el2
-rw-r--r--lisp/org-mouse.el2
-rw-r--r--lisp/org-plot.el2
-rw-r--r--lisp/org-protocol.el2
-rw-r--r--lisp/org-publish.el2
-rw-r--r--lisp/org-remember.el2
-rw-r--r--lisp/org-rmail.el2
-rw-r--r--lisp/org-src.el2
-rw-r--r--lisp/org-table.el2
-rw-r--r--lisp/org-taskjuggler.el2
-rw-r--r--lisp/org-timer.el2
-rw-r--r--lisp/org-vm.el2
-rw-r--r--lisp/org-w3m.el2
-rw-r--r--lisp/org-wl.el2
-rw-r--r--lisp/org-xoxo.el2
-rw-r--r--lisp/org.el4
104 files changed, 545 insertions, 239 deletions
diff --git a/Makefile b/Makefile
index 7ee8d72..1099c32 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ compile: $(ELCFILES0) $(ELCBFILES)
install: install-lisp
-doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf
+doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
p:
${MAKE} pdf && open doc/org.pdf
@@ -311,7 +311,7 @@ release:
rm org-$(TAG)*.zip
rm org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG)
- git push origin maint
+ git push -f origin maint
git checkout master
git merge -s ours maint
UTILITIES/set-version.pl -o $(TAG)
@@ -340,7 +340,7 @@ fixrelease:
rm org-$(TAG)*.zip
rm org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG)
- git push origin maint
+ git push -f origin maint
git checkout master
git merge -s ours maint
UTILITIES/set-version.pl -o $(TAG)
diff --git a/ORGWEBPAGE/Changes.org b/ORGWEBPAGE/Changes.org
index 5b7ac5b..0fedff1 100644
--- a/ORGWEBPAGE/Changes.org
+++ b/ORGWEBPAGE/Changes.org
@@ -29,7 +29,240 @@ the root of the org-mode repository.
: git submodule update
Failure to update this repository will cause loading of
org-test.el to throw errors.
+
+*** Lists handling
+
+Due to changes made to lists, it is no longer possible to have a
+sublist, some text and then another sublist while still in the same
+top-level list item, like in the following situation:
+
+#+BEGIN_SRC org :exports code
+,- Some list
+, + A first sublist
+, + of two elements
+
+, A text belonging to the top-level list
+
+, + Then another sublist
+, + and a second element in it
+,- End of main list
+#+END_SRC
+
+Moreover, two variables are now obsolete, namely
+=org-provide-checkbox-statistics= and =org-auto-renumber-ordered-lists=.
+If you have changed default value of the former, you should have a
+look at the new variable =org-list-automatic-rules=, specifically at the
+checkbox rule. The latter has no equivalent, but a new way is provided
+to enforce some special numbering in a list. See [[* Plain lists changes][announcement]] below.
+
** Details
+*** Plain lists changes
+
+There is now two possibilities to end a plain list: either by
+indenting some text less than the last bullet of the list — like
+before, but now it now closes /all/ sublists in the process — or by
+specifying some regex — two blank lines, by default. All of this can
+be configured through =org-list-ending-method=, =org-list-end-regexp= and
+=org-empty-line-terminates-plain-lists=. This allows such constructs:
+
+#+BEGIN_SRC org :exports code
+,1. an ordered list
+,2. with two items
+
+
+,- another independent list
+,- of two items
+#+END_SRC
+
+Note that anyting inside a block (like example or src) isn't taken
+into consideration with regards to list ending.
+
+You can now enforce a special numbering in an ordered list with =[@num]=
+syntax, which generalizes the =[@start:num]= concept. It can be inserted
+in any item of the list, and exporters recognize it. Here is an
+example of what you can obtain:
+
+#+BEGIN_SRC org :exports code
+,2. [@2] I like
+,3. prime-numbered
+,5. [@5] lists
+#+END_SRC
+
+Cycling an item – using TAB — more than once just after its creation
+no longer moves it until it reaches the left margin. Now, all
+positions offered are meaningful in list's structure. Furthermore,
+indenting and outdenting items or subtrees within the list cannot
+break its integrity either.
+
+=org-insert-item=, when plain-list-item is set to auto in
+=org-blank-before-new-entry=, will apply some heuristics to insert the
+right number of blank lines, if any, after, or before, the newly
+created item. When no information is avalaible to take a guess, it
+will default to no blank line.
+
+=org-sort-list= sorts timer lists with t and T commands.
+
+Automatic actions are now taken by Org when some commands are issued.
+You can have a look at them and disable them individually with the
+help of the new variable =org-list-automatic-rules=.
+
+It is possible to change indentation of the whole list — it's, by the
+way, the only way to acheive this: indenting a region won't move lists
+— by using M-S-right and M-S-left when on its very first item. This
+global indentation has no influence on the text after the list:
+
+#+BEGIN_SRC org :exports code
+,You can have some text before a list.
+
+, - then a
+, - small list
+
+,And a text following the list, indented like if there was no list at
+,all.
+#+END_SRC
+
+Many bugfixes are included. For example, =org-cycle= on a list no longer
+swallows text after it and indenting a region containing a list
+shouldn't be problematic anymore. Some inconsistencies are also
+corrected. Thus, =org-cycle-list-bullet= will not offer "1." if you have
+disabled this kind of bullet by configuring
+=org-plain-list-ordered-item-terminator=.
+
+*** Implement MathJax support
+
+Org-mode now uses MathJax to display math on web pages. We serve
+MathJax from the orgmode.org server, at least for the time being
+(thanks Bastien!). If you are going to use this for pages which
+are viewd often, please install MathJax on your own webserver.
+
+To return to the old way of creating images and inserting them
+into web pages, you would have to set
+
+: (setq org-export-with-LaTeX-fragments 'dvipng)
+
+or on a per-file basis
+
+: #+OPTIONS: LaTeX:dvipng
+
+*** Add org-wikinodes.el as a contributed package
+
+One frequent request has been to be able to use CamelCase words
+for automatic cross links in a Wiki created by Org. THis is now
+possible with org-wikinodes.el, which is available in the contrib
+directory. We also have some [[http://orgmode.org/worg/org-contrib/org-wikinodes.php][documentation]] for this feature up
+on Worg.
+
+*** Timer/clock enhancements
+
+=org-timer-set-timer= displays a countdow timer in the modeline.
+From the agenda, `J' invokes =org-agenda-clock-goto=.
+*** Fontify code in code blocks.
+
+Source code in code blocks can now be fontified. Please customize the
+varable =org-src-fontify-natively=. For very large blocks (several
+hundreds of lines) there can be delays in editing such fontified
+blocks, in which case C-c ' should be used to bring up a dedicated
+edit buffer.
+
+Thanks to Dan Davison for this.
+
+*** Allow "#" and "%" in tags
+
+Tags can now also contain the characters =#= and =%=, in addition
+to =@= and letters.
+
+*** MobileOrg: Encryption finally works
+
+As soon as MobilOrg 1.5 hits the Apple's AppStore, you can
+encrypt your org files on public servers. Please see the
+documentation of MobileOrg and Appendix B of the manual for more
+details.
+
+*** MobileOrg: Do not force to insert IDs
+
+If you dislike the property of MobileOrg to insert ID properties
+for in all entries being part of an agenda view, you can now turn
+this off using the variable
+=org-mobile-force-id-on-agenda-items=. When this variable is set
+to =nil=, MobileOrg will use outline paths to identify entries.
+Note that this may fail if several entries have identical outline
+paths.
+
+*** Table fields are now aligned better, new <c> cookie.
+
+In HTML export, table fields are now properly aligned in accord
+with automatic alignment in org, or as set by the =<r>=, =<l>=, and
+=<c>= cookies. The =<c>= cookie is new and has no effect in
+Org, but it does do the right thing in HTML export.
+
+*** Improve XEmacs compatibility
+
+Org-mode 7.02 now runs again in 21.4.22 if the new XEmacs base
+package is installed.
+
+Thanks to Uwe Bauer, Volker Ziegler, Michael Sperber and others
+for a discussion that lead to this nice result.
+
+*** Agenda: Allow compact two-column display in agenda dispatcher
+
+If you have many custom agenda commands, you can have the display
+in the dispatcher use two columns with the following settings
+
+: (setq org-agenda-menu-show-match nil
+: org-agenda-menu-two-column t)
+
+This was a request by John Wiegley.
+
+*** Language-mode commands are available in the Org-buffer
+ The most general machinery for doing this is the macro
+ `org-babel-do-in-edit-buffer'. There is also the convenience
+ function `org-babel-do-key-sequence-in-edit-buffer' which makes
+ use of this macro, and is bound to C-c C-v C-x and C-c C-v x. If
+ there is an active region contained within the code block, then
+ this is inherited by the edit buffer. Some examples of the sorts
+ of usage this permits are
+
+C-c C-v C-x M-; comment region according to language
+C-c C-v C-x C-M-\ indent region according to language
+
+Users can make these more convenient, e.g.
+
+(defun my/org-comment-dwim (&optional arg)
+ (interactive "P")
+ (or (org-babel-do-key-sequence-in-edit-buffer "\M-;")
+ (comment-dwim arg)))
+
+(define-key org-mode-map "\M-;" 'my/org-comment-dwim)
+
+A common instance of this general pattern is built in to Org-mode,
+controlled by the variable `org-src-tab-acts-natively': if this
+variable is set, then TAB in a code block has the effect that it would
+have in the language major mode buffer.
+
+*** Org-babel commands are available in language-mode edit buffer
+ Mirroring the language-native commands in Org buffers above, a new
+ macro `org-src-do-at-code-block' and convenience function
+ `org-src-do-key-sequence-at-code-block' provide the converse. When
+ used in a language major-mode edit buffer (i.e. a buffer generated
+ by C-c '), `org-src-do-key-sequence-at-code-block' executes a key
+ sequence at the code block in the source Org buffer. The command
+ bound to the key sequence in the Org-babel key map is executed
+ remotely with point temporarily at the start of the code block in
+ the Org buffer.
+
+ The command is not bound to a key by default, to avoid conflicts
+ with language major mode bindings. To bind it to C-c @ in all
+ language major modes, you could use
+
+ (add-hook 'org-src-mode-hook
+ (lambda () (define-key org-src-mode-map "\C-c@"
+ 'org-src-do-key-sequence-at-code-block)))
+
+ In that case, for example, C-c @ t issued in code edit buffers
+ would tangle the current Org code block, C-c @ e would execute
+ the block and C-c @ h would display the other available
+ Org-babel commands.
+
*** Multi-line header arguments to code blocks
Code block header arguments can now span multiple lines using the
new =#+header:= or =#+headers:= lines preceding a code block or
@@ -105,14 +338,35 @@ Allows exporting directly from a string to the specified export format.
*** Code block header argument ":noweb tangle"
Only expands <<noweb>> syntax references when tangling, not during
export (weaving).
+*** New function `org-babel-switch-to-session-with-code'
+C-c C-v z (`org-babel-switch-to-session-with-code') is a variant of
+C-c C-v C-z (`org-babel-switch-to-session'): instead of switching to
+the session buffer, it splits the window between (a) the session
+buffer and (b) a language major-mode edit buffer for the code block in
+question. This can be convenient for using language major mode for
+interacting with the session buffer.
+
+*** Improvements to R sessions
+ R now uses standard ESS code evaluation machinery in the :results
+ value case, which avoids unnecessary output to the comint
+ buffer. In addition, the R command responsible for writing the
+ result to file is hidden from the user. Finally, the R code edit
+ buffer generated by C-c ' is automatically linked to the ESS
+ session if the current code block is using :session.
+
*** Temporary file directory
All babel temporary files are now kept in a single sub-directory in
the /tmp directory and are cleaned up when Emacs exits.
-*** Function for demarcating blocks `ob-demarcate-block'
+*** Function for demarcating blocks `org-babel-demarcate-block'
Can be called to wrap the region in a block, or to split the block
around point, bound to (C-c C-v d).
+*** Function for marking code block contents `org-babel-mark-block'
+ Bound to C-M-h in the babel key map (i.e. C-c C-v C-M-h by
+ default). This can be useful in conjunction with
+ `org-babel-do-in-edit-buffer', for example for language-native
+ commenting or indenting of the whole block.
*** Lists of anniversaries are now handeled better
When several anniversaries are defined in the bbdb anniversaries
@@ -121,13 +375,6 @@ agenda.
Thanks to Lukasz Setmann for a patch to this effect.
-*** Table fields are now aligned better, new <c> cookie.
-
-In HTML export, table fields are now properly aligned in accord
-with automatic alignment in org, or as set by the =<r>=, =<l>=, and
-=<c>= cookies. The =<c>= cookie is new and has no effect in
-Org, but it does do the right thing in HTML export.
-
*** Update freemind converter to include body text
The freemind exporter now incorporates body text into the mind
@@ -139,14 +386,6 @@ Thanks to Lennard Borgman for this patch.
The footnotes code now searches for the message delimiter "--" in
order to place footnotes before the signature.
Thanks to Tassilo Horn for this patch.
-
-*** Improve XEmacs compatibility
-
-Org-mode 7.02 now runs again in 21.4.22 if the new XEmacs base
-package is installed.
-
-Thanks to Uwe Bauer, Volker Ziegler, Michael Sperber and others
-for a discussion that lead to this nice result.
*** Make it configurable wether agenda jumping prefers the future
@@ -173,10 +412,6 @@ As soon as MobilOrg 1.5 hits the Apple's AppStore, you can
encrypt your org files on public servers. Please see the
documentation of MobileOrg and Appendix B of the manual for more
details.
-
-*** LaTeX minted package for fontified source code export
-
-Patch by Dan Davison FIXME
*** MobileOrg: Do not force to insert IDs
@@ -188,6 +423,24 @@ to =nil=, MobileOrg will use outline paths to identify entries.
Note that this may fail if several entries have identical outline
paths.
+*** LaTeX minted package for fontified source code export
+Patch by Dan Davison.
+
+Setting `org-export-latex-listings' to have the special value 'minted
+causes source code to be exported to latex using the minted package,
+which will fontify source code with color. If you want to use this,
+you need to make LaTeX use the minted package. Add minted to
+`org-export-latex-packages-alist', for example using customize, or
+with something like
+
+ (require 'org-latex)
+ (add-to-list 'org-export-latex-packages-alist '("" "minted"))
+
+In addition, it is neccessary to install
+pygments (http://pygments.org), and to configure
+`org-latex-to-pdf-process' so that the -shell-escape option is
+passed to pdflatex.
+
*** Allow to use texi2dvi or rubber for processing LaTeX to pdf
Please see the variable =org-export-latex-to-pdf-process= for
@@ -195,6 +448,11 @@ more information.
Thanks to Olivier Schwander for the rubber part.
+*** LaTeX package fixes
+
+We updated the list of default packages loaded by LaTeX exported
+files.
+
*** New STARTUP keywords to turn on inline images
If you want to inline images whenever you visit an Org file, use
@@ -213,22 +471,6 @@ property upon export.
Thanks to David Maus for a patch to this effect.
-*** Fontify code in code blocks.
-
-Source code in code block can now be fontified. Please customize
-the varable =org-src-fontify-natively=, but be prepared for some
-editing delays in larger blocks. Thanks to Dan Davison for this.
-
-*** LaTeX package fixes
-
-We updated the list of default packages loaded by LaTeX exported
-files.
-
-*** Allow "#" and "%" in tags
-
-Tags can now also contain the characters =#= and =%=, in addition
-to =@= and letters.
-
*** Show command names in manual
Andreas Röhler is adding command names to keys in the manual.
@@ -249,45 +491,6 @@ templates. This was undocumented until now.
Thanks to Jambunathan K for the patch.
-*** Implement MathJax support
-
-Org-mode now uses MathJax to display math on web pages. We serve
-MathJax from the orgmode.org server, at least for the time being
-(thanks Bastien!). If you are going to use this for pages which
-are viewd often, please install MathJax on your own webserver.
-
-To return to the old way of creating images and inserting them
-into web pages, you would have to set
-
-: (setq org-export-with-LaTeX-fragments 'dvipng)
-
-or on a per-file basis
-
-: #+OPTIONS: LaTeX:dvipng
-
-*** Agenda: Allow compact two-column display in agenda dispatcher
-
-If you have many custom agenda commands, you can have the display
-in the dispatcher use two columns with the following settings
-
-: (setq org-agenda-menu-show-match nil
-: org-agenda-menu-two-column t)
-
-This was a request by John Wiegley.
-
-*** Add org-wikinodes.el as a contributed package
-
-One frequent request has been to be able to use CamelCase words
-for automatic cross links in a Wiki created by Org. THis is now
-possible with org-wikinodes.el, which is available in the contrib
-directory. We also have some [[http://orgmode.org/worg/org-contrib/org-wikinodes.php][documentation]] for this feature up
-on Worg.
-
-*** Timer/clock enhancements
-
-=org-timer-set-timer= displays a countdow timer in the modeline.
-From the agenda, `J' invokes =org-agenda-clock-goto=.
-
* Version 7.01
:PROPERTIES:
:CUSTOM_ID: v7.01
diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 5063c04..3aa11ba 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -123,9 +123,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
DropBox support, for vastly easier setup.
- <2010-04-06 Tue>: Release 6.35
-* Current Version (7.01h)
+* Current Version (7.02)
-The current version is 7.01h. To see what has changed in recent
+The current version is 7.02. 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)
@@ -137,7 +137,7 @@ recent version, but may lag a bit behind the website release.
** The standard distribution
-Download as [[file:org-7.01h.zip][zip file]] or [[file:org-7.01h.tar.gz][gzipped tar archive]]. These archives contain
+Download as [[file:org-7.02.zip][zip file]] or [[file:org-7.02.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]].
@@ -154,7 +154,8 @@ get a local clone of the repository use something like the following
Some more information about this can be found in the [[http://orgmode.org/worg/org-faq.php][FAQ]], under [[http://orgmode.org/worg/org-faq.php#keeping-current-with-Org-mode-development][How do
I keep current with Org mode development?]]. For people who cannot use
git, we provide [[file:org-latest.zip][zip]] or [[file:org-latest.tar.gz][tar.gz]] snapshot release files updated each day
-and corresponding to the latest git version.
+and corresponding to the latest git version. Alternatively, you can
+also download a [[http://repo.or.cz/w/org-mode.git/snapshot][tar.gz snapshot]] from the repo.or.cz server.
** Alternative distributions
@@ -213,10 +214,13 @@ and corresponding to the latest git version.
- [[http://lists.gnu.org/mailman/listinfo/emacs-orgmode][Subscribe to it]] at the web interface.
- Directly [[mailto:emacs-orgmode@gnu.org][send mail to it]]. If you are not subscribed, a moderator
- will look at the message before passing it through to the
- list.
+ will look at the message before passing it through to the list.
- Read the list on [[http://www.gmane.org][Gmane]] through a [[http://news.gmane.org/gmane.emacs.orgmode][web interface]] or with a
[[news://news.gmane.org/gmane.emacs.orgmode][newsreader]].
+ - Please read the [[http://orgmode.org/manual/Feedback.html][Feedback]] section of Org's manual before posting a
+ question, it helps getting useful answer. [[http://www.catb.org/esr/faqs/smart-questions.html][How To Ask Questions
+ The Smart Way]], by E. S. Raymond is also worth reading.
+
#+BEGIN_HTML
</li><li><form method="get" action="http://search.gmane.org/"><div>
diff --git a/README_DIST b/README_DIST
index a687b1a..797ea37 100644
--- a/README_DIST
+++ b/README_DIST
@@ -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: 7.01trans
+The version of this release is: 7.02trans
The homepage of Org is at http://orgmode.org
diff --git a/README_maintainer b/README_maintainer
index 5d1a67a..07a9788 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -7,7 +7,6 @@
This document describes the tasks the Org-mode maintainer has to do
and how they are performed.
-
* Releases
** Main releases
@@ -23,6 +22,15 @@ release. The release process is a single make command:
: make release TAG=7.13
+Before issuing this command, you should make sure that everything
+during the process will work right, you can do so my running
+
+: make testrelease TAG=7.13
+
+When this fails, make sure to clean up. =git reset --hard= if
+necessary, and check if there are unwanted files, directories, or
+branches left over from the testing.
+
** Minor releases
The release number for minor releases look like this: =7.13.01=
@@ -37,31 +45,48 @@ maint with this command:
: make fixrelease TAG=7.13.01
+** Between releases
+
+While working on master between releases, I use something like
+7.02trans as the version string. To set this version string in all
+relevant files, use
+
+: UTILITIES/set_version 7.02trans
+
+and commit the result. Note that the above command does not change
+the version string in the file from which Org's homepage is
+generated. To change that as well, you would use a =--all= flag. TO
+change only this file, use =--only=.
+
* Synchonization with Emacs
This is still a significant headache. Some hand work is needed here.
-Emacs uses bzr, I cannot bring myself to switch from git to bzr for the
-development version of Org-mode. So the way I have been doing things
-is this:
+Emacs uses bzr, and while I see all the advantages thiswould have, I
+cannot bring myself to switch away from git for my day-to-day work.
+So the way I have been doing things with Emacs is this:
-1. I watch the Emacs diffs for changes made by the maintainers of
+1. I do not update the version in Emacs too often. Just once every
+ few month - this is frequently enough for the Emacs release cycle.
+
+2. I watch the Emacs diffs for changes made by the maintainers of
Emacs in the org-mode files in Emacs. Any changes that come up
there, I merge into the development version of Org-mode.
Occasionally I do not do this, if I do not agree with a change.
The changes go into Org /without/ a ChangeLog-like entry in the
commit message. The reason for this is that we will later generate
a ChangeLog file from our commit messages, and I do not want double
- Change entries in the Emacs ChangeLog file.
+ ChangeLog entries in the Emacs ChangeLog file.
-2. When I have made a release (usually I wait for the minor releases
- to stabilize), I copy org files into the Emacs repository. Yes, I
- do not merge, I copy. This has been the source of some problems in
- the past - but I have not had the patience to work out a better
- mechanism.
+3. When I have made a release (usually I wait for the minor releases
+ to stabilize), I *copy* org files into the Emacs repository. Yes,
+ I do not merge, I copy. This has been the source of some problems
+ in the past - but I have not had the patience to work out a better
+ mechanism, and I really dislike the idea that the version in Emacs
+ starts diverging from my own.
- Careful: Copy org.texi and orgcard.tex into the right places, and
- also copy the lisp files with *two exceptions*: Do *not* copy
+ Careful: Copy /org.texi/ and /orgcard.tex/ into the right places,
+ and also copy the lisp files with *two exceptions*: Do *not* copy
/org-colview-xemacs.el/ and /org-install.el/. The former does not
belong in Emacs. And the latter would actually be harmful because
Emacs generates its own autoloads. The Emacs distribution contains
@@ -70,13 +95,41 @@ is this:
copy org-install.el, you would overwrite that empty placeholder
file.
-3. Generate the ChangeLog entries
+4. Generate the ChangeLog entries
For this, I do in the org-mode git repository
: UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02
- This will spit out the ChangeLog entries that need to go into the
- ChangeLog file in the lisp/org directory in Emacs.
+ This will spit out ChangeLog entries (for the given commit range)
+ that need to go into the ChangeLog files in Emacs. Org-mode
+ contributes to 3 different ChangeLog files in Emacs:
+
+ : lisp/org/ChangeLog (for lisp changes)
+ : doc/misc/ChangeLog (for org.texi changes)
+ : etc/ChangeLog (for refcard changes)
+
+ When you run the =make_emacs_changelog= program, you will be
+ prompted for a date in ISO format YYYY-MM-DD, this date will be
+ used in the ChangeLog entries - Emacs wants these dates to be the
+ time when the change has been installed into Emacs, not the time
+ when we made the change in our own repository. You will also be
+ prompted for the kind of ChangeLog you want to make, possible
+ answers are =lisp=, =texi=, and =card=. The program will then
+ select the correct entries for the specified ChangeLog file. If
+ you don't like being prompted, you can give the date and type as
+ second and third command line arguments to =make_emacs_changelog=.
+
+ These entries need to be added to the ChangeLog files in Emacs.
+ You should, in the ChangeLog file, select the inserted region of
+ new entries and do =M-x fill-region=, so that the entries are
+ formatted correctly. I then do look through the entries quickly to
+ make sure they are formatted properly, that the email addresses
+ look right etc.
+
+5. Commit the changes into the bzr repository and you are done. Emacs
+ developers often look throught the commit and make minor changes -
+ these need to be merged back into our own repo.
+
diff --git a/UTILITIES/make_emacs_changelog b/UTILITIES/make_emacs_changelog
index 7771c9e..059428f 100755
--- a/UTILITIES/make_emacs_changelog
+++ b/UTILITIES/make_emacs_changelog
@@ -14,6 +14,18 @@ if (!$syncdate) {
$syncdate =~ s/\s*(.*?)\s+/$1/;
}
+$kind = shift @ARGV;
+if (!$kind) {
+ print STDERR 'Enter kind ("lisp" or "texi" or "card" or press RET): ';
+ $kind = <>;
+ $kind =~ s/\s*(.*?)\s+/$1/;
+ $kind =~ s/"(.*?)"/$1/;
+ if ($kind ne "lisp" and $kind ne "texi" and $kind ne "card"
+ and $kind ne "") {
+ die "Invalid Changelog kind";
+ }
+}
+
# Run git log to get the commits the messages
open IN,"git log $commitrange|";
undef $/;
@@ -25,7 +37,7 @@ for $i (0..$#commits) {
$commit = $commits[$i];
$author = $1 if $commit=~/^Author: ([^\n]+)/m;
$date = $1 if $commit=~/^Date: ([^\n]+)/m;
- $entry = $1 if $commit=~/^([ \t]*\* [^\f]*?)(\n[ \t]*\n|\Z)/m;
+ $entry = $1 if $commit=~/^([ \t]*\* [^\f]*?)(\n[ \t]*\n([^*]|\Z)|\Z)/m;
$tiny = " (tiny change)" if $commit =~ /TINYCHANGE/;
# split author into name and address
@@ -38,13 +50,50 @@ for $i (0..$#commits) {
}
if ($entry) {
+
+ # Fix the path when directories have been omitted
+
+ $entry =~ s/^([ \t]*\* )([-a-zA-Z]+\.el)/$1lisp\/$2/mg;
+ $entry =~ s/^([ \t]*\* )(org[a-z]*\.texi?)/$1doc\/$2/mg;
+
+ # remove stuff which is not for this output
+ if ($kind =~ /\S/) {
+ remove_parts("contrib/","testing/","xemacs/");
+ remove_parts("Makefile","README");
+ }
+ if ($kind eq "lisp") { remove_parts("doc/") }
+ if ($kind eq "texi") { remove_parts("lisp/","doc/orgcard","doc/orgguide") }
+ if ($kind eq "card") { remove_parts("lisp/","doc/org\\.","doc/orgguide") }
+
# indent each line by 1 TAB
$entry =~ s/^[ \t]*/\t/gm;
+
# Add empty lines if there are several files in there
$entry =~ s/(\n[ \t]+\* )/\n$1/g;
- # remove the lisp part of the path
+
+ # remove blocks of more than one empty line
+ while ($entry =~s/\n[ \t]*\n[ \t]*\n/\n/g) {};
+
+ # remove/replace parts of the path
+
$entry =~ s/^([ \t]+\* )lisp\//$1/mg;
- print "$syncdate $name $address$tiny\n\n$entry\n\n";
+ $entry =~ s/^([ \t]+\* )doc\/orgcard/$1 refcards\/orgcard/mg;
+ $entry =~ s/^([ \t]+\* )doc\//$1misc\//mg;
+
+ # remove empty space at beginning and end
+ $entry =~ s/\A\s*/\t/;
+ $entry =~ s/\s*\Z/\n/;
+
+ # If there is anything left in the entry, print it
+ if ($entry =~ /\S/) {
+ print "$syncdate $name $address$tiny\n\n$entry\n";
+ }
}
}
+sub remove_parts {
+ foreach $path (@_) {
+ $re = "^[ \t]*\\*\\s+" . $path . "[^\\000]*?(?=^[ \\t]*\\*|\\Z)";
+ $entry =~ s/$re/\n$1/mg;
+ }
+}
diff --git a/doc/org.texi b/doc/org.texi
index 54f52e2..aa4f30b 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -4,8 +4,8 @@
@setfilename ../../info/org
@settitle The Org Manual
-@set VERSION 7.01trans
-@set DATE July 2010
+@set VERSION 7.02trans
+@set DATE October 2010
@c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2
@@ -1708,8 +1708,7 @@ unpredictable for you, configure the variables
@table @kbd
@tsubheading{Creation and conversion}
-@kindex C-c |
-@item C-c |
+@orgcmd{C-c |,org-table-create-or-convert-from-region}
Convert the active region to table. If every line contains at least one
TAB character, the function assumes that the material is tab separated.
If every line contains a comma, comma-separated values (CSV) are assumed.
@@ -1723,16 +1722,14 @@ table. But it's easier just to start typing, like
@kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}.
@tsubheading{Re-aligning and field motion}
-@kindex C-c C-c
-@item C-c C-c
+@orgcmd{C-c C-c,org-ctrl-c-ctrl-c}
Re-align the table without moving the cursor.
@c
@orgcmd{<TAB>,org-cycle}
Re-align the table, move to the next field. Creates a new row if
necessary.
@c
-@kindex S-@key{TAB}
-@item S-@key{TAB}
+@orgcmd{S-@key{TAB},org-shifttab}
Re-align, move to previous field.
@c
@kindex @key{RET}
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 8a49976..3ef59d8 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{7.01trans}
+\def\orgversionnumber{7.02trans}
\def\versionyear{2010} % latest update
\def\year{2010} % latest copyright year
diff --git a/doc/orgguide.texi b/doc/orgguide.texi
index c6d5c51..0ee3277 100644
--- a/doc/orgguide.texi
+++ b/doc/orgguide.texi
@@ -3,8 +3,8 @@
@setfilename ../../info/orgguide
@settitle The compact Org-mode Guide
-@set VERSION 0.92
-@set DATE April 2010
+@set VERSION 7.02trans
+@set DATE October 2010
@c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 6dd1a4f..eddb39d 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 339be23..8a96861 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research, R, statistics
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el
index b0d64b4..eda1e5a 100644
--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 4c0070b..4317bf2 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -5,7 +5,7 @@
;; Author: Joel Boehland
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index dd5bd9b..aeb0892 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index ef96610..ece6ef8 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 1a8a8e0..f282049 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index 9a2265e..2d65c17 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index b9e9830..a9be27f 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index 84f0f00..c07dd8e 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index e7269ef..9504c30 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 766ae43..8572a4f 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index f869330..3591036 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 25652f0..142178d 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, js
;; Homepage: http://orgmode.org
-;; Version: 0.01
+;; Version: 7.02trans
;;; License:
diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el
index bab110f..3f2f664 100644
--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 6f92063..3077190 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el
index d1d0f95..ae5a931 100644
--- a/lisp/ob-ledger.el
+++ b/lisp/ob-ledger.el
@@ -5,7 +5,7 @@
;; Author: Eric S Fraga
;; Keywords: literate programming, reproducible research, accounting
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 6e88996..fac286b 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -5,7 +5,7 @@
;; Author: David T. O'Toole <dto@gnu.org>, Eric Schulte
;; Keywords: literate programming, reproducible research, lisp
;; Homepage: http://orgmode.org
-;; Version: 0.01
+;; Version: 7.02trans
;;; License:
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 3560a18..5e5a9cc 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index fae6ac5..5c8bfb4 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -5,7 +5,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el
index 500ff96..22f6f55 100644
--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@@ -5,7 +5,7 @@
;; Author: Juan Pechiar
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index d5e79f4..2c8ed19 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index e2f12d2..dfe6863 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -5,7 +5,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index a17f47e..b38628c 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index ae5fc89..8e73035 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -5,7 +5,7 @@
;; Author: Dan Davison, Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index fcc54dd..431063b 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -5,7 +5,7 @@
;; Author: Zhang Weize
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index a99b6fe..8066b66 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index b27dda9..fe51bba 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 7f56104..75be254 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index 8a51df0..8e686bc 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 6c5fbdb..1444e44 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, scheme
;; Homepage: http://orgmode.org
-;; Version: 0.01
+;; Version: 7.02trans
;;; License:
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index a07db7a..1277d7a 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -5,7 +5,7 @@
;; Author: Benjamin Andresen
;; Keywords: literate programming, interactive shell
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el
index 107d1c4..31e604a 100644
--- a/lisp/ob-sh.el
+++ b/lisp/ob-sh.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 98f4183..cf14a7b 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index d5ad7d3..edd550f 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 1a80f18..5493c53 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 98b6f56..eb71a63 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/ob.el b/lisp/ob.el
index f039c31..fcee956 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8544a62..70c698d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 629da05..7d6dd33 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index 9f3fa16..3986153 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index f9d7ec3..84a4261 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -4,7 +4,7 @@
;; Author: John Wiegley <johnw@newartisans.com>
;; Keywords: org data task
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 0d3134d..c47f7f1 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 453ba8a..08c3be4 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -2,7 +2,7 @@
;;
;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;;
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Keywords: org, wp, tex
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index b4af9ae..b01a6c1 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index e7f1537..1e58f44 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index fa0558a..9951356 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
@@ -1849,9 +1849,9 @@ the currently selected interval size."
(org-minutes-to-hh:mm-string
org-clock-file-total-minutes)
"*|\n"
- tbl1)) tbl))
- (setq total-time (+ (or total-time 0)
- org-clock-file-total-minutes)))))))
+ tbl1)) tbl)
+ (setq total-time (+ (or total-time 0)
+ org-clock-file-total-minutes))))))))
(goto-char pos)
(unless scope-is-list
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index e2bf811..3022b01 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 5303e71..48d433f 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index e7e4fa3..d55a83e 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 833add7..93db5d3 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -4,7 +4,7 @@
;; Emacs Lisp Archive Entry
;; Filename: org-crypt.el
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Keywords: org-mode
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: Peter Jones <pjones@pmade.com>
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index 5ad4dee..85a3cf1 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -3,10 +3,10 @@
;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Paul Sexton <eeeickythump@gmail.com>
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Keywords: org, wp
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index f32cd6d..45009b8 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 4f1cc9a..755c5d1 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-docbook.el
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
;; Keywords: org, wp, docbook
diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index 360c1fe..c41352c 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -5,7 +5,7 @@
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index eded1db..b8ae8c7 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -6,7 +6,7 @@
;; Ulf Stegemann <ulf at zeitform dot de>
;; Keywords: outlines, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
index 430d7d5..f01a6ff 100644
--- a/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@@ -4,7 +4,7 @@
;; Free Software Foundation, Inc.
;; Author: Eric Schulte
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index aec2bee..ae18ad3 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
@@ -607,7 +607,6 @@ table.el tables."
(:TeX-macros "TeX" org-export-with-TeX-macros)
(:LaTeX-fragments "LaTeX" org-export-with-LaTeX-fragments)
(:latex-listings nil org-export-latex-listings)
- (:latex-minted nil org-export-latex-minted)
(:skip-before-1st-heading "skip" org-export-skip-text-before-1st-heading)
(:fixed-width ":" org-export-with-fixed-width)
(:timestamps "<" org-export-with-timestamps)
@@ -2235,7 +2234,6 @@ in the list) and remove property and value from the list in LISTVAR."
(defvar org-export-latex-listings) ;; defined in org-latex.el
(defvar org-export-latex-listings-langs) ;; defined in org-latex.el
(defvar org-export-latex-listings-w-names) ;; defined in org-latex.el
-(defvar org-export-latex-minted) ;; defined in org-latex.el
(defvar org-export-latex-minted-langs) ;; defined in org-latex.el
(defvar org-export-latex-minted-with-line-numbers) ;; defined in org-latex.el
@@ -2368,7 +2366,8 @@ INDENT was the original indentation of the block."
(concat "#+BEGIN_LaTeX\n"
(org-add-props
(cond
- (org-export-latex-listings
+ ((and org-export-latex-listings
+ (not (eq org-export-latex-listings 'minted)))
(concat
(if lang
(let*
@@ -2388,7 +2387,7 @@ INDENT was the original indentation of the block."
"_" "\\\\_" caption)))
"\\begin{lstlisting}\n"
rtn "\\end{lstlisting}\n"))
- (org-export-latex-minted
+ ((eq org-export-latex-listings 'minted)
(if lang
(let*
((lang-sym (intern lang))
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 6b69a95..a1619e6 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index e06dac5..c905c10 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index ff31509..73d8bf6 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index 4edf98f..edf8680 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -5,7 +5,7 @@
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index a4e956c..e7b8aeb 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -7,7 +7,7 @@
;; Tassilo Horn <tassilo at member dot fsf dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index f44d0fa..843d258 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -5,7 +5,7 @@
;; Author: John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-html.el b/lisp/org-html.el
index be7dba2..2ae39b4 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el
index 1e3c798..65e4d0d 100644
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 8c20628..d9e2e45 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 9376aa2..9f526fe 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index e65ccf0..1c21688 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 041ee29..c000999 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index a9075e8..190f8af 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -4,7 +4,7 @@
;;
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
;; Keywords: erc, irc, link, org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 2cb29a1..37e5341 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 5f1c6a8..4e9a836 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-latex.el
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Author: Bastien Guerry <bzg AT altern DOT org>
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Keywords: org, wp, tex
@@ -376,7 +376,25 @@ for example using customize, or with something like
(require 'org-latex)
(add-to-list 'org-export-latex-packages-alist '(\"\" \"listings\"))
- (add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))"
+ (add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))
+
+Alternatively,
+
+ (setq org-export-latex-listings 'minted)
+
+causes source code to be exported using the minted package as
+opposed to listings. If you want to use minted, you need to add
+the minted package to `org-export-latex-packages-alist', for
+example using customize, or with
+
+ (require 'org-latex)
+ (add-to-list 'org-export-latex-packages-alist '(\"\" \"minted\"))
+
+In addition, it is neccessary to install
+pygments (http://pygments.org), and to configure
+`org-latex-to-pdf-process' so that the -shell-escape option is
+passed to pdflatex.
+"
:group 'org-export-latex
:type 'boolean)
@@ -411,23 +429,6 @@ of noweb."
:group 'org-export-latex
:type 'boolean)
-(defcustom org-export-latex-minted nil
- "Non-nil means export source code using the minted package.
-This package will fontify source code with color.
-If you want to use this, you need to make LaTeX use the
-minted package. Add this to `org-export-latex-packages-alist',
-for example using customize, or with something like
-
- (require 'org-latex)
- (add-to-list 'org-export-latex-packages-alist '(\"\" \"minted\"))
-
-In addition, it is neccessary to install
-pygments (http://pygments.org), and configure
-`org-latex-to-pdf-process' so that the -shell-escape option is
-passed to pdflatex."
- :group 'org-export-latex
- :type 'boolean)
-
(defcustom org-export-latex-minted-langs
'((emacs-lisp "common-lisp")
(cc "c++")
@@ -2015,10 +2016,10 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(insert (format
(org-export-get-coderef-format path desc)
(cdr (assoc path org-export-code-refs)))))
- (radiop (insert (format org-export-latex-hyperref-format
+ (radiop (insert (format "\\hyperref[%s]{%s}"
(org-solidify-link-text raw-path) desc)))
((not type)
- (insert (format org-export-latex-hyperref-format
+ (insert (format "\\hyperref[%s]{%s}"
(org-remove-initial-hash
(org-solidify-link-text raw-path))
desc)))
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 737cfb1..85a38b0 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -7,7 +7,7 @@
;; Bastien Guerry <bzg AT altern DOT org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index edfb469..1b4b5cf 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -5,7 +5,7 @@
;; Author: John Wiegley <johnw@gnu.org>
;; Christopher Suckling <suckling at gmail dot com>
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Keywords: outlines, hypermedia, calendar, wp
;; This file is part of GNU Emacs.
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 2256da6..036f9f0 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 5c3cee9..c16f065 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index cd3364c..d681581 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mks.el b/lisp/org-mks.el
index a688ed2..85328c0 100644
--- a/lisp/org-mks.el
+++ b/lisp/org-mks.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 1dd2271..1b9f285 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 3a5a403..2689cab 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -4,7 +4,7 @@
;;
;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 88e89a4..8f11ebf 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
;; Keywords: tables, plotting
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 21f28e7..d1b8ba9 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index c66cd29..482c1a0 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 0ce7da5..87abe67 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index f0deb14..6be367e 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-src.el b/lisp/org-src.el
index e959883..88780d5 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 2284ef2..bbfb4c9 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el
index 6367b7a..4eb511d 100644
--- a/lisp/org-taskjuggler.el
+++ b/lisp/org-taskjuggler.el
@@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-taskjuggler.el
-;; Version: 7.01trans
+;; Version: 7.02trans
;; Author: Christian Egli
;; Maintainer: Christian Egli
;; Keywords: org, taskjuggler, project planning
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 381b297..cfc6287 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 53ef8fd..db1562f 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index 93a41fc..408d325 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -5,7 +5,7 @@
;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index 7de3144..4c8addc 100644
--- a/lisp/org-wl.el
+++ b/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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-xoxo.el b/lisp/org-xoxo.el
index 3ef8272..2ecc48f 100644
--- a/lisp/org-xoxo.el
+++ b/lisp/org-xoxo.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org.el b/lisp/org.el
index c4c64ee..aee4795 100644
--- a/lisp/org.el
+++ b/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: 7.01trans
+;; Version: 7.02trans
;;
;; This file is part of GNU Emacs.
;;
@@ -185,7 +185,7 @@ identifier."
;;; Version
-(defconst org-version "7.01trans"
+(defconst org-version "7.02trans"
"The version number of the file org.el.")
(defun org-version (&optional here)