branch: main
commit 6a8879c109c99f2b593e0bbd8769897adf62600f
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Merge in changes from the elpa branch.
---
font-latex.el | 4 ++--
style/harvard.el | 7 +++----
tex-fptex.el | 3 +--
tex-jp.el | 8 ++++----
tex.el | 19 +++++++++++++------
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/font-latex.el b/font-latex.el
index 66f24ead..2b146c7a 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1944,8 +1944,8 @@ END marks boundaries for searching for quotation ends."
(symbol-function 'font-latex-make-built-in-keywords))
(dolist (elt font-latex-built-in-keyword-classes)
(let ((name (nth 0 elt)))
- (byte-compile (intern (concat "font-latex-" name)))
- (byte-compile (intern (concat "font-latex-" name "-make"))))))
+ (byte-compile (intern (concat "font-latex-match-" name)))
+ (byte-compile (intern (concat "font-latex-match-" name "-make"))))))
;; Provide ourselves:
diff --git a/style/harvard.el b/style/harvard.el
index b503865c..480c303f 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -1,14 +1,13 @@
;;; harvard.el --- Support for Harvard Citation style package for AUCTeX.
+;; Copyright (C) 1994,1997,2005,2012 Free Software Foundation, Inc.
+
;; Harvard citation style is from Peter Williams
;; available on the CTAN servers
+;; Author: Berwin Turlach <berwin.turl...@anu.edu.au>
;; Version: $Id: harvard.el,v 1.10 2008-02-03 14:53:30 angeli Exp $
-;; Copyright (C) 1994 Berwin Turlach <ber...@core.ucl.ac.be>
-;; Copyright (C) 1997 Berwin Turlach <berwin.turl...@anu.edu.au>
-;; Copyright (C) 2005 Free Software Foundation, Inc.
-
;; 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 3, or (at your option)
diff --git a/tex-fptex.el b/tex-fptex.el
index 48b8dfd5..b00ed6df 100644
--- a/tex-fptex.el
+++ b/tex-fptex.el
@@ -1,7 +1,6 @@
;;; tex-fptex.el --- fpTeX support for AUCTeX.
-;; Copyright (C) 2000 Fabrice Popineau
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2004, 2012 Free Software Foundation, Inc.
;; Author: Fabrice Popineau <fabrice.popin...@supelec.fr>
;; Maintainer: auctex-devel@gnu.org
diff --git a/tex-jp.el b/tex-jp.el
index ece40020..d2778b35 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -1,9 +1,9 @@
-;;; tex-jp.el --- Support for Japanese TeX.
+;;; tex-jp.el --- Support for Japanese TeX. -*- coding: iso-2022-jp-unix; -*-
-;; Copyright (C) 1999, 2001 Hidenobu Nabetani <n...@debian.or.jp>
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+;; Copyright (C) 1999, 2001-2007, 2012 Free Software Foundation, Inc.
-;; Author: KOBAYASHI Shinji <k...@flab.fujitsu.co.jp>
+;; Author: KOBAYASHI Shinji <k...@flab.fujitsu.co.jp>,
+;; Hidenobu Nabetani <n...@debian.or.jp>
;; Maintainer: Masayuki Ataka <masayuki.at...@gmail.com>
;; Keywords: tex
diff --git a/tex.el b/tex.el
index b147474a..0ff821ce 100644
--- a/tex.el
+++ b/tex.el
@@ -1,7 +1,6 @@
;;; tex.el --- Support for TeX documents.
-;; Copyright (C) 1985, 1986, 1987, 1991, 1993, 1994, 1996, 1997, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2013
;; Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
@@ -40,6 +39,11 @@
(eval-when-compile
(require 'cl))
+(defun TeX--call-3/2 (f arg1 arg2 arg3)
+ (condition-case nil
+ (funcall f arg1 arg2 arg3)
+ (wrong-number-of-arguments (funcall f arg1 arg2))))
+
(defgroup TeX-file nil
"Files used by AUCTeX."
:group 'AUCTeX)
@@ -122,7 +126,8 @@ If nil, none is specified."
:type '(choice (const :tag "Unspecified" nil)
string))
;; At least in TeXLive 2009 ConTeXt does not support an omega option anymore.
-(make-obsolete-variable 'ConTeXt-Omega-engine 'TeX-engine-alist)
+(TeX--call-3/2 #'make-obsolete-variable 'ConTeXt-Omega-engine
+ 'TeX-engine-alist "before 11.86")
(defcustom TeX-queue-command "lpq -P%p"
"*Command used to show the status of a printer queue.
@@ -1286,8 +1291,9 @@ TYPE can be one of the following symbols:\n"
:group 'TeX-command
(TeX-engine-set (if TeX-Omega-mode 'omega 'default)))
(defalias 'tex-omega-mode 'TeX-Omega-mode)
-(make-obsolete 'TeX-Omega-mode 'TeX-engine-set)
-(make-obsolete-variable 'TeX-Omega-mode 'TeX-engine)
+(TeX--call-3/2 #'make-obsolete 'TeX-Omega-mode 'TeX-engine-set "before 11.86")
+(TeX--call-3/2 #'make-obsolete-variable 'TeX-Omega-mode
+ 'TeX-engine "before 11.86")
;;; Forward and inverse search
@@ -1435,7 +1441,8 @@ SyncTeX are recognized."
(when TeX-source-correlate-mode
'TeX-synctex-output-page))))
(defalias 'TeX-source-specials-mode 'TeX-source-correlate-mode)
-(make-obsolete 'TeX-source-specials-mode 'TeX-source-correlate-mode)
+(TeX--call-3/2 #'make-obsolete 'TeX-source-specials-mode
+ 'TeX-source-correlate-mode "before 11.86")
(defalias 'tex-source-correlate-mode 'TeX-source-correlate-mode)
(put 'TeX-source-correlate-mode 'safe-local-variable 'TeX-booleanp)
;; We do not want the custom variable to require tex.el. This is only
