Merge conflict

1 files changed, 0 insertions, 87 deletions

diff --git a/elpa/auctex-13.1.3/style/index.el b/elpa/auctex-13.1.3/style/index.el
deleted file mode 100644
index 0d83566..0000000
--- a/elpa/auctex-13.1.3/style/index.el
+++ /dev/null
@@ -1,87 +0,0 @@
-;;; index.el --- AUCTeX support for indices with index.sty.  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 1999, 2020 Free Software Foundation, Inc.
-
-;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
-;; Maintainer: auctex-devel@gnu.org
-
-;; 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.
-
-;;; Code:
-
-(require 'tex)
-(require 'latex)
-
-(TeX-add-style-hook
- "index"
- (lambda ()
-
-   (TeX-add-symbols
-    ;; New indices
-    '("newindex" [ "Counter" ] "Tag"
-      "Extension of raw index" "Extension of processed index" "Index title")
-    '("renewindex" [ "Counter" ] "Tag"
-      "Extension of raw index" "Extension of processed index" "Index title")
-    "makeindex"
-    '("disableindex" "Tag[,tag...]")
-
-    ;; Printing the index
-    '("printindex" [ "Indextag" ] [ "Prologue" ])
-    "indexspace"
-
-    ;; Index entries
-    '("index" [ TeX-arg-index-tag ] TeX-arg-index)
-    '("index*" [ TeX-arg-index-tag ] TeX-arg-index)
-
-    ;; Showidx-like stuff
-    "proofmodetrue" "proofmodefalse" '("indexproofstyle" "Style")
-
-    ;; Shortcuts (THESE ARE DEPRECATED AND SHOULD NOT BE USED
-    "shortindexingon" "shortindexinoff")
-
-   ;; Parsing index macros
-   (setq LaTeX-auto-regexp-list
-         (append
-
-          ;; The first regexp is faster, but less accurate
-          ;;'(("\\\\index\\*?\\[[^{}]*\\]{\\([^}]*\\)"
-          ;;   1 LaTeX-auto-index-entry))
-
-          ;; The second regexp is very good, but slower.
-          '(("\\\\index\\*?\\[[^{}]*\\]{\\([^}{]*\\({[^}{]*\\({[^}{]*\\({[^}{]*}[^}{]*\\)*}[^}{]*\\)*}[^}{]*\\)*\\)}"
-             1 LaTeX-auto-index-entry))
-
-          LaTeX-auto-regexp-list))
-
-   ;; Completion for the index entries in \index and |see commands
-   (setq TeX-complete-list
-         (append
-          '(("\\\\index\\*?\\(\\[[^][{}]*\\]\\)?{\\([^{}\n\r]*\\)" 
-             2 LaTeX-index-entry-list)
-            ("|see{\\([^}]*\\)" 1 LaTeX-index-entry-list))
-          TeX-complete-list))
-
-   ;; RefTeX support
-   (and (fboundp 'reftex-add-index-macros)
-        (reftex-add-index-macros '(index))))
- TeX-dialect)
-
-(defvar LaTeX-index-package-options nil
-  "Package options for the index package.")
-
-;;; index.el ends here