Fix more copyright years.

31 files changed, 49 insertions, 51 deletions

diff --git a/contrib/babel/langs/ob-fomus.el b/contrib/babel/langs/ob-fomus.el
index 78fd8fd..855e573 100644
--- a/contrib/babel/langs/ob-fomus.el
+++ b/contrib/babel/langs/ob-fomus.el
@@ -1,11 +1,10 @@
 ;;; ob-fomus.el --- org-babel functions for fomus evaluation
 
-;; Copyright (C) 2011 Torsten Anders
+;; Copyright (C) 2011, 2012 Torsten Anders
 
 ;; Author: Torsten Anders
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 
 
 ;;; License:
 
diff --git a/contrib/babel/langs/ob-oz.el b/contrib/babel/langs/ob-oz.el
index f92733e..fe9511c 100644
--- a/contrib/babel/langs/ob-oz.el
+++ b/contrib/babel/langs/ob-oz.el
@@ -1,11 +1,10 @@
 ;;; ob-oz.el --- org-babel functions for Oz evaluation
 
-;; Copyright (C) 2009 Torsten Anders and Eric Schulte 
+;; Copyright (C) 2009, 2012 Torsten Anders and Eric Schulte
 
-;; Author: Torsten Anders and Eric Schulte 
+;; Author: Torsten Anders and Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 0.02
 
 ;;; License:
 
@@ -26,7 +25,7 @@
 
 ;;; Commentary:
 
-;; Org-Babel support for evaluating Oz source code. 
+;; Org-Babel support for evaluating Oz source code.
 ;;
 ;; Oz code is always send to the Oz Programming Environment (OPI), the
 ;; Emacs mode and compiler interface for Oz programs. Therefore, only
@@ -71,7 +70,7 @@
 ;;   arrive then in any order) I could use IDs
 ;;   (e.g. integers). However, how do I do concurrency in Emacs Lisp,
 ;;   and how can I define org-babel-execute:oz concurrently.
-;; 
+;;
 ;; - Expressions are rarely used in Oz at the top-level, and using
 ;;   them in documentation and Literate Programs will cause
 ;;   confusion. Idea: hide expression from reader and instead show
@@ -94,10 +93,10 @@
 
 ;;
 ;; Interface to communicate with Oz.
-;; (1) For statements without any results: oz-send-string 
+;; (1) For statements without any results: oz-send-string
 ;; (2) For expressions with a single result: oz-send-string-expression
 ;;     (defined in org-babel-oz-ResultsValue.el)
-;; 
+;;
 
 ;; oz-send-string-expression implements an additional very direct
 ;; communication between Org-babel and the Oz compiler. Communication
@@ -128,7 +127,7 @@
   "Path to the contrib/scripts directory in which
 StartOzServer.oz is located.")
 
