Browse Source

Merge branch 'maint'

Bastien Guerry 5 years ago
parent
commit
679dce0fda
8 changed files with 15 additions and 15 deletions
  1. 1 1
      doc/org.texi
  2. 5 5
      doc/orgcard.tex
  3. 2 2
      etc/ORG-NEWS
  4. 1 1
      lisp/ob-io.el
  5. 1 1
      lisp/ob-scala.el
  6. 1 1
      lisp/org-crypt.el
  7. 1 1
      lisp/org-element.el
  8. 3 3
      lisp/org-html.el

+ 1 - 1
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}).

+ 5 - 5
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.
 

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 3 - 3
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