1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 21:20:44 -08:00
Commit graph

9 commits

Author SHA1 Message Date
Bastien Guerry
30cb51f1bc Merge Org 8.2.6-1.
The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
2014-04-22 16:07:45 +02:00
Paul Eggert
4fa5174182 Spelling fixes.
* lisp/emacs-lisp/generic.el (generic--normalize-comments):
Rename from generic--normalise-comments.  All uses changed.
* lisp/play/bubbles.el (bubbles--neighborhood-score):
(bubbles--mark-direct-neighbors, bubbles--mark-neighborhood)
(bubbles--neighborhood-available)
(bubbles--update-neighborhood-score):
Rename from names with 'neighbourhood'.  All uses changed.
2014-01-11 21:29:11 -08:00
Bastien Guerry
3c8b09ca2e Merge Org version 8.2.5c. 2014-01-07 14:22:53 +01:00
Paul Eggert
da5ecfa9b9 Spelling fixes.
* lib-src/Makefile.in (regex.o): Remove reference to no-longer-used macros
CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
misspelling anyway....
* src/nsterm.h (updateCollectionBehavior): Rename from
updateCollectionBehaviour.  All uses changed.
2014-01-04 18:56:08 -08:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Bastien Guerry
73d3db828e Merge Org 8.2.4 2013-12-06 12:21:31 +01:00
Paul Eggert
d138982874 Spelling fixes.
* lisp/org/ob-python.el (org-babel-python-with-earmuffs):
Rename from org-babel-python-with-earmufs.  All uses changed.
(org-babel-python-without-earmuffs):
Rename from org-babel-python-without-earmufs.  All uses changed.
2013-11-16 23:51:24 -08:00
Glenn Morris
439d6b1c9b Fix and standardize some copyright and license notices
* ob-abc.el: Add year, part of Emacs, standardize license text.

* ob-ebnf.el: Part of Emacs, standardize license text.

* ob-makefile.el: Fix years.

* org-macro.el, ox-beamer.el, ox-latex.el, ox-org.el: Part of Emacs.

* ox-ascii.el, ox-md.el, ox.el: Use range for years, part of Emacs.

* ox-html.el: Part of Emacs.
(org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Set copyright holder to FSF.

* ox-icalendar.el: Part of Emacs, fix years.

* ox-texinfo.el: Copyright to FSF, use range for years.
2013-11-12 09:03:46 -08:00
Bastien Guerry
271672fad7 Merge Org version 8.2.3a. 2013-11-12 14:06:26 +01:00