Merge conflict

1 files changed, 0 insertions, 64 deletions

diff --git a/elpa/auctex-13.1.3/style/filecontents.el b/elpa/auctex-13.1.3/style/filecontents.el
deleted file mode 100644
index 3c8713a..0000000
--- a/elpa/auctex-13.1.3/style/filecontents.el
+++ /dev/null
@@ -1,64 +0,0 @@
-;;; filecontents.el --- AUCTeX style for `filecontents.sty'  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2013--2016, 2020 Free Software Foundation, Inc.
-
-;; Author: Mads Jensen <mje@inducks.org>
-;; Maintainer: auctex-devel@gnu.org
-;; Created: 2013-01-01
-;; 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, write to the Free
-;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-;; 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file adds support for `filecontents.sty'.  The package removes the two
-;; constraints that `filecontents' from LaTeX2e has, namely that the environment
-;; must be before the documentclass (or \begin{document} according to some
-;; sources), and that existing files are not overwritten.
-
-;;; Code:
-
-(require 'tex)
-(require 'latex)
-
-(TeX-add-style-hook
- "filecontents"
- (lambda ()
-   (LaTeX-add-environments
-    '("filecontents" LaTeX-env-filecontents)
-    '("filecontents*" LaTeX-env-filecontents))
-
-   (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list
-                '("filecontents" current-indentation) t)
-   (add-to-list 'LaTeX-indent-environment-list
-                '("filecontents*" current-indentation) t))
- TeX-dialect)
-
-(defun LaTeX-env-filecontents (environment)
-  "Insert ENVIRONMENT with filename for contents."
-  (LaTeX-insert-environment environment
-                            (concat TeX-grop
-                                    (TeX-read-string "File: ")
-                                    TeX-grcl))
-  (delete-horizontal-space))
-
-(defvar LaTeX-filecontents-package-options nil
-  "Package options for filecontents.")
-
-;; filecontents.el ends here