branch: elpa
commit 4733d111c2362f0b11f0fcb4b3495882eee7e7dd
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>

    Manually merge changes that were only on the elpa branch
---
 bib-cite.el        |    2 +-
 lpath.el           |    3 +++
 prv-xemacs.el      |   16 ++++++++--------
 style/dinbrief.el  |    2 ++
 style/epsf.el      |    4 ++--
 style/latexinfo.el |    2 +-
 style/prosper.el   |    2 +-
 style/psfig.el     |    5 ++---
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/bib-cite.el b/bib-cite.el
index 1707b19..164385a 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -1,7 +1,7 @@
 ;;; bib-cite.el --- test
 ;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX file.
 
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 
2014
+;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014
 ;; Free Software Foundation
 
 ;; Author:    Peter S. Galbraith <p...@debian.org>
diff --git a/lpath.el b/lpath.el
index 2a090b1..2a4354c 100644
--- a/lpath.el
+++ b/lpath.el
@@ -1,4 +1,7 @@
 ;;; This file is only used for installing AUCTeX.
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
 ;;; It is not a part of AUCTeX itself.
 
 ;; Make sure we get the right files.
diff --git a/prv-xemacs.el b/prv-xemacs.el
index a4bae71..b4b22f7 100644
--- a/prv-xemacs.el
+++ b/prv-xemacs.el
@@ -1,7 +1,6 @@
 ;;; prv-xemacs.el --- XEmacs support for preview-latex
 
-;; Copyright (C) 2001, 02, 03, 04, 05,
-;;               2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2006 Free Software Foundation, Inc.
 
 ;; Author: David Kastrup
 ;; Keywords: convenience, tex, wp
@@ -39,12 +38,13 @@
     "List of macros only present when compiling/loading uncompiled.")
 
   (defmacro preview-defmacro (name &rest rest)
-    (push 
-     (if (fboundp name)
-        (cons name (symbol-function name))
-       name)
-     preview-compatibility-macros)
-    `(eval-when-compile (defmacro ,name ,@rest)))
+    (when (featurep 'xemacs)
+      (push
+       (if (fboundp name)
+          (cons name (symbol-function name))
+        name)
+       preview-compatibility-macros)
+      `(eval-when-compile (defmacro ,name ,@rest))))
   (push 'preview-defmacro preview-compatibility-macros))
 
 (preview-defmacro assoc-default (key alist test)
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 8ab4a84..6455e82 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,3 +1,5 @@
+;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.
+
 ;; Copyright (C) 1994, 2013, 2014  Free Software Foundation, Inc.
 
 ;; Author: Werner Fink <wer...@suse.de>
diff --git a/style/epsf.el b/style/epsf.el
index 92b3da2..ab5b022 100644
--- a/style/epsf.el
+++ b/style/epsf.el
@@ -1,8 +1,8 @@
 ;;; epsf.el - Support for the epsf style option.
 
+;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
 ;; Contributed by Marc Gemis <ma...@wins.uia.ac.be>
-;; Copyright (C) 2014 Free Software Foundation, Inc.
-;; FIXME: What about the copyright for <= 2014?
 
 ;;; Code:
 
diff --git a/style/latexinfo.el b/style/latexinfo.el
index be64bca..f08c079 100644
--- a/style/latexinfo.el
+++ b/style/latexinfo.el
@@ -1,6 +1,6 @@
 ;;; latexinfo.el - Support for LaTeXinfo files.
 
-;; Copyright (C) 1993 Marc Gemis <ma...@wins.uia.ac.be>
+;; Copyright (C) 1993 Free Software Foundation, Inc.
 
 ;; Author: Marc Gemis <ma...@wins.uia.ac.be>
 
diff --git a/style/prosper.el b/style/prosper.el
index 4a4da17..5e0c6d8 100644
--- a/style/prosper.el
+++ b/style/prosper.el
@@ -1,6 +1,6 @@
 ;;; prosper.el --- Prosper style file for AUCTeX
 
-;; Copyright (C) 2001, 2002, 2014 by Philip Lord, Nevin Kapur
+;; Copyright (C) 2001, 2002, 2014  Free Software Foundation, Inc.
 
 ;; Authors:  Phillip Lord<p.l...@russet.org.uk>
 ;;           Nevin Kapur <ne...@jhu.edu>
diff --git a/style/psfig.el b/style/psfig.el
index e471379..b0b6b94 100644
--- a/style/psfig.el
+++ b/style/psfig.el
@@ -1,11 +1,10 @@
 ;;; psfig.el - Support for the psfig style option.
 
+;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
 ;; Contributed by Marc Gemis <ma...@wins.uia.ac.be>
 ;; Please direct comments to him.
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
-;; FIXME: What about the copyright for <= 2014?
-
 ;;; Code:
 
 (TeX-add-style-hook "psfig"

Reply via email to