summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 15:26:17 +0100
committerBastien Guerry <bzg@altern.org>2013-01-08 15:26:17 +0100
commit679dce0fda64e566f6a4106ec11aa090cdbc28df (patch)
tree7e811741c4cf11e34080faac001ededfc13b435d
parent5fc740a23040559323a6e12a99808df07e85a7b9 (diff)
parent31c1aeabaeb394ae461e8636572fd91ca27313bb (diff)
downloadorg-mode-679dce0fda64e566f6a4106ec11aa090cdbc28df.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi2
-rw-r--r--doc/orgcard.tex10
-rw-r--r--etc/ORG-NEWS4
-rw-r--r--lisp/ob-io.el2
-rw-r--r--lisp/ob-scala.el2
-rw-r--r--lisp/org-crypt.el2
-rw-r--r--lisp/org-element.el2
-rw-r--r--lisp/org-html.el6
8 files changed, 15 insertions, 15 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 2d1f630..b97f27c 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3820,7 +3820,7 @@ Rotate the TODO state of the current item among
If TODO keywords have fast access keys (see @ref{Fast access to TODO
states}), you will be prompted for a TODO keyword through the fast selection
interface; this is the default behavior when
-@var{org-use-fast-todo-selection} is @code{non-nil}.
+@var{org-use-fast-todo-selection} is @code{non-nil}.
The same rotation can also be done ``remotely'' from the timeline and agenda
buffers with the @kbd{t} command key (@pxref{Agenda commands}).
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index ba01400..221746c 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,7 +1,7 @@
% Reference Card for Org Mode
-\def\orgversionnumber{7.9.2}
-\def\versionyear{2012} % latest update
-\def\year{2012} % latest copyright year
+\def\orgversionnumber{7.9.3}
+\def\versionyear{2013} % latest update
+\def\year{2013} % latest copyright year
%**start of header
\newcount\columnsperpage
@@ -17,8 +17,8 @@
\pdflayout=(0l)
% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2013
-% Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2013 Free Software
+% Foundation, Inc.
% This file is part of GNU Emacs.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b7853da..e0f8812 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -2,7 +2,7 @@ ORG NEWS -- history of user-visible changes. -*- org -*-
#+LINK: doc http://orgmode.org/worg/doc.html#%s
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Please send Org bug reports to emacs-orgmode@gnu.org.
@@ -49,7 +49,7 @@ There used to be a GPL version of the Org manual, but this is not the
case anymore, the Free Software Foundation does not permit this.
The GNU FDL license is now included in the manual directly.
-
+
** Enhanced compatibility with Emacs 22 and XEmacs
Thanks to Achim for his work on enhancing Org's compatibility with
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index 19bd398..af18f74 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -1,6 +1,6 @@
;;; ob-io.el --- org-babel functions for Io evaluation
-;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research
diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el
index 96d5179..7cb3099 100644
--- a/lisp/ob-scala.el
+++ b/lisp/ob-scala.el
@@ -1,6 +1,6 @@
;;; ob-scala.el --- org-babel functions for Scala evaluation
-;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 3c7f5c7..2dfc4ad 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -1,6 +1,6 @@
;;; org-crypt.el --- Public key encryption for org-mode entries
-;; Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
;; Emacs Lisp Archive Entry
;; Filename: org-crypt.el
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 15cef4f..1349e2b 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -1,6 +1,6 @@
;;; org-element.el --- Parser And Applications for Org syntax
-;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org-html.el b/lisp/org-html.el
index fadff79..224a103 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -104,7 +104,7 @@ not be modified."
@licstart The following is the entire license notice for the
JavaScript code in this tag.
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code in this tag is free software: you can
redistribute it and/or modify it under the terms of the GNU
@@ -328,7 +328,7 @@ You can also customize this for each buffer, using something like
* @licstart The following is the entire license notice for the
* JavaScript code in %PATH.
*
- * Copyright (C) 2012 MathJax
+ * Copyright (C) 2012-2013 MathJax
*
* Licensed under the Apache License, Version 2.0 (the \"License\");
* you may not use this file except in compliance with the License.
@@ -351,7 +351,7 @@ You can also customize this for each buffer, using something like
@licstart The following is the entire license notice for the
JavaScript code below.
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code below is free software: you can
redistribute it and/or modify it under the terms of the GNU