Merge conflict

1 files changed, 0 insertions, 72 deletions

diff --git a/elpa/auctex-13.1.3/style/ifluatex.el b/elpa/auctex-13.1.3/style/ifluatex.el
deleted file mode 100644
index 86a7638..0000000
--- a/elpa/auctex-13.1.3/style/ifluatex.el
+++ /dev/null
@@ -1,72 +0,0 @@
-;;; ifluatex.el --- AUCTeX style for `ifluatex.sty' version 1.3.  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2014, 2016, 2018, 2020 Free Software Foundation, Inc.
-
-;; Author: Davide G. M. Salvetti <salve@debian.org>
-;; Maintainer: auctex-devel@gnu.org
-;; Created: 2014-11-15
-;; Keywords: tex
-
-;; This file is part of AUCTeX.
-
-;; AUCTeX 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) any
-;; later version.
-
-;; AUCTeX is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-;; for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with AUCTeX; see the file COPYING.  If not, see
-;; <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file adds support for `ifluatex.sty' 1.3.
-
-;;; Code:
-
-(require 'tex)
-
-;; Silence the compiler:
-(declare-function font-latex-add-keywords
-                  "font-latex"
-                  (keywords class))
-
-(defun LaTeX-ifluatex-set-TeX-exit-mark (_optional)
-  "Discard OPTIONAL and set `TeX-exit-mark' to current point."
-  (set-marker TeX-exit-mark (point)))
-
-(TeX-add-style-hook
- "ifluatex"
- (lambda ()
-   (TeX-add-symbols
-    '("ifluatex"
-      (TeX-arg-literal "%\n")
-      LaTeX-ifluatex-set-TeX-exit-mark
-      (TeX-arg-literal "\n\\else%\n\\fi%"))
-    '("luatexversion" 0)
-    '("luatexrevision" 0))
-   (TeX-declare-expert-macros
-    "ifluatex"
-    "ifluatex" "luatexversion" "luatexrevision")
-
-   ;; This package is used to make it possible to compile a document with both
-   ;; LuaTeX and base TeX engines.  By setting `TeX-check-engine-list' to nil
-   ;; we ignore engine restrictions posed by other packages.
-   (setq TeX-check-engine-list nil)
-
-   (when (and (featurep 'font-latex)
-              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("luatexversion")
-                                ("luatexrevision"))
-                              'function)))
- TeX-dialect)
-
-(defvar LaTeX-ifluatex-package-options nil
-  "Package options for the ifluatex package.")
-
-;;; ifluatex.el ends here