Bastien Guerry
ecd0562c5f
Fix the master branch.
...
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.
This commit also bumps the version number to 7.8.06.
The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
2012-03-19 22:01:29 +01:00
Bastien Guerry
6e306f65ff
Fix copyright years in maint.
2012-03-17 16:31:04 +01:00
Bastien Guerry
de42649f7b
Manually revert maint to e85080.
...
e85080 is the last correct commit in the maint branch
before releasing 7.8.04. The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
Bastien Guerry
73bb18ba37
Manually revert to the Release 7.8.04 tag.
2012-03-17 15:52:24 +01:00
Bastien Guerry
38c5045725
Fix copyright years.
2012-03-17 14:36:25 +01:00
Bastien Guerry
6e534f9c61
Manually revert back to commit e85080.
...
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.
This commit reverts back the maint branch to its state before
merging the master branch. From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
Bastien Guerry
04971de4b9
Add version tag "24.1" for options introduced since Emacs 23.4 (and <= 24.1)
...
* org-exp.el (org-export-kill-product-buffer-when-displayed)
(org-export-initial-scope, org-export-date-timestamp-format)
(org-export-with-tasks, org-export-email-info)
(org-export-table-remove-empty-lines): Add version tag.
* org-mobile.el (org-mobile-files-exclude-regexp)
(org-mobile-use-encryption, org-mobile-encryption-tempfile)
(org-mobile-encryption-password, org-mobile-agendas): Add
version tag.
* ob-plantuml.el (org-plantuml-jar-path): Add version tag.
* org.el (org-babel-load-languages, org-clone-delete-id)
(org-log-buffer-setup-hook)
(org-loop-over-headlines-in-active-region)
(org-use-sub-superscripts, org-startup-with-beamer-mode)
(org-startup-with-inline-images, org-ctrl-k-protect-subtree)
(org-catch-invisible-edits)
(org-link-search-must-match-exact-headline)
(org-confirm-shell-link-not-regexp)
(org-confirm-elisp-link-not-regexp, org-log-refile)
(org-refile-use-cache)
(org-refile-active-region-within-subtree)
(org-todo-repeat-to-state, org-get-priority-function)
(org-agenda-jump-prefer-future)
(org-read-date-force-compatible-dates)
(org-use-effective-time)
(org-complete-tags-always-offer-all-agenda-tags)
(org-properties-postprocess-alist)
(org-format-latex-signal-error)
(org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command)
(org-export-latex-default-packages-alist)
(org-hidden-keywords, org-pretty-entities)
(org-pretty-entities-include-sub-superscripts)
(org-src-fontify-natively, org-effort-durations)
(org-speed-command-hook): Add version tag.
* org-html.el (org-export-html-footnote-separator)
(org-export-html-mathjax-options)
(org-export-html-mathjax-template)
(org-export-html-headline-anchor-format)
(org-export-html-preamble-format)
(org-export-html-postamble-format)
(org-export-html-table-align-individual-fields)
(org-export-html-protect-char-alist, org-export-html-divs):
Add version tag.
* org-ctags.el (org-ctags-path-to-ctags)
(org-ctags-open-link-functions)
(org-ctags-new-topic-template): Add version tag.
* ob-exp.el (org-export-babel-evaluate): Add version tag.
* org-beamer.el (org-beamer-use-parts)
(org-beamer-frame-level, org-beamer-frame-default-options)
(org-beamer-column-view-format, org-beamer-themes)
(org-beamer-environments-extra, org-beamer-fragile-re)
(org-beamer-outline-frame-title)
(org-beamer-outline-frame-options): Add version tag.
* org-wl.el (org-wl-link-remove-filter)
(org-wl-shimbun-prefer-web-links)
(org-wl-nntp-prefer-web-links, org-wl-disable-folder-check)
(org-wl-namazu-default-index): Add version tag.
* org-clock.el (org-task-overrun-text)
(org-clocktable-defaults, org-clock-clocktable-formatter)
(org-clock-clocktable-language-setup)
(org-clock-report-include-clocking-task)
(org-clock-resolve-expert): Add version tag.
* ob-lob.el (org-babel-lob-files): Add version tag.
* org-freemind.el (org-freemind-node-css-style): Add version
tag.
* org-archive.el (org-archive-reversed-order)
(org-archive-subtree-add-inherited-tags): Add version tag.
* org-bibtex.el (org-bibtex-autogen-keys, org-bibtex-prefix)
(org-bibtex-treat-headline-as-title)
(org-bibtex-export-arbitrary-fields)
(org-bibtex-key-property, org-bibtex-tags)
(org-bibtex-tags-are-keywords, org-bibtex-no-export-tags)
(org-bibtex-type-property-name): Add version tag.
* org-timer.el (org-timer-default-timer): Add version tag.
* org-taskjuggler.el (org-export-taskjuggler-extension)
(org-export-taskjuggler-project-tag)
(org-export-taskjuggler-resource-tag)
(org-export-taskjuggler-target-version)
(org-export-taskjuggler-default-project-version)
(org-export-taskjuggler-default-project-duration)
(org-export-taskjuggler-default-reports)
(org-export-taskjuggler-default-global-properties): Add
version tag.
* org-habit.el (org-habit-today-glyph)
(org-habit-completed-glyph): Add version tag.
* org-list.el (org-alphabetical-lists)
(org-list-ending-method, org-list-end-regexp)
(org-list-automatic-rules, org-list-use-circular-motion)
(org-list-indent-offset): Add version tag.
* ob-picolisp.el (org-babel-picolisp-cmd): Add version tag.
* org-icalendar.el (org-icalendar-alarm-time)
(org-icalendar-combined-description)
(org-icalendar-honor-noexport-tag)
(org-icalendar-date-time-format): Add version tag.
* org-src.el (org-src-tab-acts-natively): Add version tag.
* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
version tag.
* org-table.el (org-table-exit-follow-field-mode-when-leaving-table)
(org-table-fix-formulas-confirm)
(org-table-duration-custom-format)
(org-table-formula-field-format): Add version tag.
* org-publish.el (org-publish-sitemap-sort-files)
(org-publish-sitemap-sort-folders)
(org-publish-sitemap-sort-ignore-case)
(org-publish-sitemap-date-format)
(org-publish-sitemap-file-entry-format): Add version tag.
* ob-js.el (org-babel-js-cmd): Add version tag.
* org-docbook.el (org-export-docbook-footnote-separator)
(org-export-docbook-xslt-stylesheet): Add version tag.
* org-entities.el (org-entities-ascii-explanatory)
(org-entities-user): Add version tag.
* ob.el (org-confirm-babel-evaluate)
(org-babel-no-eval-on-ctrl-c-ctrl-c): Add version tag.
* ob-tangle.el (org-babel-tangle-lang-exts)
(org-babel-post-tangle-hook, org-babel-pre-tangle-hook)
(org-babel-tangle-body-hook)
(org-babel-tangle-comment-format-beg)
(org-babel-tangle-comment-format-end)
(org-babel-process-comment-text): Add version tag.
* org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
Add version tag.
* org-crypt.el (org-crypt-disable-auto-save): Add version tag.
* org-inlinetask.el (org-inlinetask-default-state): Add
version tag.
* ob-scheme.el (org-babel-scheme-cmd): Add version tag.
* ob-lisp.el (org-babel-lisp-dir-fmt): Add version tag.
* org-attach.el (org-attach-store-link-p): Add version tag.
* org-capture.el (org-capture-templates)
(org-capture-before-finalize-hook)
(org-capture-after-finalize-hook): Add version tag.
* org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda-time-leading-zero, org-agenda-follow-indirect)
(org-agenda-menu-two-column, org-agenda-menu-show-matcher)
(org-agenda-timegrid-use-ampm)
(org-agenda-remove-timeranges-from-blocks)
(org-agenda-inactive-leader, org-agenda-current-time-string)
(org-agenda-show-current-time-in-grid)
(org-agenda-search-view-force-full-words)
(org-agenda-search-view-always-boolean)
(org-agenda-clock-consistency-checks)
(org-agenda-include-deadlines)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-day-face-function)
(org-agenda-category-icon-alist)
(org-agenda-bulk-custom-functions)
(org-agenda-insert-diary-extract-time): Add version tag.
* org-latex.el (org-export-latex-inputenc-alist)
(org-export-latex-tag-markup)
(org-export-latex-timestamp-inactive-markup)
(org-export-latex-href-format)
(org-export-latex-hyperref-format)
(org-export-latex-footnote-separator)
(org-export-latex-quotes)
(org-export-latex-table-caption-above)
(org-export-latex-listings-w-names)
(org-export-latex-minted-langs)
(org-export-latex-listings-options)
(org-export-latex-minted-options)
(org-latex-default-figure-position, org-export-pdf-logfiles):
Add version tag.
* org-faces.el (org-faces-easy-properties)
(org-fontify-quote-and-verse-blocks, org-cycle-level-faces):
Add version tag.
* ob-ditaa.el (org-ditaa-jar-option): Add version tag.
Thanks to Glenn Morris for reporting this.
2012-02-13 15:49:28 +01:00
Bastien Guerry
e44d2975ff
Fix copyright (to 2012) year and Org version (to 7.8.03).
2012-01-03 18:47:01 +01:00
Bastien Guerry
fcdeeb9101
Fix typos fixed in Emacs trunk.
...
* org-freemind.el (org-freemind-write-mm-buffer): Fix typo.
* org-colview.el (org-columns-edit-value) (org-columns-next-allowed-value):
Fix typos.
* org-bibtex.el (org-bibtex-autogen-keys): Fix typo.
* org-clock.el (org-clock-special-range): Fix typo.
Thanks to Paul Eggert for these fixes.
2011-11-28 15:11:52 +01:00
Achim Gratz
ccc99317de
backport copyright and license headers from Emacs trunk
2011-08-24 22:32:38 +02:00
Bastien Guerry
58f1dbccf8
Remove the "Version" header in Org libraries (leave it in org.el).
...
Also remove blank lines before the ";;; org*el ends here" declarations.
Having a "Version" header forced us to update every file when releasing a
new version of Org; it also forced us to update every file when merging Org
with Emacs trunk, thus cluttering the diffs between the previously merged
version and the new one with useless information.
Glenn Morris suggested this in emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
2011-08-17 14:42:34 +02:00
Bastien Guerry
7a18799e25
Remove arch-tag at the bottom of files.
2011-08-15 20:04:38 +02:00
Bastien Guerry
904ed18bc2
Fix copyright years for elisp files in core and contrib.
...
Also add "This file is not part of GNU Emacs." when this is the case.
2011-08-15 15:23:11 +02:00
emacs
7340cee33a
Update website to show 7.7 as current release
2011-07-28 10:33:35 +00:00
Bastien Guerry
9c05a7c781
Bump to version 7.6
2011-07-06 21:06:03 +02:00
David Maus
813f8028dd
Use org-string-match-p for backward compatibility with Emacs22
...
* org-freemind.el (org-freemind-convert-links-helper)
(org-freemind-convert-text-p, org-freemind-write-mm-buffer)
(org-freemind-get-node-style): Use org-string-match-p for backward
compatibility with Emacs22.
2011-07-03 13:05:11 +02:00
emacs
11a10bdfe7
Update website to show 7.5 as current release
2011-03-07 14:27:39 +00:00
Carsten Dominik
7666ba421f
Version number back to 7.4
2010-12-10 18:49:40 +01:00
Carsten Dominik
76a25715c9
Bump version number to 7.5
2010-12-10 18:43:10 +01:00
Bastien Guerry
6630edbd0f
Set version number to 7.3
2010-11-07 14:52:14 +01:00
Carsten Dominik
82af72eef7
Push version number to 7.02trans
2010-10-29 09:11:46 +02:00
Carsten Dominik
cee354c5b4
Update freemind converter
...
* lisp/org-macs.el (org-called-interactively-p): New macro.
* lisp/org-freemind.el: No longer require 'rx.
(org-freemind): New customization group, use it for all the variables.
(org-export-as-freemind): Add docstring.
(org-freemind-show): Improve filen naming.
(org-freemind-convert-links-helper): New function.
(org-freemind-bol-helper-base-indent): New variable.
(org-freemind-bol-helper): New function.
(org-freemind-node-css-style): New option.
(org-freemind-node-pattern): New variable.
(org-freemind-from-org-mode): Better docstring.
2010-10-25 13:27:32 +02:00
Carsten Dominik
6268cceec3
Mention release 7.01 on the website, push release number to 7.01trans
2010-07-19 08:33:24 +02:00
Philip Rooke
07cacd881d
Correct some docstrings [part 2]
...
This is a second patch in a series that makes some straightforward
corrections to a number of docstrings. Each change is normally to:
- correct a typo, or
- fix up hyperlinks to function or variable names, or
- ensure slightly better conformance with the documentation guidelines
and tips given in the Elisp manual
No attempt is made to provide missing docstrings or document arguments.
Cheers,
Phil
2010-07-15 20:27:12 +02:00
Bernt Hansen
dc602f3b2e
Emacs 22 support - use org-string-match-p
...
* contrib/lisp/org-special-blocks.el (org-special-blocks-make-special-cookies):
Emacs 22 doesn't have string-match-p
* lisp/org-freemind.el (org-freemind-write-mm-buffer):
(org-freemind-get-node-style):
Emacs 22 doesn't have string-match-p
* lisp/org-html.el (org-html-make-link):
Use new org-string-match-p for compatibility
2010-06-04 21:01:29 +02:00
Carsten Dominik
c86a3fc4aa
Push version number to 6.36trans
2010-05-09 06:24:20 +02:00
Carsten Dominik
88100d1580
Release 6.36a
2010-05-09 06:13:54 +02:00
Carsten Dominik
0c8557b401
Silence compiler about called-interactively
2010-04-18 16:49:36 +02:00
Carsten Dominik
43bf1bbbd7
Push version number to 6.35trans
2010-04-15 12:24:55 +02:00
Carsten Dominik
436302c1a2
Fix XEmacs compatibility
2010-04-12 18:37:51 +02:00
Carsten Dominik
6f3026edf1
Release 6.35g
2010-04-08 20:15:15 +02:00
Carsten Dominik
a589c7a22e
Release 6.35f
2010-04-08 10:36:32 +02:00
Carsten Dominik
50e5924d8a
Release 6.35e
2010-04-07 16:33:52 +02:00
Carsten Dominik
f722763f8a
Release 6.35d
2010-04-07 16:26:42 +02:00
Carsten Dominik
d65ed03be6
Update copyright notices and fix wrong version tags
2010-04-07 16:26:10 +02:00
Carsten Dominik
cafbe1d038
Release 6.35c
2010-04-07 08:58:25 +02:00
Carsten Dominik
b213c0f31e
Release 6.35b
2010-04-07 07:54:14 +02:00
Carsten Dominik
08d0d2fa20
Release 6.35
2010-04-06 09:16:36 +02:00
Carsten Dominik
8fdf80bb5b
Fix whitespace and compiler wanings
2010-04-01 13:11:54 +02:00
Carsten Dominik
b69adf6738
Freemind export: Fix odd level issue
2010-03-26 08:15:42 +01:00
Carsten Dominik
b236220c9f
Freemind export: Simplify handling of odd levels
2010-03-24 16:18:25 +01:00
Carsten Dominik
06e74afce3
Version number to 6.34trans
2010-01-20 10:13:21 +01:00
Carsten Dominik
a1709ba641
Release 6.34c
2010-01-18 00:10:11 +01:00
Carsten Dominik
2f2f9441d4
Release 6.34b
2010-01-14 23:06:55 +01:00
Carsten Dominik
c077142241
Release 6.34a
2010-01-12 08:53:44 +01:00
Carsten Dominik
288c724335
Release 6.34
2010-01-10 10:57:53 +01:00
Carsten Dominik
275b6627a6
Release 3.34
2010-01-10 10:54:52 +01:00
Carsten Dominik
21ad7f0bef
Fix typo
2009-12-12 10:52:22 +01:00
Carsten Dominik
62a7301a5e
Push release number to 6.33trans
2009-11-20 20:20:31 +01:00
Carsten Dominik
24061fddd1
Release 6.33f
2009-11-20 15:15:05 +01:00
