Merge conflict

1 files changed, 0 insertions, 82 deletions

diff --git a/elpa/auctex-13.1.3/style/ragged2e.el b/elpa/auctex-13.1.3/style/ragged2e.el
deleted file mode 100644
index f5cf7eb..0000000
--- a/elpa/auctex-13.1.3/style/ragged2e.el
+++ /dev/null
@@ -1,82 +0,0 @@
-;;; ragged2e.el --- AUCTeX style for `ragged2e.sty'  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2011, 2015, 2019, 2020 Free Software Foundation, Inc.
-
-;; Author: Mads Jensen <mje@inducks.org>
-;; Created: 2011-04-16
-;; 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 `ragged2e.sty'.
-
-;;; Code:
-
-(require 'tex)
-(require 'latex)
-
-;; Silence the compiler:
-(declare-function font-latex-add-keywords
-                  "font-latex"
-                  (keywords class))
-
-(TeX-add-style-hook
- "ragged2e"
- (lambda ()
-   (TeX-add-symbols
-    "Centering"
-    "justifying"
-    "RaggedRight"
-    "RaggedLeft")
-
-   (LaTeX-add-environments
-    "FlushLeft" "FlushRight" "Center" "justify")
-
-   (LaTeX-add-lengths
-    ;; \Centering
-    "CenteringLeftskip"     "CenteringRightskip"
-    "CenteringParfillskip"  "CenteringParindent"
-    ;; \RaggedLeft
-    "RaggedLeftLeftskip"    "RaggedLeftRightskip"
-    "RaggedLeftParfillskip" "RaggedLeftParindent"
-    ;; \RaggedRight
-    "RaggedRightLeftskip"   "RaggedRightRightskip"
-    "RaggedRightParindent"  "RaggedRightParfillskip"
-    ;; \justifying
-    "JustifyingParfillskip" "JustifyingParindent")
-
-   (TeX-run-style-hooks "footmisc" "everysel")
-
-   ;; Fontification
-   (when (and (featurep 'font-latex)
-              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("Centering"    "")
-                                ("justifying"   "")
-                                ("RaggedRight"  "")
-                                ("RaggedLeft"   ""))
-                              'function)))
- TeX-dialect)
-
-(defvar LaTeX-ragged2e-package-options
-  '("originalcommands" "newcommands" "originalparameters" "document"
-    "newparameters" "footnotes" "raggedrightboxes")
-  "Package options for the ragged2e package.")
-
-;;; ragged2e.el ends here