diff options
author | Bastien Guerry <bzg@altern.org> | 2012-04-02 00:53:37 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-04-02 00:53:37 +0200 |
commit | e3913a2ab5cda65d87e124c95fcb20f338a05e8d (patch) | |
tree | dfa54963e030c3aded55f1f8407f0a168333094f | |
parent | 3306fc1040d49ae93daa3484436b5f40c0fb97dc (diff) | |
parent | 5c38bf0ef782b43552605656c060f2417bb03b28 (diff) | |
download | org-mode-e3913a2ab5cda65d87e124c95fcb20f338a05e8d.tar.gz |
Merge branch 'hotfix-7.8.06'
-rw-r--r-- | lisp/ob-asymptote.el | 2 | ||||
-rw-r--r-- | lisp/ob-exp.el | 2 | ||||
-rw-r--r-- | lisp/ob-fortran.el | 2 | ||||
-rw-r--r-- | lisp/ob-js.el | 2 | ||||
-rw-r--r-- | lisp/ob-lisp.el | 6 | ||||
-rw-r--r-- | lisp/ob-lob.el | 4 | ||||
-rw-r--r-- | lisp/ob-maxima.el | 2 | ||||
-rw-r--r-- | lisp/ob-perl.el | 4 | ||||
-rw-r--r-- | lisp/ob-picolisp.el | 2 | ||||
-rw-r--r-- | lisp/ob-python.el | 4 | ||||
-rw-r--r-- | lisp/ob-ref.el | 4 | ||||
-rw-r--r-- | lisp/ob-scheme.el | 2 | ||||
-rw-r--r-- | lisp/ob.el | 2 | ||||
-rw-r--r-- | lisp/org-ascii.el | 2 | ||||
-rw-r--r-- | lisp/org-attach.el | 2 | ||||
-rw-r--r-- | lisp/org-bbdb.el | 6 | ||||
-rw-r--r-- | lisp/org-beamer.el | 2 | ||||
-rw-r--r-- | lisp/org-bibtex.el | 8 | ||||
-rw-r--r-- | lisp/org-capture.el | 2 | ||||
-rw-r--r-- | lisp/org-clock.el | 2 | ||||
-rw-r--r-- | lisp/org-colview.el | 2 | ||||
-rw-r--r-- | lisp/org-compat.el | 2 | ||||
-rw-r--r-- | lisp/org-datetree.el | 2 | ||||
-rw-r--r-- | lisp/org-docbook.el | 2 | ||||
-rw-r--r-- | lisp/org-mac-message.el | 6 | ||||
-rw-r--r-- | lisp/org-protocol.el | 8 | ||||
-rw-r--r-- | lisp/org-xoxo.el | 2 | ||||
-rw-r--r-- | lisp/org.el | 2 |
28 files changed, 44 insertions, 44 deletions
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el index 913c523..d95829c 100644 --- a/lisp/ob-asymptote.el +++ b/lisp/ob-asymptote.el @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation -;; Copyright (C) 2009-2012 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index fc4bfc7..a5693a7 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Eric Schulte +;; Authors: Eric Schulte ;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index 6f8f1c0..491dde3 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Authors: Sergey Litvinov -;; Eric Schulte +;; Eric Schulte ;; Keywords: literate programming, reproducible research, fortran ;; Homepage: http://orgmode.org diff --git a/lisp/ob-js.el b/lisp/ob-js.el index 893bc7b..20cad4e 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index a0ec1b7..8fb6721 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -2,9 +2,9 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Joel Boehland -;; Eric Schulte -;; David T. O'Toole <dto@gnu.org> +;; Authors: Joel Boehland +;; Eric Schulte +;; David T. O'Toole <dto@gnu.org> ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index 9abc51e..7828f1d 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -2,8 +2,8 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Eric Schulte -;; Dan Davison +;; Authors: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el index 8da20af..b092e13 100644 --- a/lisp/ob-maxima.el +++ b/lisp/ob-maxima.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric S Fraga -;; Eric Schulte +;; Eric Schulte ;; Keywords: literate programming, reproducible research, maxima ;; Homepage: http://orgmode.org diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index 916eb02..71e02b0 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -2,8 +2,8 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Dan Davison -;; Eric Schulte +;; Authors: Dan Davison +;; Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 7f4e468..06c9ab8 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz -;; Eric Schulte +;; Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 5e7a2f0..0dc744a 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -2,8 +2,8 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Eric Schulte -;; Dan Davison +;; Authors: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el index cde594e..08cb4e3 100644 --- a/lisp/ob-ref.el +++ b/lisp/ob-ref.el @@ -2,8 +2,8 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Eric Schulte -;; Dan Davison +;; Authors: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index e1f7657..ce29928 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, scheme @@ -2,7 +2,7 @@ ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. -;; Author: Eric Schulte +;; Authors: Eric Schulte ;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el index b4c92cf..61cbe15 100644 --- a/lisp/org-ascii.el +++ b/lisp/org-ascii.el @@ -1,6 +1,6 @@ ;;; org-ascii.el --- ASCII export for Org-mode -;; Copyright (C) 2004-2012 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/lisp/org-attach.el b/lisp/org-attach.el index 7ba3d72..a87993f 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to org-mode tasks -;; Copyright (C) 2008-2012 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> ;; Keywords: org data task diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index 7fddbb2..ef53a35 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -1,9 +1,9 @@ ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode -;; Copyright (C) 2004-2012 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. -;; Author: Carsten Dominik <carsten at orgmode dot org>, -;; Thomas Baumann <thomas dot baumann at ch dot tum dot de> +;; Authors: Carsten Dominik <carsten at orgmode dot org> +;; Thomas Baumann <thomas dot baumann at ch dot tum dot de> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org ;; diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el index 38e473d..966db82 100644 --- a/lisp/org-beamer.el +++ b/lisp/org-beamer.el @@ -1,6 +1,6 @@ ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode ;; -;; Copyright (C) 2007-2012 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com> ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com> diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index 3ef5d12..21e36a7 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -1,10 +1,10 @@ ;;; org-bibtex.el --- Org links to BibTeX entries ;; -;; Copyright (C) 2007-2012 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; -;; Author: Bastien Guerry <bzg at altern dot org> -;; Carsten Dominik <carsten dot dominik at gmail dot com> -;; Eric Schulte <schulte dot eric at gmail dot com> +;; Authors: Bastien Guerry <bzg at altern dot org> +;; Carsten Dominik <carsten dot dominik at gmail dot com> +;; Eric Schulte <schulte dot eric at gmail dot com> ;; Keywords: org, wp, remember ;; ;; This file is part of GNU Emacs. diff --git a/lisp/org-capture.el b/lisp/org-capture.el index e3bd9f7..1c4cf8c 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-clock.el b/lisp/org-clock.el index a4b37d7..b96e3b1 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004-2012 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/lisp/org-colview.el b/lisp/org-colview.el index fb15880..5cec355 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org-mode -;; Copyright (C) 2004-2012 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/lisp/org-compat.el b/lisp/org-compat.el index 7c96937..ce72e25 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility code for Org-mode -;; Copyright (C) 2004-2012 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/lisp/org-datetree.el b/lisp/org-datetree.el index 3042be7..192d1d6 100644 --- a/lisp/org-datetree.el +++ b/lisp/org-datetree.el @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -;; Copyright (C) 2009-2012 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/lisp/org-docbook.el b/lisp/org-docbook.el index 5dfc160..c3fd62c 100644 --- a/lisp/org-docbook.el +++ b/lisp/org-docbook.el @@ -1,6 +1,6 @@ ;;; org-docbook.el --- DocBook exporter for org-mode ;; -;; Copyright (C) 2007-2012 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-docbook.el diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el index b87d91f..2223c63 100644 --- a/lisp/org-mac-message.el +++ b/lisp/org-mac-message.el @@ -1,9 +1,9 @@ ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode -;; Copyright (C) 2008-2012 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. -;; Author: John Wiegley <johnw@gnu.org> -;; Christopher Suckling <suckling at gmail dot com> +;; Authors: John Wiegley <johnw@gnu.org> +;; Christopher Suckling <suckling at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 5651d55..775f609 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -2,10 +2,10 @@ ;; ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; -;; Author: Bastien Guerry <bzg AT gnu DOT org> -;; Daniel M German <dmg AT uvic DOT org> -;; Sebastian Rose <sebastian_rose AT gmx DOT de> -;; Ross Patterson <me AT rpatterson DOT net> +;; Authors: Bastien Guerry <bzg AT gnu DOT org> +;; Daniel M German <dmg AT uvic DOT org> +;; Sebastian Rose <sebastian_rose AT gmx DOT de> +;; Ross Patterson <me AT rpatterson DOT net> ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Keywords: org, emacsclient, wp diff --git a/lisp/org-xoxo.el b/lisp/org-xoxo.el index fc3a973..a282fbf 100644 --- a/lisp/org-xoxo.el +++ b/lisp/org-xoxo.el @@ -1,6 +1,6 @@ ;;; org-xoxo.el --- XOXO export for Org-mode -;; Copyright (C) 2004-2012 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/lisp/org.el b/lisp/org.el index 169e17d..8bb734c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1,7 +1,7 @@ ;;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2012 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Maintainer: Bastien Guerry <bzg at gnu dot org> |