-(defvar org-babel-oz-port 6001		
+(defvar org-babel-oz-port 6001
   "Port for communicating with Oz compiler.")
 (defvar org-babel-oz-OPI-socket nil
   "Socket for communicating with OPI.")
@@ -144,18 +143,18 @@ StartOzServer.oz is located.")
 
 (defun org-babel-oz-create-socket ()
   (message "Create OPI socket for evaluating expressions")
-  ;; Start Oz directly 
+  ;; Start Oz directly
   (run-oz)
   ;; Create socket on Oz side (after Oz was started).
   (oz-send-string (concat "\\insert '" org-babel-oz-server-dir "StartOzServer.oz'"))
   ;; Wait until socket is created before connecting to it.
   ;; Quick hack: wait 3 sec
-  ;; 
+  ;;
   ;; extending time to 30 secs does not help when starting Emacs for
   ;; the first time (and computer does nothing else)
   (sit-for 3)
   ;; connect to OPI socket
-  (setq org-babel-oz-OPI-socket  
+  (setq org-babel-oz-OPI-socket
 	;; Creates a socket. I/O interface of Emacs sockets as for processes.
 	(open-network-stream "*Org-babel-OPI-socket*" nil "localhost" org-babel-oz-port))
   ;; install filter
@@ -166,7 +165,7 @@ StartOzServer.oz is located.")
 ;; oz-send-string-expression turns is into synchronous...
 (defun oz-send-string-expression (string &optional wait-time)
   "Similar to oz-send-string, oz-send-string-expression sends a string to the OPI compiler. However, string must be expression and this function returns the result of the expression (as string). oz-send-string-expression is synchronous, wait-time allows to specify a maximum wait time. After wait-time is over with no result, the function returns nil."
-  (if (not org-babel-oz-OPI-socket) 
+  (if (not org-babel-oz-OPI-socket)
       (org-babel-oz-create-socket))
   (let ((polling-delay 0.1)
 	result)
@@ -176,11 +175,11 @@ StartOzServer.oz is located.")
 	(let ((waited 0))
 	  (unwind-protect
 	      (progn
-		(while 
+		(while
 		    ;; stop loop if org-babel-oz-collected-result \= nil or waiting time is over
 		    (not (or (not (equal org-babel-oz-collected-result nil))
 			     (> waited wait-time)))
-		  (progn 
+		  (progn
 		    (sit-for polling-delay)
 ;; 		    (message "org-babel-oz: next polling iteration")
 		    (setq waited (+ waited polling-delay))))
@@ -253,7 +252,7 @@ called by `org-babel-execute-src-block' via multiple-value-bind."
 ;;       (when vars
 ;;         (with-temp-buffer
 ;;           (insert var-lines) (write-file vars-file)
-;;           (oz-mode) 
+;;           (oz-mode)
 ;; ;; 	  (inferior-oz-load-file) ; ??
 ;; 	  ))
 ;;       (current-buffer))))
@@ -262,7 +261,7 @@ called by `org-babel-execute-src-block' via multiple-value-bind."
 
 ;; TODO: testing... (simplified version of def in org-babel-prep-session:ocaml)
 ;;
-;; BUG: does not work yet. Error: ad-Orig-error: buffer none doesn't exist or has no process 
+;; BUG: does not work yet. Error: ad-Orig-error: buffer none doesn't exist or has no process
 ;; UNUSED DEF
 (defun org-babel-oz-initiate-session (&optional session params)
   "If there is not a current inferior-process-buffer in SESSION
@@ -278,12 +277,12 @@ then create.  Return the initialized session."
 specifying a var of the same value."
   (if (listp var)
 ;;       (concat "[" (mapconcat #'org-babel-oz-var-to-oz var ", ") "]")
-      (eval var) 
-    (format "%s" var) ; don't preserve string quotes. 
+      (eval var)
+    (format "%s" var) ; don't preserve string quotes.
 ;;     (format "%s" var)
     ))
 
-;; TODO: 
+;; TODO:
 (defun org-babel-oz-table-or-string (results)
   "If the results look like a table, then convert them into an
 Emacs-lisp table, otherwise return the results as a string."
diff --git a/contrib/doc/fr-orgcard.tex b/contrib/doc/fr-orgcard.tex
index e4bfe17..e933837 100644
--- a/contrib/doc/fr-orgcard.tex
+++ b/contrib/doc/fr-orgcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{7.5}
-\def\versionyear{2011}          % latest update
-\def\year{2011}                 % latest copyright year
+\def\versionyear{2012}          % latest update
+\def\year{2012}                 % latest copyright year
 
 %**start of header
 \newcount\columnsperpage
diff --git a/contrib/lisp/org-annotate-file.el b/contrib/lisp/org-annotate-file.el
index eb53ab1..2368bc6 100644
--- a/contrib/lisp/org-annotate-file.el
+++ b/contrib/lisp/org-annotate-file.el
@@ -1,6 +1,6 @@
 ;;; org-annotate-file.el --- Annotate a file with org syntax
 
-;; Copyright (C) 2008-2011 Philip Jackson
+;; Copyright (C) 2008-2012 Philip Jackson
 
 ;; Author: Philip Jackson <phil@shellarchive.co.uk>
 ;; Version: 0.2
diff --git a/contrib/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el
index e97db41..e57b2e6 100644
--- a/contrib/lisp/org-bookmark.el
+++ b/contrib/lisp/org-bookmark.el
@@ -1,5 +1,5 @@
 ;;; org-bookmark.el - Support for links to bookmark
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Tokuya Kameshima <kames AT fa2.so-net.ne.jp>
 ;; Version: 1.0
diff --git a/contrib/lisp/org-checklist.el b/contrib/lisp/org-checklist.el
index 9987628..05ad99d 100644
--- a/contrib/lisp/org-checklist.el
+++ b/contrib/lisp/org-checklist.el
@@ -1,6 +1,6 @@
 ;;; org-checklist.el --- org functions for checklist handling
 
-;; Copyright (C) 2008-2011 James TD Smith
+;; Copyright (C) 2008-2012 James TD Smith
 
 ;; Author: James TD Smith (@ ahktenzero (. mohorovi cc))
 ;; Version: 1.0
diff --git a/contrib/lisp/org-choose.el b/contrib/lisp/org-choose.el
index 690665a..77478c5 100644
--- a/contrib/lisp/org-choose.el
+++ b/contrib/lisp/org-choose.el
@@ -2,7 +2,7 @@
 
 ;;;_. Headers
 ;;;_ , License
-;; Copyright (C) 2009-2011 Tom Breton (Tehom)
+;; Copyright (C) 2009-2012 Tom Breton (Tehom)
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index 8f784ef..da612e9 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@@ -1,6 +1,6 @@
 ;;; org-collector --- collect properties into tables
 
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp, experimentation,
diff --git a/contrib/lisp/org-contribdir.el b/contrib/lisp/org-contribdir.el
index d63a2b3..37b06a4 100644
--- a/contrib/lisp/org-contribdir.el
+++ b/contrib/lisp/org-contribdir.el
@@ -1,5 +1,5 @@
 ;;; org-contribdir.el --- Mark the location of the contrib directory
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-depend.el b/contrib/lisp/org-depend.el
index 1680956..d741dbe 100644
--- a/contrib/lisp/org-depend.el
+++ b/contrib/lisp/org-depend.el
@@ -1,5 +1,5 @@
 ;;; org-depend.el --- TODO dependencies for Org-mode
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-element.el b/contrib/lisp/org-element.el
index 1a5c5df..3db8e36 100644
--- a/contrib/lisp/org-element.el
+++ b/contrib/lisp/org-element.el
@@ -1,6 +1,6 @@
 ;;; org-element.el --- Parser And Applications for Org syntax
 
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2012  Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-eval-light.el b/contrib/lisp/org-eval-light.el
index 097fd44..5cae699 100644
--- a/contrib/lisp/org-eval-light.el
+++ b/contrib/lisp/org-eval-light.el
@@ -1,6 +1,6 @@
 ;;; org-eval-light.el --- Display result of evaluating code in various languages (light)
 
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Eric Schulte <schulte dot eric at gmail dot com>
diff --git a/contrib/lisp/org-eval.el b/contrib/lisp/org-eval.el
index 18f7552..31b91c1 100644
--- a/contrib/lisp/org-eval.el
+++ b/contrib/lisp/org-eval.el
@@ -1,5 +1,5 @@
 ;;; org-eval.el --- Display result of evaluating code in various languages
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-exp-bibtex.el b/contrib/lisp/org-exp-bibtex.el
index 5705bfb..8a99243 100644
--- a/contrib/lisp/org-exp-bibtex.el
+++ b/contrib/lisp/org-exp-bibtex.el
@@ -1,6 +1,6 @@
 ;;; org-exp-bibtex.el --- Export bibtex fragments
 
-;; Copyright (C) 2009-2011 Taru Karttunen
+;; Copyright (C) 2009-2012 Taru Karttunen
 
 ;; Author: Taru Karttunen <taruti@taruti.net>
 
diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el
index 12bbcdb..24794d2 100644
--- a/contrib/lisp/org-export-generic.el
+++ b/contrib/lisp/org-export-generic.el
@@ -1,6 +1,6 @@
 ;; org-export-generic.el --- Export frameworg with custom backends
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author:   Wes Hardaker <hardaker at users dot sourceforge dot net>
 ;; Keywords: outlines, hypermedia, calendar, wp, export
diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el
index 65f3776..7219873 100644
--- a/contrib/lisp/org-export.el
+++ b/contrib/lisp/org-export.el
@@ -1,6 +1,6 @@
 ;;; org-export.el --- Generic Export Engine For Org
 
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2012  Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el
index cfd00d1..538fe43 100644
--- a/contrib/lisp/org-git-link.el
+++ b/contrib/lisp/org-git-link.el
@@ -1,6 +1,6 @@
 ;;; org-git-link.el --- Provide org links to specific file version
 
-;; Copyright (C) 2009-2011  Reimar Finken
+;; Copyright (C) 2009-2012  Reimar Finken
 
 ;; Author: Reimar Finken <reimar.finken@gmx.de>
 ;; Keywords: files, calendar, hypermedia
diff --git a/contrib/lisp/org-invoice.el b/contrib/lisp/org-invoice.el
index 444a93b..ca25711 100644
--- a/contrib/lisp/org-invoice.el
+++ b/contrib/lisp/org-invoice.el
@@ -1,6 +1,6 @@
 ;;; org-invoice.el --- Help manage client invoices in OrgMode
 ;;
-;; Copyright (C) 2008-2011 pmade inc. (Peter Jones pjones@pmade.com)
+;; Copyright (C) 2008-2012 pmade inc. (Peter Jones pjones@pmade.com)
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
diff --git a/contrib/lisp/org-jira.el b/contrib/lisp/org-jira.el
index 684d854..2037029 100644
--- a/contrib/lisp/org-jira.el
+++ b/contrib/lisp/org-jira.el
@@ -1,6 +1,6 @@
 ;;; org-jira.el --- add a jira:ticket protocol to Org
 (defconst org-jira-version "0.1")
-;; Copyright (C) 2008-2011 Jonathan Arkell.
+;; Copyright (C) 2008-2012 Jonathan Arkell.
 ;; Author: Jonathan Arkell <jonnay@jonnay.net>
 
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/lisp/org-learn.el b/contrib/lisp/org-learn.el
index 286ed11..1e08ea3 100644
--- a/contrib/lisp/org-learn.el
+++ b/contrib/lisp/org-learn.el
@@ -1,6 +1,6 @@
 ;;; org-learn.el --- Implements SuperMemo's incremental learning algorithm
 
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el
index 8b62173..5d29d4b 100644
--- a/contrib/lisp/org-mac-iCal.el
+++ b/contrib/lisp/org-mac-iCal.el
@@ -1,6 +1,6 @@
 ;;; org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary
 
-;; Copyright (C) 2009-2011 Christopher Suckling
+;; Copyright (C) 2009-2012 Christopher Suckling
 
 ;; Author: Christopher Suckling <suckling at gmail dot com>
 
diff --git a/contrib/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
index 617a964..11e4e70 100644
--- a/contrib/lisp/org-mairix.el
+++ b/contrib/lisp/org-mairix.el
@@ -1,6 +1,6 @@
 ;;; org-mairix.el - Support for hooking mairix search into Org for different MUAs
 ;;
-;; Copyright (C) 2007-2011 Georg C. F. Greve
+;; Copyright (C) 2007-2012 Georg C. F. Greve
 ;; mutt support by Adam Spiers <orgmode at adamspiers dot org>
 ;;
 ;; Author: Georg C. F. Greve <greve at fsfeurope dot org>
diff --git a/contrib/lisp/org-mtags.el b/contrib/lisp/org-mtags.el
index e0e92eb..4178cde 100644
--- a/contrib/lisp/org-mtags.el
+++ b/contrib/lisp/org-mtags.el
@@ -1,5 +1,5 @@
 ;;; org-mtags.el --- Muse-like tags in Org-mode
-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org-sudoku.el b/contrib/lisp/org-sudoku.el
index 9ef6a1a..768729c 100644
--- a/contrib/lisp/org-sudoku.el
+++ b/contrib/lisp/org-sudoku.el
@@ -1,5 +1,5 @@
 ;;; org-sudoku.el --- Greate and solve SUDOKU games in Org tables
-;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp, games
diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index 90f52f3..5168680 100644
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -1,6 +1,6 @@
 ;;; org-track.el --- Track the most recent Org-mode version available.
 ;;
-;; Copyright (C) 2009-2011
+;; Copyright (C) 2009-2012
 ;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg at altern dot org>
diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el
index c59c569..56c8b4b 100644
--- a/contrib/lisp/org-xhtml.el
+++ b/contrib/lisp/org-xhtml.el
@@ -1,6 +1,6 @@
 ;;; org-xhtml.el --- XHTML export for Org-mode (uses org-lparse)
 
-;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/org2rem.el b/contrib/lisp/org2rem.el
index 31ed404..7fa9dd9 100644
--- a/contrib/lisp/org2rem.el
+++ b/contrib/lisp/org2rem.el
@@ -1,6 +1,6 @@
 ;;; org2rem.el --- Convert org appointments into reminders
 
-;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Bastien Guerry and Shatad Pratap
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/contrib/lisp/orgtbl-sqlinsert.el b/contrib/lisp/orgtbl-sqlinsert.el
index bd8be6d..d2580d8 100644
--- a/contrib/lisp/orgtbl-sqlinsert.el
+++ b/contrib/lisp/orgtbl-sqlinsert.el
@@ -1,6 +1,6 @@
 ;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements.
 
-;; Copyright (C) 2008-2011  Free Software Foundation
+;; Copyright (C) 2008-2012  Free Software Foundation
 
 ;; Author: Jason Riedy <jason@acm.org>
 ;; Keywords: org, tables, sql
diff --git a/contrib/scripts/StartOzServer.oz b/contrib/scripts/StartOzServer.oz
index 56940a3..db12dec 100644
--- a/contrib/scripts/StartOzServer.oz
+++ b/contrib/scripts/StartOzServer.oz
@@ -1,5 +1,5 @@
 %%% *************************************************************
-%%% Copyright (C) 2009 Torsten Anders (www.torsten-anders.de) 
+%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) 
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License
 %%% as published by the Free Software Foundation; either version 2
diff --git a/contrib/scripts/org2hpda b/contrib/scripts/org2hpda
index 6b308f3..b59b6a3 100755
--- a/contrib/scripts/org2hpda
+++ b/contrib/scripts/org2hpda
@@ -1,5 +1,5 @@
 # org2hpda - a small utility to generate hipster pda style printouts from org mode 
-# Copyright (C) 2007  Christian Egli
+# Copyright (C) 2007-2012  Christian Egli
 # 
 # Version: 0.6
 #
diff --git a/etc/styles/README b/etc/styles/README
index bdebef3..206f3a2 100644
--- a/etc/styles/README
+++ b/etc/styles/README
@@ -1,7 +1,7 @@
 The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
 following copyright information:
 
-Copyright (C) 2010-2011 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 These files are part of GNU Emacs.