Kyle Meyer
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
Nicolas Goaziou
271e58f2dd
Fix characters conversion issue when loading `org-id-locations-file'
...
* lisp/org-id.el (org-id-locations-load): Use `insert-file-contents'
instead of `insert-file-contents-literally'.
Reported-by: Anders Johansson <mejlaandersj@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00037.html >
2017-11-04 22:40:02 +01:00
Paul Eggert
ff0dcf52a5
Backport commit bc511a64f from Emacs
...
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
2017-09-17 00:28:38 -04:00
Kyle Meyer
713f785017
Update copyright years
2017-01-05 20:19:37 -05:00
Nicolas Goaziou
0c0bc84190
Change "Org-mode" into "Org mode"
...
* lisp/org-agenda.el:
* lisp/org-attach.el:
* lisp/org-bbdb.el:
* lisp/org-capture.el:
* lisp/org-clock.el:
* lisp/org-entities.el:
* lisp/org-gnus.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-info.el:
* lisp/org-inlinetask.el:
* lisp/org-irc.el:
* lisp/org-list.el:
* lisp/org-mhe.el:
* lisp/org-mouse.el:
* lisp/org-table.el:
* lisp/ox-html.el:
* lisp/ox-odt.el: Use "Org mode", or "Org", instead of "Org-mode".
2016-10-11 18:00:08 +02:00
Nicolas Goaziou
12196b8472
Fix documentation
...
* doc/org.texi (Conventions): Remove unhelpful and wrong footnote.
(Initial visibility): Remove spurious paragraph.
(Global and local cycling):
(Motion): Fix function name.
(Plain lists): Reverse prefix argument action.
(Column width and alignment):
(Column groups):
(Tag inheritance):
(Tag hierarchy):
(The date/time prompt): Fix typo
(Link abbreviations):
(Tag searches):
(Timers): Fix wording.
(Checkboxes): Improve accuracy of footnote. Correctly describe the
behaviour of `org-toggle-checkbox' on a headline.
(Filtering/limiting agenda items): More accurate description for `+' and
`-'. Also remove unused `\' key.
(Agenda commands): Fix behaviour description.
* lisp/org-agenda.el (org-agenda-filter-by-tag): Fix docstring
appearance.
(org-agenda-show-and-scroll-up): Fix wording.
* lisp/org-id.el (org-id-link-to-org-use-id): Fix function name.
(org-id-update-id-locations): Remove reference to unused argument.
* lisp/org.el (org-insert-heading): Improve docstring.
(org-insert-todo-heading): Describe behavior on a plain list item.
(org-update-statistics-cookies): Describe behavior when called with
a prefix argument.
(org-metaright): Fix typo.
(org-kill-note-or-show-branches): Fix function name.
(org-yank): Fix wording.
Reported-by: Jorge <jorge13515@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/109428 >
2016-09-29 22:22:56 +02:00
Nicolas Goaziou
de24694f05
Turn org-mode into Org or Org mode
...
Use Org or Org mode instead of org-mode or Org-mode according to
"Documentation standards".
2016-08-23 22:13:56 +02:00
John Kitchin
91e6b3b057
Update id link definition
...
* lisp/org-id.el ("id"): Update to use org-link-set-parameters.
2016-07-18 22:47:51 +02:00
Nicolas Goaziou
b2091f6d75
Move obsolete declarations into "org-compat.el"
...
* lisp/org-agenda.el (org-agenda-list):
(org-agenda-goto-today):
(org-agenda-reset-view): Remove reference to obsolete
`org-agenda-ndays'.
2016-06-30 15:20:51 +02:00
Nicolas Goaziou
d13b0745dc
Mark a few functions as obsolete
...
* lisp/ob-R.el (org-babel-variable-assignments:R):
* lisp/ob-ref.el (org-babel-ref-goto-headline-id):
* lisp/org-agenda.el (org-agenda-prepare-window):
(org-agenda-switch-to):
* lisp/org-capture.el (org-capture-goto-target):
* lisp/org-clock.el (org-clock-goto):
(org-clock-special-range):
* lisp/org-ctags.el (org-ctags-visit-buffer-or-file):
* lisp/org-eshell.el (org-eshell-open):
* lisp/org-feed.el (org-feed-show-raw-feed):
* lisp/org-id.el (org-id-goto):
* lisp/org-irc.el (org-irc-visit-erc):
* lisp/org-macs.el (org-string-nw-p):
* lisp/org-mobile.el (org-mobile-apply):
* lisp/org-src.el (org-src-switch-to-buffer):
* lisp/org.el (org-get-location):
(org-tree-to-indirect-buffer):
(org-mark-ring-goto):
(org-refile):
(org-add-log-note):
(org-revert-all-org-buffers):
(org-switchb):
(org-cycle-agenda-files):
(org-submit-bug-report):
(org-goto-marker-or-bmk):
* lisp/ox-html.el (org-html-htmlize-generate-css): Silence byte
compiler.
The following functions are marked as obsolete:
- `org-string-match-p'
- `org-number-sequence'
- `org-floor*'
- `org-pop-to-buffer-same-window'
- `org-delete-directory'
- `org-buffer-narrowed-p'
2016-06-23 10:00:00 +02:00
Nicolas Goaziou
0ac099a6f8
Remove final parts of XEmacs compatibility code
...
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 13:56:25 +02:00
Kyle Meyer
6345de2d05
Merge branch 'maint'
2016-01-09 17:43:27 -05:00
Kyle Meyer
6bc48c5f41
Update copyright years
2016-01-09 17:12:03 -05:00
Nicolas Goaziou
b48da39ed4
org-id: Use lexical binding
...
* lisp/org-id.el (org-id-get-with-outline-drilling): Remove unused
optional argument.
2015-11-14 00:05:50 +01:00
Kyle Meyer
0cf9f17c55
Use substitute-command-keys more
...
* lisp/ob-core.el (org-confirm-babel-evaluate):
(org-babel-no-eval-on-ctrl-c-ctrl-c):
(org-babel-hash-at-point):
* lisp/org-agenda.el (org-agenda-log-mode-items):
(org-agenda-auto-exclude-function):
(org-search-view):
(org-todo-list):
(org-tags-view):
(org-agenda-log-mode):
(org-agenda-show-the-flagging-note):
* lisp/org-clock.el (org-clock-out-when-done):
* lisp/org-id.el (org-id-link-to-org-use-id):
* lisp/org-table.el (org-table-allow-automatic-line-recalculation):
(org-table-edit-formulas):
* lisp/org.el (org-support-shift-select):
(org-remove-highlights-with-change):
(org-refile-use-cache):
(org-use-fast-todo-selection):
(org-time-stamp-rounding-minutes):
(org-agenda-text-search-extra-files):
(org-cycle):
(org-ctrl-c-ctrl-c): Use substitute-command-keys.
2015-09-21 18:33:45 -04:00
Paul Eggert
ecf3a4af2c
Backport remaining changes from commit 7e09ef0
...
Add changes from Emacs repo that should have been backported with
bb77dd2
.
Update copyright year to 2015
7e09ef09a479731d01b1ca46e94ddadd73ac98e3
Paul Eggert
Thu Jan 1 14:26:41 2015 -0800
2015-08-10 02:17:19 -04:00
Bastien Guerry
7d9a883b50
Update copyright years again.
...
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
Bastien Guerry
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
.
2014-01-05 06:28:07 +01:00
Bastien Guerry
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
Bastien Guerry
bf012136bd
Remove org-autoload.
...
* org-macs.el (org-autoload): Delete.
* org-docview.el ("docview"): Fix declarations and require
doc-view directly.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling, org-id-new):
* org-colview.el:
(org-colview-initial-truncate-line-value)
(org-columns-open-link, org-string-to-number):
* org-clock.el:
(org-clock-put-overlay, org-count-quarter, org-clock-loaded):
* org-archive.el (org-get-local-archive-location):
* org-agenda.el (org-agenda-todo-custom-ignore-p):
Autoload.
Those functions were autoloaded from within calls to `org-autoload'
in org.el, we now autoload them from where they live.
2013-11-15 06:55:28 +01:00
Achim Gratz
66316436dd
org-id: autoload `org-id-update-id-locations'
...
* lisp/org-id.el (org-id-update-id-locations): Autoload interactive
function.
2013-05-19 21:07:55 +02:00
Aaron Ecay
8993a2f7a9
org-id.el (org-id-locations-save): Bind print-(level,length) to nil
...
* lisp/org-id.el (org-id-locations-save): Bind print-(level,length) to
nil in this function.
Having these variables set to non-nil values results in an unreadable
result being written to `org-id-locations-file'.
2013-04-21 23:44:53 -04:00
Grégoire Jadi
67febc3600
Unify org-id-reverse-string' and
org-babel-reverse-string' into `org-reverse-string'
...
* lisp/org.el (org-reverse-string): Add `org-reverse-string' to
reverse a string.
* lisp/org-id.el(org-id-new, org-id-decode): Replace
`org-id-reverse-string' by `org-reverse-string'.
* lisp/ob-core.el(org-babel-trim): Replace `org-babel-reverse-string'
by `org-reverse-string' and declare it.
TINYCHANGE
2013-02-13 16:29:09 +01:00
Bastien Guerry
cadffe8e1a
Merge branch 'maint'
2013-02-07 10:03:10 +01:00
Bastien Guerry
fa55168d26
org-id.el (org-id-get-with-outline-path-completion): Fix docstring
...
* org-id.el (org-id-get-with-outline-path-completion): Fix
docstring.
Thanks to Florian Beck for reporting this.
2013-02-07 08:42:15 +01:00
Bastien Guerry
7369cada30
Merge branch 'maint'
2013-01-13 11:17:56 +01:00
Bastien Guerry
04eb4b08c3
Revert "Compatibility: Use org-define-obsolete-{function,variable}-alias"
...
This reverts commit 305f29776f
.
2013-01-13 09:19:24 +01:00
Nicolas Richard
f82004840a
* org-id.el (org-id-locations-file):
...
* org-clock.el (org-clock-persist-file): Fix hardcoded
reference to "~/.emacs.d".
* contrib/lisp/org-track.el (org-track-directory): Fix hardcoded
reference to "~/.emacs.d".
2013-01-09 17:59:17 +01:00
Achim Gratz
305f29776f
Compatibility: Use org-define-obsolete-{function,variable}-alias
...
* lisp/org-compat.el (org-define-obsolete-function-alias,
org-define-obsolete-variable-alias): Introduce new compatibility
macros to obsolete functions and variables.
* lisp/org-agenda.el, lisp/org-clock.el, lisp/org-id.el,
lisp/org-lparse.el, lisp/org-protocol.el lisp/org.el: Use
`org-define-obsolete-{function,variable}-alias´instead of
`define-obsolate{function,variable}-alias´.
2013-01-06 18:29:05 +01:00
Bastien Guerry
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
Bastien Guerry
5c762bbdc6
Remove some autoloads and clean up code.
...
* org.el (turn-on-orgtbl): Moved here from org-table.el.
(org-clock-persistence-insinuate): Moved here from org-clock.el.
(org-update-all-dblocks, org-map-entries)
(org-require-autoloaded-modules, org-forward-element)
(org-backward-element, org-up-element)
(org-element-greater-elements, org-drag-element-backward)
(org-drag-element-forward, org-mark-element)
(org-narrow-to-element, org-transpose-element)
(org-unindent-buffer): Don't autoload.
* org-clock.el (org-clock-get-clocktable): Rename from
`org-get-clocktable'.
(org-clock-persistence-insinuate): Move to org.el.
* org-capture.el: Do no set `generated-autoload-file' locally.
Minor code clean up.
* org-agenda.el (org-agenda-list): Use
`org-clock-get-clocktable'. Do no set
`generated-autoload-file' locally.
* org-table.el (org-table-iterate-buffer-tables): Minor
reformatting.
(turn-on-orgtbl): Move to org.el.
* org-html.el (org-export-htmlize-generate-css): Don't autoload.
* org-timer.el (org-timer-pause-or-continue, org-timer-stop):
Ditto.
* ob-tangle.el (org-babel-tangle-lang-exts): Ditto.
* ob-lob.el (org-babel-lob-ingest): Ditto.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling): Ditto.
* org-lparse.el (org-lparse-and-open, org-lparse-batch)
(org-lparse-to-buffer, org-replace-region-by)
(org-lparse-region): Ditto.
* org-mobile.el (org-mobile-create-sumo-agenda): Ditto.
2012-10-02 10:03:15 +02:00
Bastien Guerry
e4c31cf98b
Use generated-autoload-file: "org-loaddefs.el" as a local variable.
2012-10-02 08:50:46 +02:00
Bastien Guerry
c7ffcf9246
Uncomment :version "24.3" cookies.
...
* org.el (org-url-hexify-p, org-doi-server-url)
(org-latex-preview-ltxpng-directory, org-custom-properties)
(org-sparse-tree-default-date-type): Add :version "24.3".
* org-agenda.el (org-agenda-sticky)
(org-agenda-custom-commands-contexts): Ditto.
* org-capture.el (org-capture-bookmark)
(org-capture-templates-contexts)
(org-capture-use-agenda-date): Ditto.
* org-latex.el (org-export-latex-hyperref-options-format)
(org-export-latex-link-with-unknown-path-format): Ditto.
* org-id.el (org-id-link-to-org-use-id): Ditto.
* org-datetree.el (org-datetree-add-timestamp): Ditto.
2012-09-29 23:46:02 +02:00
Michael Brand
2648e3d06b
org-id-link-to-org-use-id: Align doc string
...
* org-id.el (org-id-link-to-org-use-id): Align the doc string to the
changed default.
A leftover of commit 0906e32b
.
2012-09-26 23:48:13 +02:00
Bastien Guerry
0906e32b15
org.el: Use nil as the default value for `org-link-to-org-use-id'
...
* org.el (org-link-to-org-use-id): Move to org-id.el.
* org-id.el (org-id-link-to-org-use-id): Rename from
`org-link-to-org-use-id'. Use `nil' as the default value.
(org-link-to-org-use-id): Alias and define as obsolete.
`org-link-to-org-use-id' was previously defined in org.el but only
active when org-id.el was loaded. This is wrong. It now belongs
to org-id.el.
Also, as some libraries require org-id.el on the fly, a non-nil
default value for `org-link-to-org-use-id' had the side-effect of
changing the behavior of `org-store-link' behind the user's back.
Which is wrong too. The new default value is `nil' so that, even
when a library requires org-id.el without the user noticing it,
the behavior of `org-store-link' will not change.
Users who want to keep the previous behavior can set the variable
to 'create-if-interactive-and-no-custom-id
INCOMPATIBLE
2012-09-23 11:58:49 +02:00
Achim Gratz
c5977e7e9d
Revert "org-compat.el: New compatibility function `org-random'"
...
This reverts commit 7719734dd7
.
* lisp/org-id.el: Do not use (random t), we just want a new random
number, not a re-seeding of the PRNG for which (random t) doesn't
provide enough entropy anyway. Even if (random) would always
produce the same sequence, the other components going into the MD5
hash ensure that the result will be unique.
2012-09-11 21:42:38 +02:00
Bastien Guerry
7719734dd7
org-compat.el: New compatibility function `org-random'
...
* org-compat.el (org-random): New compatibility function.
* org-id.el (org-id-uuid): Use it.
2012-09-03 13:16:52 +02:00
Bastien Guerry
655da8d1d3
Remove useless (t nil) sexps at the end of some (cond ...) constructs
...
* org.el (org-compute-latex-and-specials-regexp)
(org-paste-subtree, org-sort-entries, org-store-link)
(org-open-at-point, org-file-remote-p, org-add-log-setup)
(org-set-tags-to, org-fast-tag-selection)
(org-diary-sexp-entry): Ditto.
* org-agenda.el (org-agenda-get-blocks, org-cmp-priority)
(org-cmp-effort, org-cmp-todo-state, org-cmp-alpha)
(org-cmp-tag, org-cmp-time): Remove useless (t nil) sexps at
the end of (cond ...) constructs.
* org-mobile.el (org-mobile-create-index-file): Ditto.
* org-lparse.el (org-lparse-format-table-row): Ditto.
* org-list.el (org-sort-list): Ditto.
* org-id.el (org-id-get): Ditto.
* org-html.el (org-export-html-preprocess): Ditto.
* org-exp.el (org-default-export-plist)
(org-table-clean-before-export): Ditto.
(t nil) in (cond (...) (...) (t nil)) has no other meaning that to
remind the developer that the cond sexp returns nil in case no condition
is matched. For several (cond ...) constructs this is obvious from reading
the code. For others, the reminder might be useful and we leave it.
See the discussion about this on emacs-devel:
http://thread.gmane.org/gmane.emacs.devel/152664
2012-08-19 14:42:54 +02:00
Bastien Guerry
70dd1196d2
Massive code clean-up.
...
Delete trailing whitespaces.
Indent all sexps correctly.
Sentences end with double spaces.
2012-08-11 19:10:44 +02:00
Bastien Guerry
96551f3dd8
Delete org-make-link' and replace previous occurrences by
concat'.
...
* org.el (org-make-link): Delete.
(org-store-link, org-insert-link)
(org-file-complete-link): Don't use `org-make-link'.
* org-wl.el (org-wl-store-link-folder)
(org-wl-store-link-message): Ditto.
* org-vm.el (org-vm-store-link): Ditto.
* org-rmail.el (org-rmail-store-link): Ditto.
* org-mhe.el (org-mhe-store-link): Ditto.
* org-mew.el (org-mew-store-link): Ditto.
* org-irc.el (org-irc-erc-store-link): Ditto.
* org-info.el (org-info-store-link): Ditto.
* org-id.el (org-id-store-link): Ditto.
* org-gnus.el (org-gnus-group-link, org-gnus-article-link):
Ditto.
* org-eshell.el (org-eshell-store-link): Ditto.
* org-bbdb.el (org-bbdb-store-link): Ditto.
2012-08-03 19:03:21 +02:00
Bastien Guerry
58bef074a7
org-id.el (org-id-update-id-locations): New parameter to silent `org-id-find'.
...
* org-id.el (org-id-update-id-locations): New parameter to
silent `org-id-find'.
(org-id-find): Use the new parameter.
Thanks to Sébastien Vauban for raising a related issue.
2012-04-21 15:46:02 +02:00
Bastien Guerry
d5c0af72cf
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
...
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-21 00:43:16 +02:00
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
f6d7b32bf2
Fix trailing whitespaces.
2012-01-04 16:20:04 +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