Including changes from downstream Emacs CVS.

doc/org.texi

@@ -39,23 +39,21 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  You should have received
-a copy of the ``GNU Free Documentation License'' with GNU Emacs.  If
-not, see @url{http://www.gnu.org/licenses/}.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-You have permission to copy, distribute and/or modify all code examples
-in this manual under the terms of the GNU General Public License,
-Version 2 or any later version published by the Free Software
-Foundation.  You should have received a copy of the GNU General Public
-License along with GNU Emacs.  If not, see
-@url{http://www.gnu.org/licenses/}.
+and with the Back-Cover Texts as in (a) below.    A copy of the
+ license is included in the section entitled ``GNU Free Documentation
+-License.''
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 

doc/orgcard.tex

@@ -18,15 +18,15 @@
 \letterpaper=0
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% GNU Emacs 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, or (at your option)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs; see the file COPYING.  If not, write to
-% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %

lisp/org-agenda.el

@@ -1,6 +1,7 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -2869,6 +2870,7 @@ MATCH is being ignored."
   (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
          (fancy-diary-buffer diary-fancy-buffer)
 	 (diary-display-hook '(fancy-diary-display))
+	 (diary-display-function 'fancy-diary-display)
 	 (pop-up-frames nil)
 	 (list-diary-entries-hook
 	  (cons 'org-diary-default-entry list-diary-entries-hook))

lisp/org-publish.el

@@ -164,7 +164,7 @@
 (defcustom org-publish-project-alist nil
   "Association list to control publishing behavior.
 Each element of the alist is a publishing 'project.'  The CAR of
-each element is a string, uniquely identifying the project. The
+each element is a string, uniquely identifying the project.  The
 CDR of each element is in one of the following forms:
 
   (:property value :property value ... )
@@ -176,7 +176,7 @@ OR,
 When the CDR of an element of org-publish-project-alist is in
 this second form, the elements of the list after :components are
 taken to be components of the project, which group together files
-requiring different publishing options. When you publish such a
+requiring different publishing options.  When you publish such a
 project with \\[org-publish], the components all publish.
 
 When a property is given a value in org-publish-project-alist, its
@@ -193,10 +193,10 @@ Most properties are optional, but some should always be set:
                          files will be published
 
 The :exclude property may be used to prevent certain files from
-being published. Its value may be a string or regexp matching
+being published.  Its value may be a string or regexp matching
 file names you don't want to be published.
 
-The :include property may be used to include extra files. Its
+The :include property may be used to include extra files.  Its
 value may be a list of filenames to include. The filenames are
 considered relative to the base directory.
 
@@ -204,19 +204,19 @@ When both :include and :exclude properties are given values, the
 exclusion step happens first.
 
 One special property controls which back-end function to use for
-publishing files in the project. This can be used to extend the
+publishing files in the project.  This can be used to extend the
 set of file types publishable by org-publish, as well as the set
 of output formats.
 
-  :publishing-function     Function to publish file. The default is
+  :publishing-function     Function to publish file.  The default is
                            `org-publish-org-to-html', but other
-                           values are possible. May also be a
+                           values are possible.  May also be a
                            list of functions, in which case
                            each function in the list is invoked
                            in turn.
 
 Another property allows you to insert code that prepares a
-project for publishing. For example, you could call GNU Make on a
+project for publishing.  For example, you could call GNU Make on a
 certain makefile, to ensure published files are built up to date.
 
   :preparation-function   Function to be called before publishing
@@ -226,7 +226,7 @@ certain makefile, to ensure published files are built up to date.
 
 Some properties control details of the Org publishing process,
 and are equivalent to the corresponding user variables listed in
-the right column. See the documentation for those variables to
+the right column.  See the documentation for those variables to
 learn more about their use and default values.
 
   :language              `org-export-default-language'
@@ -257,9 +257,9 @@ index of files or summary page for a given project.
 
   :auto-index            Whether to publish an index during
                          `org-publish-current-project' or `org-publish-all'.
-  :index-filename        Filename for output of index. Defaults
+  :index-filename        Filename for output of index.  Defaults
                          to 'index.org' (which becomes 'index.html').
-  :index-title           Title of index page. Defaults to name of file.
+  :index-title           Title of index page.  Defaults to name of file.
   :index-function        Plugin function to use for generation of index.
                          Defaults to `org-publish-org-index', which
                          generates a plain list of links to all files