diff --git a/emacs-24.1-bnc628268.patch b/emacs-24.1-bnc628268.patch
deleted file mode 100644
index ca18b54..0000000
--- a/emacs-24.1-bnc628268.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lisp/obsolete/spell.el
-+++ lisp/obsolete/spell.el	2012-06-27 11:54:27.600009491 +0000
-@@ -64,7 +64,7 @@ as its \"correct\" spelling; then the qu
-   (with-no-warnings
-     (spell-region (point-min) (point-max) "buffer")))
- ;;;###autoload
--(make-obsolete 'spell-buffer 'ispell-buffer "23.1")
-+(define-obsolete-function-alias 'spell-buffer 'ispell-buffer "23.1")
- 
- ;;;###autoload
- (defun spell-word ()
-@@ -83,7 +83,7 @@ and `query-replace' the entire buffer to
-     (with-no-warnings
-       (spell-region beg end (buffer-substring beg end)))))
- ;;;###autoload
--(make-obsolete 'spell-word 'ispell-word "23.1")
-+(define-obsolete-function-alias 'spell-word 'ispell-word "23.1")
- 
- ;;;###autoload
- (defun spell-region (start end &optional description)
-@@ -141,7 +141,7 @@ for example, \"word\"."
- 	     (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b")
- 				   newword)))))))
- ;;;###autoload
--(make-obsolete 'spell-region 'ispell-region "23.1")
-+(define-obsolete-function-alias 'spell-region 'ispell-region "23.1")
- 
- ;;;###autoload
- (defun spell-string (string)
diff --git a/emacs-24.1-ps-mule.patch b/emacs-24.1-ps-mule.patch
index cdb6189..fb1b913 100644
--- a/emacs-24.1-ps-mule.patch
+++ b/emacs-24.1-ps-mule.patch
@@ -16,7 +16,7 @@
  
 --- lisp/textmodes/ispell.el
 +++ lisp/textmodes/ispell.el	2016-09-19 09:01:56.930605125 +0000
-@@ -1709,10 +1709,18 @@ Protects against bogus binding of `enabl
+@@ -1524,10 +1524,18 @@ Protects against bogus binding of `enabl
        nil                        ;; in pipe mode. Disable extended-char-mode
      (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
  	       (assoc ispell-current-dictionary ispell-dictionary-alist)))))
diff --git a/emacs-24.3-iconic.patch b/emacs-24.3-iconic.patch
index f359090..e7cb6de 100644
--- a/emacs-24.3-iconic.patch
+++ b/emacs-24.3-iconic.patch
@@ -4,7 +4,7 @@
 
 --- lisp/startup.el
 +++ lisp/startup.el	2016-09-19 09:15:26.871345783 +0000
-@@ -2349,6 +2349,9 @@ nil default-directory" name)
+@@ -2353,6 +2353,9 @@ nil default-directory" name)
                      ((equal argi "-no-splash")
                       (setq inhibit-startup-screen t))
  
diff --git a/emacs-24.3-x11r7.patch b/emacs-24.3-x11r7.patch
index 7633410..ad98393 100644
--- a/emacs-24.3-x11r7.patch
+++ b/emacs-24.3-x11r7.patch
@@ -14,7 +14,7 @@
  #ifdef HAVE_PWD_H
  #include <pwd.h>
  #endif
-@@ -496,6 +499,15 @@ x_load_resources (Display *display, cons
+@@ -502,6 +505,15 @@ x_load_resources (Display *display, cons
    XrmPutLineResource (&rdb, line);
  
  #endif /* not USE_MOTIF */
@@ -30,7 +30,7 @@
  
    user_database = get_user_db (display);
  
-@@ -537,6 +549,10 @@ x_load_resources (Display *display, cons
+@@ -543,6 +555,10 @@ x_load_resources (Display *display, cons
  	XrmMergeDatabases (db, &rdb);
      }
  
diff --git a/emacs-24.4-decl.dif b/emacs-24.4-decl.dif
deleted file mode 100644
index 0852237..0000000
--- a/emacs-24.4-decl.dif
+++ /dev/null
@@ -1,16 +0,0 @@
----
- src/frame.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- src/frame.c
-+++ src/frame.c	2014-10-21 13:58:24.419838036 +0000
-@@ -20,6 +20,9 @@ along with GNU Emacs.  If not, see <http
- #include <config.h>
- 
- #include <stdio.h>
-+#ifdef STDC_HEADERS
-+#include <stdlib.h>
-+#endif
- #include <errno.h>
- #include <limits.h>
- 
diff --git a/emacs-24.4-flyspell.patch b/emacs-24.4-flyspell.patch
index 35e4778..67b1a4b 100644
--- a/emacs-24.4-flyspell.patch
+++ b/emacs-24.4-flyspell.patch
@@ -4,7 +4,7 @@
 
 --- lisp/textmodes/flyspell.el
 +++ lisp/textmodes/flyspell.el	2016-09-19 09:22:48.535025631 +0000
-@@ -287,6 +287,12 @@ If this variable is nil, all regions are
+@@ -310,6 +310,12 @@ If this variable is nil, all regions are
    :type 'key-sequence
    :group 'flyspell)
  
@@ -17,7 +17,7 @@
  ;;*---------------------------------------------------------------------*/
  ;;*    Mode specific options                                            */
  ;;*    -------------------------------------------------------------    */
-@@ -310,7 +316,6 @@ property of the major mode name.")
+@@ -333,7 +339,6 @@ property of the major mode name.")
  ;;*--- mail mode -------------------------------------------------------*/
  (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
  (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -25,7 +25,7 @@
  (defun mail-mode-flyspell-verify ()
    "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
    (let* ((header-end (save-excursion
-@@ -322,11 +327,11 @@ property of the major mode name.")
+@@ -345,11 +350,11 @@ property of the major mode name.")
                          nil t)
                         (point)))
           (signature-begin
diff --git a/emacs-24.4-glibc.patch b/emacs-24.4-glibc.patch
index c51c97b..e9e87ce 100644
--- a/emacs-24.4-glibc.patch
+++ b/emacs-24.4-glibc.patch
@@ -4,21 +4,21 @@
  2 files changed, 2 insertions(+)
 
 --- configure.ac
-+++ configure.ac	2017-02-27 14:03:47.908816992 +0000
-@@ -2197,6 +2197,7 @@ fi
++++ configure.ac	2018-05-29 12:18:31.133648098 +0000
+@@ -2296,6 +2296,7 @@ fi
  use_mmap_for_buffers=no
  case "$opsys" in
-   cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+   mingw32) use_mmap_for_buffers=yes ;;
 +  gnu-linux) use_mmap_for_buffers=yes ;;
  esac
  
  AC_FUNC_MMAP
 --- configure
-+++ configure	2017-02-27 14:03:47.912816917 +0000
-@@ -11576,6 +11576,7 @@ fi
++++ configure	2018-05-29 12:20:07.583908486 +0000
+@@ -11423,6 +11423,7 @@ fi
  use_mmap_for_buffers=no
  case "$opsys" in
-   cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+   mingw32) use_mmap_for_buffers=yes ;;
 +  gnu-linux) use_mmap_for_buffers=yes ;;
  esac
  
diff --git a/emacs-24.4-nonvoid.patch b/emacs-24.4-nonvoid.patch
index 08209ee..83e7606 100644
--- a/emacs-24.4-nonvoid.patch
+++ b/emacs-24.4-nonvoid.patch
@@ -1,11 +1,10 @@
 ---
- src/emacs-module.c |    1 +
  src/xmenu.c        |    4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- src/xmenu.c
 +++ src/xmenu.c	2016-09-19 09:01:56.930605125 +0000
-@@ -1922,8 +1922,8 @@ Lisp_Object
+@@ -1967,8 +1967,8 @@ Lisp_Object
  xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
  {
    Lisp_Object title;
@@ -16,13 +15,3 @@
    ptrdiff_t specpdl_count = SPECPDL_INDEX ();
  
    check_window_system (f);
---- src/emacs-module.c
-+++ src/emacs-module.c	2016-09-20 09:36:52.881778063 +0000
-@@ -787,6 +787,7 @@ usage: (module-call ENVOBJ &rest ARGLIST
-     default:
-       eassume (false);
-     }
-+  return Qnil;
- }
- 
- 
diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch
index 2f5ccf1..84a92d2 100644
--- a/emacs-24.4-ps-bdf.patch
+++ b/emacs-24.4-ps-bdf.patch
@@ -4,9 +4,9 @@
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 --- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el	2017-09-22 09:54:57.114564921 +0000
-@@ -22141,9 +22141,9 @@ With prefix argument ARG, restart the Pr
- ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22768 58519 620336 792000))
++++ lisp/ldefs-boot.el	2018-05-29 12:23:32.824206557 +0000
+@@ -26339,9 +26339,9 @@ With prefix argument ARG, restart the Pr
+ ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (0 0 0 0))
  ;;; Generated autoloads from ps-bdf.el
  
 -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\
@@ -18,7 +18,7 @@
  (custom-autoload 'bdf-directory-list "ps-bdf" t)
  
 --- lisp/ps-bdf.el
-+++ lisp/ps-bdf.el	2017-09-22 09:53:18.780402545 +0000
++++ lisp/ps-bdf.el	2018-05-29 12:21:53.126004842 +0000
 @@ -42,9 +42,9 @@
  (defcustom bdf-directory-list
    (if (memq system-type '(ms-dos windows-nt))
diff --git a/emacs-24.4-xim.patch b/emacs-24.4-xim.patch
index 96d1a35..6e893aa 100644
--- a/emacs-24.4-xim.patch
+++ b/emacs-24.4-xim.patch
@@ -4,7 +4,7 @@
 
 --- src/xfns.c
 +++ src/xfns.c	2016-09-19 09:10:35.504833294 +0000
-@@ -1957,8 +1957,8 @@ static XIMStyle best_xim_style (XIMStyle
+@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyle
  
  static const XIMStyle supported_xim_styles[] =
  {
diff --git a/emacs-25.2-ImageMagick7.patch b/emacs-25.2-ImageMagick7.patch
index e68c287..369adda 100644
--- a/emacs-25.2-ImageMagick7.patch
+++ b/emacs-25.2-ImageMagick7.patch
@@ -1,24 +1,24 @@
 Index: emacs-25.2/configure.ac
 ===================================================================
 ---
- emacs-25.3/configure.ac |    2 +-
- emacs-25.3/src/image.c  |   12 ++++++++++++
+ emacs-26.1/configure.ac |    2 +-
+ emacs-26.1/src/image.c  |   12 ++++++++++++
  2 files changed, 13 insertions(+), 1 deletion(-)
 
---- emacs-25.3/configure.ac
-+++ emacs-25.3/configure.ac	2017-09-22 09:59:44.049203440 +0000
-@@ -2408,7 +2408,7 @@ if test "${HAVE_X11}" = "yes" || test "$
-   if test "${with_imagemagick}" != "no"; then
+--- emacs-26.1/configure.ac
++++ emacs-26.1/configure.ac	2018-05-29 12:46:11.911662417 +0000
+@@ -2525,7 +2525,7 @@ if test "${HAVE_X11}" = "yes" || test "$
      ## 6.3.5 is the earliest version known to work; see Bug#17339.
      ## 6.8.2 makes Emacs crash; see Bug#13867.
--    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
+     ## 7 and later have not been ported to; See Bug#25967.
+-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
 +    IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2"
      EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
-     AC_SUBST(IMAGEMAGICK_CFLAGS)
-     AC_SUBST(IMAGEMAGICK_LIBS)
---- emacs-25.3/src/image.c
-+++ emacs-25.3/src/image.c	2017-09-22 09:59:44.053203364 +0000
-@@ -8402,7 +8402,11 @@ imagemagick_compute_animated_image (Magi
+ 
+     if test $HAVE_IMAGEMAGICK = yes; then
+--- emacs-26.1/src/image.c
++++ emacs-26.1/src/image.c	2018-05-29 12:43:23.178732705 +0000
+@@ -8432,7 +8432,11 @@ imagemagick_compute_animated_image (Magi
        PixelWand **source, **dest;
        size_t source_width, source_height;
        ssize_t source_left, source_top;
@@ -30,7 +30,7 @@ Index: emacs-25.2/configure.ac
        DisposeType dispose;
        ptrdiff_t lines = 0;
  
-@@ -8467,7 +8471,11 @@ imagemagick_compute_animated_image (Magi
+@@ -8497,7 +8501,11 @@ imagemagick_compute_animated_image (Magi
  	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
  		{
  		  PixelGetMagickColor (source[x], &pixel);
@@ -42,7 +42,7 @@ Index: emacs-25.2/configure.ac
  		}
  	    }
  	  PixelSyncIterator (dest_iterator);
-@@ -8512,7 +8520,11 @@ imagemagick_load_image (struct frame *f,
+@@ -8542,7 +8550,11 @@ imagemagick_load_image (struct frame *f,
    MagickWand *image_wand;
    PixelIterator *iterator;
    PixelWand **pixels, *bg_wand = NULL;
diff --git a/emacs-25.2-bsc1058425.patch b/emacs-25.2-bsc1058425.patch
deleted file mode 100644
index 797c453..0000000
--- a/emacs-25.2-bsc1058425.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Based on 9ad0fcc54442a9a01d41be19880250783426db70 Mon Sep 17 00:00:00 2001
-From: Lars Ingebrigtsen <larsi@gnus.org>
-Date: Fri, 8 Sep 2017 20:23:31 -0700
-Subject: Remove unsafe enriched mode translations
-
-* lisp/gnus/mm-view.el (mm-inline-text):
-Do not worry about enriched or richtext type.
-* lisp/textmodes/enriched.el (enriched-translations):
-Remove translations for FUNCTION, display (Bug#28350).
-(enriched-handle-display-prop, enriched-decode-display-prop): Remove.
----
- lisp/textmodes/enriched.el |   35 -----------------------------------
- 1 file changed, 35 deletions(-)
-
---- lisp/textmodes/enriched.el
-+++ lisp/textmodes/enriched.el	2017-09-22 10:03:36.648869529 +0000
-@@ -117,12 +117,7 @@ expression, which is evaluated to get th
- 		   (full        "flushboth")
- 		   (center      "center"))
-     (PARAMETER     (t           "param")) ; Argument of preceding annotation
--    ;; The following are not part of the standard:
--    (FUNCTION      (enriched-decode-foreground "x-color")
--		   (enriched-decode-background "x-bg-color")
--		   (enriched-decode-display-prop "x-display"))
-     (read-only     (t           "x-read-only"))
--    (display	   (nil		enriched-handle-display-prop))
-     (unknown       (nil         format-annotate-value))
- ;   (font-size     (2           "bigger")       ; unimplemented
- ;		   (-2          "smaller"))
-@@ -477,35 +472,5 @@ Return value is \(begin end name positiv
-     (message "Warning: no color specified for <x-bg-color>")
-     nil))
- 
--;;; Handling the `display' property.
--
--
--(defun enriched-handle-display-prop (old new)
--  "Return a list of annotations for a change in the `display' property.
--OLD is the old value of the property, NEW is the new value.  Value
--is a list `(CLOSE OPEN)', where CLOSE is a list of annotations to
--close and OPEN a list of annotations to open.  Each of these lists
--has the form `(ANNOTATION PARAM ...)'."
--  (let ((annotation "x-display")
--	(param (prin1-to-string (or old new))))
--    (if (null old)
--        (cons nil (list (list annotation param)))
--      (cons (list (list annotation param)) nil))))
--
--(defun enriched-decode-display-prop (start end &optional param)
--  "Decode a `display' property for text between START and END.
--PARAM is a `<param>' found for the property.
--Value is a list `(START END SYMBOL VALUE)' with START and END denoting
--the range of text to assign text property SYMBOL with value VALUE."
--  (let ((prop (when (stringp param)
--		(condition-case ()
--		    (car (read-from-string param))
--		  (error nil)))))
--    (unless prop
--      (message "Warning: invalid <x-display> parameter %s" param))
--    ;; Disabled in Emacs 25.3 to avoid execution of arbitrary Lisp
--    ;; forms in display properties stored within enriched text.
--    ;; (list start end 'display prop)))
--    (list start end)))
- 
- ;;; enriched.el ends here
diff --git a/emacs-25.2-xwidget.patch b/emacs-25.2-xwidget.patch
deleted file mode 100644
index 7c85525..0000000
--- a/emacs-25.2-xwidget.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-commit d781662873f228b110a128f7a2b6583a4d5e0a3a
-Author: Ricardo Wurmus <rekado@elephly.net>
-Date:   Tue Oct 25 23:00:35 2016 -0700
-
-    xwidget: Use WebKit2 API
-    
-    * configure.ac: Check for webkit2gtk-4.0.
-    * src/xwidget.c: Adjust to use WebKit2 API.
-    * lisp/xwidget.el (xwidget-webkit-callback): Adjust matches for
-    `xwidget-event-type'.
-
-diff --git a/configure.ac b/configure.ac
-index 998ff52..46fd434 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2630,8 +2630,8 @@ if test "$with_xwidgets" != "no"; then
-   test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none" ||
-     AC_MSG_ERROR([xwidgets requested but gtk3 not used.])
- 
--  WEBKIT_REQUIRED=1.4.0
--  WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED"
-+  WEBKIT_REQUIRED=2.12
-+  WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
-   EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
-   HAVE_XWIDGETS=$HAVE_WEBKIT
-   test $HAVE_XWIDGETS = yes ||
-diff --git a/lisp/xwidget.el b/lisp/xwidget.el
-index 7a0ca8b..1bae6bb 100644
---- a/lisp/xwidget.el
-+++ b/lisp/xwidget.el
-@@ -187,7 +187,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the originating xwidget."
-        "error: callback called for xwidget with dead buffer")
-     (with-current-buffer (xwidget-buffer xwidget)
-       (let* ((strarg  (nth 3 last-input-event)))
--        (cond ((eq xwidget-event-type 'document-load-finished)
-+        (cond ((eq xwidget-event-type 'load-changed)
-                (xwidget-log "webkit finished loading: '%s'"
-                             (xwidget-webkit-get-title xwidget))
-                ;;TODO - check the native/internal scroll
-@@ -196,8 +196,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the originating xwidget."
-                (rename-buffer (format "*xwidget webkit: %s *"
-                                       (xwidget-webkit-get-title xwidget)))
-                (pop-to-buffer (current-buffer)))
--              ((eq xwidget-event-type
--                   'navigation-policy-decision-requested)
-+              ((eq xwidget-event-type 'decide-policy)
-                (if (string-match ".*#\\(.*\\)" strarg)
-                    (xwidget-webkit-show-id-or-named-element
-                     xwidget
-diff --git a/src/xwidget.c b/src/xwidget.c
-index f5f4da0..78349a8 100644
---- a/src/xwidget.c
-+++ b/src/xwidget.c
-@@ -98,13 +98,7 @@ along with GNU Emacs.  If not, see <http
- 
- #include <wchar.h>
- 
--#include <webkit/webkitwebview.h>
--#include <webkit/webkitwebplugindatabase.h>
--#include <webkit/webkitwebplugin.h>
--#include <webkit/webkitglobals.h>
--#include <webkit/webkitwebnavigationaction.h>
--#include <webkit/webkitdownload.h>
--#include <webkit/webkitwebpolicydecision.h>
-+#include <webkit2/webkit2.h>
- 
- static struct xwidget *
- allocate_xwidget (void)
-@@ -50,34 +47,16 @@ allocate_xwidget_view (void)
- 
- static struct xwidget_view *xwidget_view_lookup (struct xwidget *,
- 						 struct window *);
--static void webkit_document_load_finished_cb (WebKitWebView *, WebKitWebFrame *,
--					      gpointer);
--static gboolean webkit_download_cb (WebKitWebView *, WebKitDownload *, gpointer);
-+static void webkit_view_load_changed_cb (WebKitWebView *,
-+                                         WebKitLoadEvent,
-+                                         gpointer);
-+static gboolean webkit_download_cb (WebKitWebContext *, WebKitDownload *, gpointer);
- 
- static gboolean
--webkit_mime_type_policy_typedecision_requested_cb (WebKitWebView *,
--                                                   WebKitWebFrame *,
--                                                   WebKitNetworkRequest *,
--                                                   gchar *,
--                                                   WebKitWebPolicyDecision *,
--                                                   gpointer);
--
--static gboolean
--webkit_new_window_policy_decision_requested_cb (WebKitWebView *,
--                                                WebKitWebFrame *,
--                                                WebKitNetworkRequest *,
--                                                WebKitWebNavigationAction *,
--                                                WebKitWebPolicyDecision *,
--                                                gpointer);
--
--static gboolean
--webkit_navigation_policy_decision_requested_cb (WebKitWebView *,
--                                                WebKitWebFrame *,
--                                                WebKitNetworkRequest *,
--                                                WebKitWebNavigationAction *,
--                                                WebKitWebPolicyDecision *,
--                                                gpointer);
--
-+webkit_decide_policy_cb (WebKitWebView *,
-+                         WebKitPolicyDecision *,
-+                         WebKitPolicyDecisionType,
-+                         gpointer);
- 
- 
- DEFUN ("make-xwidget",
-@@ -168,29 +147,17 @@ Returns the newly constructed xwidget, or nil if construction fails.  */)
-       if (EQ (xw->type, Qwebkit))
-         {
-           g_signal_connect (G_OBJECT (xw->widget_osr),
--                            "document-load-finished",
--                            G_CALLBACK (webkit_document_load_finished_cb), xw);
-+                            "load-changed",
-+                            G_CALLBACK (webkit_view_load_changed_cb), xw);
- 
--          g_signal_connect (G_OBJECT (xw->widget_osr),
--                            "download-requested",
-+          g_signal_connect (G_OBJECT (webkit_web_context_get_default ()),
-+                            "download-started",
-                             G_CALLBACK (webkit_download_cb), xw);
- 
-           g_signal_connect (G_OBJECT (xw->widget_osr),
--                            "mime-type-policy-decision-requested",
--                            G_CALLBACK
--                            (webkit_mime_type_policy_typedecision_requested_cb),
--                            xw);
--
--          g_signal_connect (G_OBJECT (xw->widget_osr),
--                            "new-window-policy-decision-requested",
--                            G_CALLBACK
--                            (webkit_new_window_policy_decision_requested_cb),
--                            xw);
--
--          g_signal_connect (G_OBJECT (xw->widget_osr),
--                            "navigation-policy-decision-requested",
-+                            "decide-policy",
-                             G_CALLBACK
--                            (webkit_navigation_policy_decision_requested_cb),
-+                            (webkit_decide_policy_cb),
-                             xw);
-         }
- 
-@@ -284,81 +251,83 @@ store_xwidget_event_string (struct xwidget *xw, const char *eventname,
-   kbd_buffer_store_event (&event);
- }
- 
--/* TODO deprecated, use load-status.  */
- void
--webkit_document_load_finished_cb (WebKitWebView *webkitwebview,
--                                  WebKitWebFrame *arg1,
--                                  gpointer data)
-+webkit_view_load_changed_cb (WebKitWebView *webkitwebview,
-+                             WebKitLoadEvent load_event,
-+                             gpointer data)
- {
--  struct xwidget *xw = g_object_get_data (G_OBJECT (webkitwebview),
--                                          XG_XWIDGET);
--
--  store_xwidget_event_string (xw, "document-load-finished", "");
-+  switch (load_event) {
-+  case WEBKIT_LOAD_FINISHED:
-+    {
-+      struct xwidget *xw = g_object_get_data (G_OBJECT (webkitwebview),
-+                                              XG_XWIDGET);
-+      store_xwidget_event_string (xw, "load-changed", "");
-+      break;
-+    }
-+  default:
-+    break;
-+  }
- }
- 
- gboolean
--webkit_download_cb (WebKitWebView *webkitwebview,
-+webkit_download_cb (WebKitWebContext *webkitwebcontext,
-                     WebKitDownload *arg1,
-                     gpointer data)
- {
--  struct xwidget *xw = g_object_get_data (G_OBJECT (webkitwebview),
-+  WebKitWebView *view = webkit_download_get_web_view(arg1);
-+  WebKitURIRequest *request = webkit_download_get_request(arg1);
-+  struct xwidget *xw = g_object_get_data (G_OBJECT (view),
-                                           XG_XWIDGET);
--  store_xwidget_event_string (xw, "download-requested",
--                              webkit_download_get_uri (arg1));
-+
-+  store_xwidget_event_string (xw, "download-started",
-+                              webkit_uri_request_get_uri(request));
-   return FALSE;
- }
- 
- static gboolean
--webkit_mime_type_policy_typedecision_requested_cb (WebKitWebView *webView,
--						   WebKitWebFrame *frame,
--						   WebKitNetworkRequest *request,
--						   gchar *mimetype,
--						   WebKitWebPolicyDecision *policy_decision,
--						   gpointer user_data)
-+webkit_decide_policy_cb (WebKitWebView *webView,
-+                         WebKitPolicyDecision *decision,
-+                         WebKitPolicyDecisionType type,
-+                         gpointer user_data)
- {
--  /* This function makes webkit send a download signal for all unknown
--     mime types.  TODO: Defer the decision to Lisp, so that it's
--     possible to make Emacs handle mime text for instance.  */
--  if (!webkit_web_view_can_show_mime_type (webView, mimetype))
-+  switch (type) {
-+  case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-+    /* This function makes webkit send a download signal for all unknown
-+       mime types.  TODO: Defer the decision to Lisp, so that it's
-+       possible to make Emacs handle mime text for instance.  */
-     {
--      webkit_web_policy_decision_download (policy_decision);
--      return TRUE;
-+      WebKitResponsePolicyDecision *response =
-+        WEBKIT_RESPONSE_POLICY_DECISION (decision);
-+      if (!webkit_response_policy_decision_is_mime_type_supported (response))
-+        {
-+          webkit_policy_decision_download (decision);
-+          return TRUE;
-+        }
-+      else
-+        return FALSE;
-+      break;
-     }
--  else
-+  case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
-+  case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-+    {
-+      WebKitNavigationPolicyDecision *navigation_decision =
-+        WEBKIT_NAVIGATION_POLICY_DECISION (decision);
-+      WebKitNavigationAction *navigation_action =
-+        webkit_navigation_policy_decision_get_navigation_action (navigation_decision);
-+      WebKitURIRequest *request =
-+        webkit_navigation_action_get_request (navigation_action);
-+
-+      struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET);
-+      store_xwidget_event_string (xw, "decide-policy",
-+                                  webkit_uri_request_get_uri (request));
-+      return FALSE;
-+      break;
-+    }
-+  default:
-     return FALSE;
-+  }
- }
- 
--static gboolean
--webkit_new_window_policy_decision_requested_cb (WebKitWebView *webView,
--						WebKitWebFrame *frame,
--						WebKitNetworkRequest *request,
--						WebKitWebNavigationAction *navigation_action,
--						WebKitWebPolicyDecision *policy_decision,
--						gpointer user_data)
--{
--  struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET);
--  webkit_web_navigation_action_get_original_uri (navigation_action);
--
--  store_xwidget_event_string (xw, "new-window-policy-decision-requested",
--                              webkit_web_navigation_action_get_original_uri
--                              (navigation_action));
--  return FALSE;
--}
--
--static gboolean
--webkit_navigation_policy_decision_requested_cb (WebKitWebView *webView,
--						WebKitWebFrame *frame,
--						WebKitNetworkRequest *request,
--						WebKitWebNavigationAction *navigation_action,
--						WebKitWebPolicyDecision *policy_decision,
--						gpointer user_data)
--{
--  struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET);
--  store_xwidget_event_string (xw, "navigation-policy-decision-requested",
--                              webkit_web_navigation_action_get_original_uri
--                              (navigation_action));
--  return FALSE;
--}
- 
- /* For gtk3 offscreen rendered widgets.  */
- static gboolean
-@@ -599,8 +568,13 @@ DEFUN ("xwidget-webkit-execute-script",
- {
-   WEBKIT_FN_INIT ();
-   CHECK_STRING (script);
--  webkit_web_view_execute_script (WEBKIT_WEB_VIEW (xw->widget_osr),
--                                  SSDATA (script));
-+  // TODO: provide callback function to do something with the return
-+  // value!  This allows us to get rid of the title hack.
-+  webkit_web_view_run_javascript (WEBKIT_WEB_VIEW (xw->widget_osr),
-+                                  SSDATA (script),
-+                                  NULL, /*cancellable*/
-+                                  NULL, /*callback*/
-+                                  NULL /*user data*/);
-   return Qnil;
- }
-
diff --git a/emacs-25.3.tar.xz b/emacs-25.3.tar.xz
deleted file mode 100644
index 70c244a..0000000
--- a/emacs-25.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
-size 42854740
diff --git a/emacs-26.1-xft4x11.patch b/emacs-26.1-xft4x11.patch
new file mode 100644
index 0000000..6d00db7
--- /dev/null
+++ b/emacs-26.1-xft4x11.patch
@@ -0,0 +1,33 @@
+---
+ lwlib/xlwmenu.c |   13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+--- lwlib/xlwmenu.c
++++ lwlib/xlwmenu.c	2018-06-15 05:50:45.749287186 +0000
+@@ -1887,21 +1887,18 @@ XlwMenuInitialize (Widget request, Widge
+ 				   gray_width, gray_height,
+ 				   (unsigned long)1, (unsigned long)0, 1);
+ 
++  mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
+ #ifdef HAVE_XFT
+-  if (openXftFont (mw))
++  if (mw->menu.font || openXftFont (mw))
+     ;
+   else
+ #endif
+     {
+-      mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
++      mw->menu.font = XLoadQueryFont (display, "fixed");
+       if (!mw->menu.font)
+         {
+-          mw->menu.font = XLoadQueryFont (display, "fixed");
+-          if (!mw->menu.font)
+-            {
+-              fprintf (stderr, "Menu font fixed not found, can't continue.\n");
+-              emacs_abort ();
+-            }
++          fprintf (stderr, "Menu font fixed not found, can't continue.\n");
++          emacs_abort ();
+         }
+     }
+ 
diff --git a/emacs-25.3.dif b/emacs-26.1.dif
similarity index 90%
rename from emacs-25.3.dif
rename to emacs-26.1.dif
index 410e355..8183017 100644
--- a/emacs-25.3.dif
+++ b/emacs-26.1.dif
@@ -3,8 +3,9 @@
  configure                       |    6 --
  configure.ac                    |    6 --
  doc/man/etags.1                 |   20 ++++----
- lib-src/Makefile.in             |    4 -
+ lib-src/Makefile.in             |    6 +-
  lib-src/pop.c                   |    1 
+ lib/Makefile.in                 |    2 
  lisp/cmuscheme.el               |    3 -
  lisp/international/mule-cmds.el |    1 
  lisp/net/ange-ftp.el            |    8 +--
@@ -16,11 +17,11 @@
  site-lisp/term/kvt.el           |   97 ++++++++++++++++++++++++++++++++++++++++
  site-lisp/term/linux.el         |   79 ++++++++++++++++++++++++++++++++
  site-lisp/term/locale.el        |   13 +++++
- 17 files changed, 445 insertions(+), 32 deletions(-)
+ 18 files changed, 449 insertions(+), 32 deletions(-)
 
 --- Makefile.in
-+++ Makefile.in	2017-02-27 14:06:59.669213860 +0000
-@@ -493,8 +493,8 @@ install-arch-dep: src install-arch-indep
++++ Makefile.in	2018-05-29 13:07:53.479965338 +0000
+@@ -487,8 +487,8 @@ install-arch-dep: src install-arch-indep
  	umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
  	$(MAKE) -C lib-src install
  ifeq (${ns_self_contained},no)
@@ -30,8 +31,8 @@
 +	-chmod 755 "$(DESTDIR)${bindir}/$(EMACS)"
  ifndef NO_BIN_LINK
  	rm -f "$(DESTDIR)${bindir}/$(EMACS)"
- 	cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS)
-@@ -683,6 +683,7 @@ install-man:
+ 	cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)"
+@@ -677,6 +677,7 @@ install-man:
  	umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
  	thisdir=`/bin/pwd`; \
  	cd ${mansrcdir}; \
@@ -39,18 +40,18 @@
  	for page in *.1; do \
  	  test "$$page" = ChangeLog.1 && continue; \
  	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
-@@ -771,7 +772,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
+@@ -774,7 +775,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
  	   for page in *.1; do \
  	     rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
  	 fi)
--	(cd "$(DESTDIR)${bindir}" && rm -f $(EMACSFULL) $(EMACS) || true)
-+	(cd "$(DESTDIR)${bindir}" && rm -f $(EMACS) || true)
+-	rm -f "$(DESTDIR)${bindir}/$(EMACS)" "$(DESTDIR)${bindir}/$(EMACSFULL)"
++	rm -f "$(DESTDIR)${bindir}/$(EMACS)"
  	(if cd "$(DESTDIR)${icondir}"; then \
- 	   rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
- 	     hicolor/scalable/apps/${EMACS_NAME}.svg \
+ 	   rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
+ 	     "hicolor/scalable/apps/${EMACS_NAME}.svg" \
 --- configure
-+++ configure	2017-02-27 14:07:01.677176097 +0000
-@@ -10748,10 +10748,8 @@ fi
++++ configure	2018-05-29 13:07:58.359876230 +0000
+@@ -10428,10 +10428,8 @@ fi
  LD_SWITCH_X_SITE_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
@@ -64,8 +65,8 @@
    x_default_search_path=""
    x_search_path=${x_libraries}
 --- configure.ac
-+++ configure.ac	2017-02-27 14:06:59.673213785 +0000
-@@ -1726,10 +1726,8 @@ fi
++++ configure.ac	2018-05-29 13:07:53.515964680 +0000
+@@ -1806,10 +1806,8 @@ fi
  LD_SWITCH_X_SITE_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
@@ -79,7 +80,7 @@
    x_default_search_path=""
    x_search_path=${x_libraries}
 --- doc/man/etags.1
-+++ doc/man/etags.1	2017-02-27 14:06:59.673213785 +0000
++++ doc/man/etags.1	2018-05-29 13:07:53.515964680 +0000
 @@ -7,7 +7,7 @@
  ..
  
@@ -163,8 +164,17 @@
  .B \-h, \-H, \-\-help
  Print usage information.  Followed by one or more \-\-language=LANG
 --- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2017-02-27 14:06:59.673213785 +0000
-@@ -150,7 +150,7 @@ MKDIR_P = @MKDIR_P@
++++ lib-src/Makefile.in	2018-06-08 10:22:59.756084963 +0000
+@@ -30,6 +30,8 @@ CC=@CC@
+ CFLAGS=@CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
++override CFLAGS := $(CFLAGS:-fno-PIE=-g) -fPIE
++override LDFLAGS += -pie
+ 
+ version=@version@
+ ## Used in $archlibdir.
+@@ -158,7 +160,7 @@ MKDIR_P = @MKDIR_P@
  CLIENTW = @CLIENTW@
  
  # Things that a user might actually run, which should be installed in bindir.
@@ -173,7 +183,7 @@
                 ebrowse${EXEEXT}
  
  # Things that Emacs runs internally, or during the build process,
-@@ -367,7 +367,7 @@ etags${EXEEXT}: ${etags_deps}
+@@ -376,7 +378,7 @@ etags${EXEEXT}: ${etags_deps}
  ## etags.o files on top of each other.
  ## FIXME?
  ## Can't we use a wrapper that calls 'etags --ctags'?
@@ -183,7 +193,7 @@
  
  ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
 --- lib-src/pop.c
-+++ lib-src/pop.c	2017-02-27 14:06:59.673213785 +0000
++++ lib-src/pop.c	2018-05-29 13:07:56.015919030 +0000
 @@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http
  #ifdef MAIL_USE_POP
  
@@ -191,9 +201,20 @@
 +#include <ctype.h>
  #ifdef WINDOWSNT
  #include "ntlib.h"
- #include <winsock.h>
+ #undef _WIN32_WINNT
+--- lib/Makefile.in
++++ lib/Makefile.in	2018-06-08 11:18:36.604027828 +0000
+@@ -50,6 +50,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
+ 
++override CFLAGS := $(CFLAGS) -fPIC
++
+ ALL_CFLAGS= \
+   $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \
+   $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
 --- lisp/cmuscheme.el
-+++ lisp/cmuscheme.el	2017-02-27 14:06:59.673213785 +0000
++++ lisp/cmuscheme.el	2018-05-29 13:07:56.015919030 +0000
 @@ -241,7 +241,8 @@ is run).
  			 (read-string "Run Scheme: " scheme-program-name)
  			 scheme-program-name)))
@@ -205,7 +226,7 @@
  			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
  	(inferior-scheme-mode)))
 --- lisp/international/mule-cmds.el
-+++ lisp/international/mule-cmds.el	2017-02-27 14:06:59.673213785 +0000
++++ lisp/international/mule-cmds.el	2018-05-29 13:07:56.015919030 +0000
 @@ -39,6 +39,7 @@
  
  (defvar mule-keymap
@@ -215,8 +236,8 @@
      (define-key map "r" 'revert-buffer-with-coding-system)
      (define-key map "F" 'set-file-name-coding-system)
 --- lisp/net/ange-ftp.el
-+++ lisp/net/ange-ftp.el	2017-02-27 14:06:59.673213785 +0000
-@@ -4985,7 +4985,7 @@ NEWNAME should be the name to give the n
++++ lisp/net/ange-ftp.el	2018-05-29 13:07:56.015919030 +0000
+@@ -4971,7 +4971,7 @@ NEWNAME should be the name to give the n
  ;  "If a host matches this regexp then it is assumed to be running VOS.")
  ;
  ;(defun ange-ftp-vos-host (host)
@@ -225,7 +246,7 @@
  ;       (save-match-data
  ;	 (string-match ange-ftp-vos-host-regexp host))))
  ;
-@@ -5100,7 +5100,7 @@ NEWNAME should be the name to give the n
+@@ -5086,7 +5086,7 @@ NEWNAME should be the name to give the n
  
  ;; Return non-nil if HOST is running VMS.
  (defun ange-ftp-vms-host (host)
@@ -234,7 +255,7 @@
         (string-match-p ange-ftp-vms-host-regexp host)))
  
  ;; Because some VMS ftp servers convert filenames to lower case
-@@ -5608,7 +5608,7 @@ Other orders of $ and _ seem to all work
+@@ -5594,7 +5594,7 @@ Other orders of $ and _ seem to all work
  
  ;; Return non-nil if HOST is running MTS.
  (defun ange-ftp-mts-host (host)
@@ -243,7 +264,7 @@
         (string-match-p ange-ftp-mts-host-regexp host)))
  
  ;; Parse the current buffer which is assumed to be in mts ftp dir format.
-@@ -5806,7 +5806,7 @@ Other orders of $ and _ seem to all work
+@@ -5792,7 +5792,7 @@ Other orders of $ and _ seem to all work
  
  ;; Return non-nil if HOST is running CMS.
  (defun ange-ftp-cms-host (host)
@@ -253,7 +274,7 @@
  
  (defun ange-ftp-add-cms-host (host)
 --- lisp/site-load.el
-+++ lisp/site-load.el	2017-02-27 14:06:59.673213785 +0000
++++ lisp/site-load.el	2018-05-29 13:07:56.015919030 +0000
 @@ -0,0 +1,41 @@
 +;;;;
 +;;; emacs20.xx/lisp/site-load.el
@@ -297,7 +318,7 @@
 +
 +;;; site-load.el ends here
 --- lisp/speedbar.el
-+++ lisp/speedbar.el	2017-02-27 14:06:59.673213785 +0000
++++ lisp/speedbar.el	2018-05-29 13:07:56.015919030 +0000
 @@ -794,6 +794,7 @@ If you want to change this while speedba
  
      ;; Navigation.
@@ -307,10 +328,10 @@
      (define-key map "\M-n" 'speedbar-restricted-next)
      (define-key map "\M-p" 'speedbar-restricted-prev)
 --- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el	2017-02-27 14:06:59.673213785 +0000
-@@ -351,10 +351,12 @@ Must be greater than 1."
-   :group 'ispell)
- 
++++ lisp/textmodes/ispell.el	2018-05-29 13:07:56.015919030 +0000
+@@ -200,10 +200,12 @@ Must be greater than 1."
+ ;; cause an error; and one of the other spelling engines below is
+ ;; almost certainly installed in any case, for enchant to use.
  (defcustom ispell-program-name
 -  (or (executable-find "aspell")
 -      (executable-find "ispell")
@@ -325,7 +346,7 @@
    "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
    :type 'string
    :set (lambda (symbol value)
-@@ -1525,6 +1527,56 @@ The variable `ispell-library-directory'
+@@ -1414,6 +1416,56 @@ The variable `ispell-library-directory'
  (if ispell-menu-map-needed
      (progn
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
@@ -383,7 +404,7 @@
  	`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
  		    :help ,(purecopy "Supply explicit dictionary file name")))
 --- site-lisp/term/func-keys.el
-+++ site-lisp/term/func-keys.el	2017-02-27 14:06:59.673213785 +0000
++++ site-lisp/term/func-keys.el	2018-05-29 13:07:56.015919030 +0000
 @@ -0,0 +1,33 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path
@@ -419,7 +440,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von func-keys.el
 --- site-lisp/term/gnome.el
-+++ site-lisp/term/gnome.el	2017-02-27 14:06:59.673213785 +0000
++++ site-lisp/term/gnome.el	2018-05-29 13:07:56.015919030 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/gnomw.el for site-lisp path
@@ -519,7 +540,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von gnomw.el
 --- site-lisp/term/kvt.el
-+++ site-lisp/term/kvt.el	2017-02-27 14:06:59.677213709 +0000
++++ site-lisp/term/kvt.el	2018-05-29 13:07:56.019918957 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/kvt.el for site-lisp path
@@ -619,7 +640,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von kvt.el
 --- site-lisp/term/linux.el
-+++ site-lisp/term/linux.el	2017-02-27 14:06:59.677213709 +0000
++++ site-lisp/term/linux.el	2018-05-29 13:07:56.019918957 +0000
 @@ -0,0 +1,79 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/linux.el for site-lisp path
@@ -701,7 +722,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von linux.el
 --- site-lisp/term/locale.el
-+++ site-lisp/term/locale.el	2017-02-27 14:06:59.677213709 +0000
++++ site-lisp/term/locale.el	2018-05-29 13:07:56.019918957 +0000
 @@ -0,0 +1,13 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/locale.el for site-lisp path
diff --git a/emacs-26.1.tar.xz b/emacs-26.1.tar.xz
new file mode 100644
index 0000000..9c784e8
--- /dev/null
+++ b/emacs-26.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
+size 44258932
diff --git a/emacs-rpmlintrc b/emacs-rpmlintrc
index 262008e..a3da5cb 100644
--- a/emacs-rpmlintrc
+++ b/emacs-rpmlintrc
@@ -6,3 +6,6 @@ addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/
 addFilter(".*no-manual-page-for-binary.*emacs-*")
 addFilter(".*name-repeated-in-summar.*")
 addFilter(".*idden-file-or-dir.*\.dir-locals.el.*")
+addFilter(".*position-independent-executable-suggested.*/usr/bin/emacs-.*")
+addFilter(".*files-duplicate.*/usr/share/emacs.*")
+addFilter(".*desktopfile-without-binary.*/usr/share/applications/emacs.desktop.*emacs.*")
diff --git a/emacs.changes b/emacs.changes
index 25e4a9c..2b03bdb 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,73 @@
+-------------------------------------------------------------------
+Fri Jun 15 05:14:18 UTC 2018 - werner@suse.de
+
+- Simplify patch emacs-25.3-xft4x11.patch (from Henryk Hecht) for
+  boo#1096354 
+
+-------------------------------------------------------------------
+Tue Jun 12 07:52:20 UTC 2018 - werner@suse.de
+
+- Add patch emacs-26.1-xft4x11.patch to allow emacs-x11 to use
+  xft even for its menu bar (boo#1096354)
+
+-------------------------------------------------------------------
+Fri Jun  8 17:35:59 UTC 2018 - bjorn.lie@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer needed, nor
+  used. Emacs-x11 uses gsettings on openSUSE.
+
+-------------------------------------------------------------------
+Thu Jun  7 13:05:03 UTC 2018 - werner@suse.de
+
+- Use -fPIE/-pie for helper binaries 
+- Use Groups tag Productivity/Text/Editors
+
+-------------------------------------------------------------------
+Thu Jun  7 11:33:27 UTC 2018 - werner@suse.de
+
+- Add configure option for mailutils as recommended by GNU Emacs upstream
+- Re-enable games with GNU Emacs which requires system-user-games 
+
+-------------------------------------------------------------------
+Thu Jun  7 08:14:04 UTC 2018 - werner@suse.de
+
+- Cleanup the spec file by removing old suse_versions
+  and reordering configure options
+- Add some missed packages for configure 
+- Avoid Xwidgets on 32bit architectures as this does not build
+
+-------------------------------------------------------------------
+Tue May 29 13:09:38 UTC 2018 - werner@suse.de
+
+- Update to emacs version 26.1
+  * Startup Changes in Emacs 26.1
+    - New option '--fg-daemon'
+    - New option '--module-assertions'
+    - Emacs now supports 24-bit colors on capable text terminals
+    - Emacs now obeys the X resource "scrollBar" at startup
+  * Various Changes in Emacs 26.1, see NEWS
+  * Various Editing Changes in Emacs 26.1, see NEWS
+  * Various Changes in Specialized Modes and Packages in Emacs 26.1, see NEWS
+  * Some Incompatible Lisp Changes in Emacs 26.1, see NEWS
+  * Various Lisp Changes in Emacs 26.1, see NEWS
+- Removed patch now upstream 
+  * emacs-24.4-decl.dif
+  * emacs-25.2-bsc1058425.patch
+  * emacs-25.2-xwidget.patch
+  * gnulib.git-94e01571.patch
+- Remove patch emacs-24.1-bnc628268.patch as spell.el is gone for ever
+- Modify/port patches
+  * emacs-24.1-ps-mule.patch
+  * emacs-24.3-iconic.patch
+  * emacs-24.3-x11r7.patch
+  * emacs-24.4-flyspell.patch
+  * emacs-24.4-glibc.patch
+  * emacs-24.4-nonvoid.patch
+  * emacs-24.4-ps-bdf.patch
+  * emacs-24.4-xim.patch
+  * emacs-25.2-ImageMagick7.patch
+- Port and rename patch emacs-25.3.dif to emacs-26.1.dif
+
 -------------------------------------------------------------------
 Tue Mar 27 16:34:37 UTC 2018 - dimstar@opensuse.org
 
diff --git a/emacs.spec b/emacs.spec
index 8364f06..e5c2f26 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -16,9 +16,11 @@
 #
 
 
-%bcond_with     autoconf
-%if %{suse_version} >= 1330
 %bcond_without  autoconf
+%if 0%{?suse_version} >= 1550
+%bcond_without  mailutils
+%else
+%bcond_with     mailutils
 %endif
 # Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
 %bcond_with     cairo
@@ -31,26 +33,16 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 %endif
 BuildRequires:  alsa-devel
-%if %{with cairo} && 0%{?suse_version} > 1130
+%if %{with cairo}
 BuildRequires:  cairo-devel
 %endif
-BuildRequires:  dbus-1-devel
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  fonts-config
 BuildRequires:  freetype2-devel
-BuildRequires:  gconf2-devel
 BuildRequires:  giflib-devel
-%if 0%{?suse_version} > 1130
 BuildRequires:  gpm-devel
-%else
-BuildRequires:  gpm
-%endif
-%if 0%{?suse_version} > 1130
 BuildRequires:  gtk3-devel
-%else
-BuildRequires:  gtk2-devel
-%endif
 # Used for installtion of info pages as well as to
 # detect if the page info.info is part of that package
 BuildRequires:  info
@@ -63,32 +55,32 @@ BuildRequires:  libpng-devel
 BuildRequires:  librsvg-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libtiff-devel
-%if 0%{?suse_version} > 1140
 BuildRequires:  libudev-devel
-%endif
-%if 0%{?suse_version} > 1320
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.12
-%else
-BuildRequires:  libwebkitgtk3-devel
-%endif
 BuildRequires:  libxml2-devel
 BuildRequires:  m17n-lib-devel
-BuildRequires:  ncurses-devel
-%if 0%{?suse_version} > 1220
-BuildRequires:  makeinfo
-%else
-BuildRequires:  texinfo
+%if %{with mailutils}
+BuildRequires:  mailutils
+BuildRequires:  mailutils-devel
 %endif
+BuildRequires:  makeinfo
+BuildRequires:  ncurses-devel
+BuildRequires:  system-user-games
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(com_err)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(libacl)
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.12
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(xaw3d)
@@ -100,35 +92,37 @@ BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xxf86vm)
 Url:            http://www.gnu.org/software/emacs/
-Version:        25.3
+Version:        26.1
 Release:        0
-%if 0%{suse_version} >= 1300
-Requires:       etags
-%else
-Requires:       ctags
-%endif
-Requires:       emacs-info = %{version}
-Requires:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs Base Package
 License:        GPL-3.0-or-later
-Group:          Productivity/Editors/Emacs
+Group:          Productivity/Text/Editors
 Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
+Requires:       emacs-info = %{version}
+Requires:       emacs_program = %{version}-%{release}
+Requires:       etags
+%if %{with mailutils}
+Requires:       mailutils
+%endif
 Requires(pre):  fileutils
+Requires(pre):  group(games)
+Requires(pre):  user(games)
 Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
 Source4:        emacs-rpmlintrc
 Source5:        emacs.sh
-Patch:          emacs-25.3.dif
+Patch:          emacs-26.1.dif
 # PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change
 Patch2:         emacs-24.4-glibc.patch
-Patch3:         emacs-24.4-decl.dif
 Patch4:         emacs-24.3-asian-print.patch
 Patch5:         emacs-24.4-ps-bdf.patch
 Patch7:         emacs-24.1-ps-mule.patch
@@ -137,18 +131,12 @@ Patch11:        emacs-24.4-xim.patch
 Patch12:        emacs-24.3-x11r7.patch
 Patch15:        emacs-24.3-iconic.patch
 Patch16:        emacs-24.4-flyspell.patch
-Patch22:        emacs-24.1-bnc628268.patch
 Patch23:        emacs-25.1-custom-fonts.patch
 # this patch works with both ImageMagick-6 and ImageMagick-7 for us,
 # but that is because we ship /usr/include/ImageMagick-7/wand compat
 # symlink
 Patch24:        emacs-25.2-ImageMagick7.patch
-# PATCH-FIX-UPSTREAM-GNULIB CVE-2017-7476
-Patch25:        gnulib.git-94e01571.patch
-# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d781662873f228b110a128f7a2b6583a4d5e0a3a
-Patch26:        emacs-25.2-xwidget.patch
-# PATCH-FIX-UPSTREAM bsc#1058425 -- VUL-0: emacs: GNU Emacs 25.2 enriched text remote code execution
-Patch27:        emacs-25.2-bsc1058425.patch
+Patch25:        emacs-26.1-xft4x11.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
@@ -179,7 +167,7 @@ Requires(post): fileutils
 Requires:       emacs = %{version}-%{release}
 Provides:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
-Group:          Productivity/Editors/Emacs
+Group:          Productivity/Text/Editors
 
 %description -n emacs-nox
 Eight Megabytes And Constantly Swapping. Call it
@@ -198,7 +186,7 @@ Requires:       xorg-x11-fonts
 Requires:       xorg-x11-fonts-core
 Enhances:       libX11-6
 Summary:        GNU Emacs: Emacs binary with X Window System Support
-Group:          Productivity/Editors/Emacs
+Group:          Productivity/Text/Editors
 
 %description -n emacs-x11
 Call it
@@ -211,10 +199,8 @@ Support.
 %package     -n emacs-el
 Requires:       emacs = %{version}-%{release}
 Summary:        Several Lisp Files for GNU Emacs
-Group:          Productivity/Editors/Emacs
-%if 0%{?suse_version} >= 1120
+Group:          Productivity/Text/Editors
 BuildArch:      noarch
-%endif
 
 %description -n emacs-el
 Several Lisp files not needed for running GNU Emacs. Most of these
@@ -222,19 +208,16 @@ files are pre-byte compiled and therefore not necessary.
 
 %package     -n emacs-info
 Summary:        Info files for GNU Emacs
-Group:          Productivity/Editors/Emacs
+Group:          Productivity/Text/Editors
 Requires(post): %install_info_prereq
 Requires(preun): %install_info_prereq
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description -n emacs-info
 This package contains all the Info files for GNU Emacs. These files can
 be read online with GNU Emacs. They describe Emacs and some of its
 modes.
 
-%if 0%{suse_version} >= 1300
 %package     -n etags
 Summary:        Generate Tag Files for Use with Emacs
 Group:          Development/Tools/Navigators
@@ -246,12 +229,10 @@ Provides:       ctags:/usr/bin/etags
 ETags generates tag files from source code in Pascal, Cobol, Ada, Perl,
 LaTeX, Scheme, Emacs Lisp/Common Lisp, Postscript, Erlang, Python, Prolog,
 and most assembler-like syntaxes.
-%endif
 
 %prep
 %setup -q -b 2
 %patch2  -p0 -b .glibc
-%patch3  -p0 -b .decl
 %patch4  -p0 -b .print
 %patch5  -p0 -b .psbdf
 %patch7  -p0 -b .psmu
@@ -260,14 +241,9 @@ and most assembler-like syntaxes.
 %patch12 -p0 -b .x11r7
 %patch15 -p0 -b .iconic
 %patch16 -p0 -b .flyspell
-%patch22 -p0 -b .obsolate
 %patch23 -p0 -b .custfnt
 %patch24 -p1 -b .imag
-%patch25 -p0
-%if 0%{?suse_version} > 1320
-%patch26 -p1
-%endif
-%patch27 -p0
+%patch25 -p0 -b .xft
 %patch   -p0 -b .0
 
 %build
@@ -294,17 +270,15 @@ if test -s autogen.sh ; then
     ln -sf /bin/true autogen.sh
 fi
 %else
-autoreconf -fiv
+autoreconf -fiv -I $PWD -I $PWD/m4
 %endif
 
 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
-%if %suse_version >= 1110
 %ifarch ppc ppc64 ia64
 %if %(getconf PAGESIZE) != 65536
 %error "Error: wrong build host, PAGESIZE must be 65536"
 exit 1
 %endif
-%endif
 %endif
   exec_shield=0
   if test -e /proc/sys/kernel/exec-shield; then
@@ -365,7 +339,6 @@ LDFLAGS=
   cflags -Wno-pointer-sign       CFLAGS
   cflags -Wno-unused-variable    CFLAGS
   cflags -Wno-unused-label       CFLAGS
-  cflags -Wno-unprototyped-calls CFLAGS
   cflags -fno-optimize-sibling-calls CFLAGS
   cflags -fno-PIE                CFLAGS
   cflags -Wl,-O2		 LDFLAGS
@@ -390,6 +363,7 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS
 	 --enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp
 "
 DESKTOP="--with-x \
+	 --with-xim \
 	 --with-sound \
 	 --with-xpm \
 	 --with-jpeg \
@@ -402,21 +376,22 @@ DESKTOP="--with-x \
 	 --without-gpm \
 "
     GTK="${DESKTOP} \
-%if 0%{?suse_version} > 1130
 	 --with-x-toolkit=gtk3 \
-	 --with-xwidgets \
-%else
-	 --with-x-toolkit=gtk2 \
-%endif
 	 --with-toolkit-scroll-bars \
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib} \
 	 --with-libotf \
 	 --with-m17n-flt \
-%if %{with cairo} && 0%{?suse_version} > 1130
+%if %{with cairo}
 	 --with-cairo \
 %endif
 "
+if (($(getconf LONG_BIT) >= 62))
+then
+    # Does not compile on 32bit architecture due failing
+    # `verify (USE_LSB_TAG)' in src/xwidget.c
+    GTK="${GTK} --with-xwidgets"
+fi
     X11="${DESKTOP} \
 	 --with-x-toolkit=lucid \
 	 --with-toolkit-scroll-bars \
@@ -427,6 +402,7 @@ DESKTOP="--with-x \
 "
   NOX11="--with-gpm \
 	 --without-x \
+	 --without-xim \
 	 --without-sound \
 	 --without-xpm \
 	 --without-jpeg \
@@ -439,16 +415,25 @@ DESKTOP="--with-x \
 	 --without-libotf \
 	 --without-m17n-flt \
 "
-   COMP="--with-pop \
+   COMP="--disable-build-details \
+%if %{with mailutils}
+	 --without-pop
+	 --with-mailutils
+%else
+	 --with-pop \
+%endif
 	 --without-hesiod \
+	 --with-gameuser=:games \
 	 --with-kerberos \
 	 --with-kerberos5 \
-	 --with-xim \
-	 --with-wide-int \
 	 --with-file-notification=inotify \
 	 --with-modules \
 	 --enable-autodepend \
 "
+if (($(getconf LONG_BIT) < 62))
+then
+    COMP="${COMP} --with-wide-int"
+fi
 
 ##OIFS="$IFS"; IFS=.
 ##set -- $(gcc -dumpversion 2>/dev/null)
@@ -562,13 +547,8 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ps-mule.el.mule
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/startup.el.iconic
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.mule
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term
-%if 0%{suse_version} < 1300
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ctags.1
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/etags.1
-%else
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.README
-%endif
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el.psbdf
@@ -628,17 +608,11 @@ echo 'X-KDE-StartupNotify=false' >> etc/emacs.desktop
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs.desktop
 cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png
 %suse_update_desktop_file -r -i emacs TextEditor Utility
-%if 0%{suse_version} >= 1300
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/ctags		%{buildroot}%{_bindir}/ctags
 ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man}	%{buildroot}%{_mandir}/man1/ctags.1%{ext_man}
 ln -sf %{_bindir}/gnuctags				%{buildroot}%{_sysconfdir}/alternatives/ctags
 ln -sf %{_mandir}/man1/gnuctags.1%{ext_man}		%{buildroot}%{_sysconfdir}/alternatives/ctags.1%{ext_man}
-%else
-rm -vf %{buildroot}%{_bindir}/etags
-rm -vf %{buildroot}%{_bindir}/gnuctags
-rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1*
-%endif
 
 %pre
 test -L usr/bin/emacs && rm -f usr/bin/emacs || true
@@ -677,7 +651,6 @@ for f in %info_files; do
   %install_info_delete --info-dir=%{_infodir} "%{_infodir}/$f.gz"
 done
 
-%if 0%{suse_version} >= 1300
 %post -n etags
 test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags
 %{_sbindir}/update-alternatives --quiet --force --install \
@@ -689,7 +662,6 @@ test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags
 if test $1 -eq 0 ; then
     %{_sbindir}/update-alternatives --quiet --remove ctags %{_bindir}/gnuctags
 fi
-%endif
 
 %files -f site-lisp.lst -n emacs
 %defattr(-, root, root)
@@ -701,10 +673,17 @@ fi
 %dir %{_prefix}/lib/emacs/%{version}/
 %dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl
+%if %{without mailutils}
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail
+%endif
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
+%if 0
+%attr(04755,games,games) %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
+%else
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
+%endif
+%{_prefix}/lib/systemd/user/emacs.service
 %dir %{_datadir}/doc/packages/emacs/
 %{_datadir}/doc/packages/emacs/doc
 %dir %{_datadir}/emacs/
@@ -719,10 +698,6 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/DISTRIB
 %{_datadir}/emacs/%{version}/etc/DOC
 %doc %{_datadir}/emacs/%{version}/etc/ERC-NEWS
-%if 0%{suse_version} < 1300
-%doc %{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
-%doc %{_datadir}/emacs/%{version}/etc/ETAGS.README
-%endif
 %doc %{_datadir}/emacs/%{version}/etc/FTP
 %doc %{_datadir}/emacs/%{version}/etc/GNU
 %doc %{_datadir}/emacs/%{version}/etc/GNUS-NEWS
@@ -742,6 +717,7 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.22
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.23
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.24
+%doc %{_datadir}/emacs/%{version}/etc/NEWS.25
 %doc %{_datadir}/emacs/%{version}/etc/NEXTSTEP
 %doc %{_datadir}/emacs/%{version}/etc/NXML-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/ORDERS
@@ -894,6 +870,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb
 %{_datadir}/emacs/%{version}/etc/emacs.appdata.xml
 %{_datadir}/emacs/%{version}/etc/emacs.icon
+%{_datadir}/emacs/%{version}/etc/emacs.service
 %{_datadir}/emacs/%{version}/etc/enriched.txt
 %dir %{_datadir}/emacs/%{version}/etc/forms/
 %doc %{_datadir}/emacs/%{version}/etc/forms/README
@@ -1489,105 +1466,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.pbm
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.xpm
 %dir %{_datadir}/emacs/%{version}/etc/nxml/
-%{_datadir}/emacs/%{version}/etc/nxml/00000-0007F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00080-000FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00100-0017F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00180-0024F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00250-002AF.el
-%{_datadir}/emacs/%{version}/etc/nxml/002B0-002FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00300-0036F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00370-003FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00400-004FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00500-0052F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00530-0058F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00590-005FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00600-006FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00700-0074F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00780-007BF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00900-0097F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00980-009FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00A00-00A7F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00A80-00AFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00B00-00B7F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00B80-00BFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00C00-00C7F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00C80-00CFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00D00-00D7F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00D80-00DFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00E00-00E7F.el
-%{_datadir}/emacs/%{version}/etc/nxml/00E80-00EFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/00F00-00FFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01000-0109F.el
-%{_datadir}/emacs/%{version}/etc/nxml/010A0-010FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01100-011FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01200-0137F.el
-%{_datadir}/emacs/%{version}/etc/nxml/013A0-013FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01400-0167F.el
-%{_datadir}/emacs/%{version}/etc/nxml/01680-0169F.el
-%{_datadir}/emacs/%{version}/etc/nxml/016A0-016FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01700-0171F.el
-%{_datadir}/emacs/%{version}/etc/nxml/01720-0173F.el
-%{_datadir}/emacs/%{version}/etc/nxml/01740-0175F.el
-%{_datadir}/emacs/%{version}/etc/nxml/01760-0177F.el
-%{_datadir}/emacs/%{version}/etc/nxml/01780-017FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01800-018AF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01E00-01EFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/01F00-01FFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02000-0206F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02070-0209F.el
-%{_datadir}/emacs/%{version}/etc/nxml/020A0-020CF.el
-%{_datadir}/emacs/%{version}/etc/nxml/020D0-020FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02100-0214F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02150-0218F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02190-021FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02200-022FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02300-023FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02400-0243F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02440-0245F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02460-024FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02500-0257F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02580-0259F.el
-%{_datadir}/emacs/%{version}/etc/nxml/025A0-025FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02600-026FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02700-027BF.el
-%{_datadir}/emacs/%{version}/etc/nxml/027C0-027EF.el
-%{_datadir}/emacs/%{version}/etc/nxml/027F0-027FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02800-028FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02900-0297F.el
-%{_datadir}/emacs/%{version}/etc/nxml/02980-029FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02A00-02AFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02E80-02EFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02F00-02FDF.el
-%{_datadir}/emacs/%{version}/etc/nxml/02FF0-02FFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/03000-0303F.el
-%{_datadir}/emacs/%{version}/etc/nxml/03040-0309F.el
-%{_datadir}/emacs/%{version}/etc/nxml/030A0-030FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/03100-0312F.el
-%{_datadir}/emacs/%{version}/etc/nxml/03130-0318F.el
-%{_datadir}/emacs/%{version}/etc/nxml/03190-0319F.el
-%{_datadir}/emacs/%{version}/etc/nxml/031A0-031BF.el
-%{_datadir}/emacs/%{version}/etc/nxml/031F0-031FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/03200-032FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/03300-033FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/03400-04DBF.el
-%{_datadir}/emacs/%{version}/etc/nxml/0A000-0A48F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0A490-0A4CF.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FB00-0FB4F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FB50-0FDFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FE00-0FE0F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FE20-0FE2F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FE30-0FE4F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FE50-0FE6F.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FE70-0FEFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FF00-0FFEF.el
-%{_datadir}/emacs/%{version}/etc/nxml/0FFF0-0FFFF.el
-%{_datadir}/emacs/%{version}/etc/nxml/10300-1032F.el
-%{_datadir}/emacs/%{version}/etc/nxml/10330-1034F.el
-%{_datadir}/emacs/%{version}/etc/nxml/10400-1044F.el
-%{_datadir}/emacs/%{version}/etc/nxml/1D000-1D0FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/1D100-1D1FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/1D400-1D7FF.el
-%{_datadir}/emacs/%{version}/etc/nxml/E0000-E007F.el
 %doc %{_datadir}/emacs/%{version}/etc/nxml/README
 %{_datadir}/emacs/%{version}/etc/nxml/test-invalid.xml
 %{_datadir}/emacs/%{version}/etc/nxml/test-valid.xml
@@ -1660,6 +1538,8 @@ fi
 %{_datadir}/emacs/%{version}/etc/schema/dbstart.rnc
 %{_datadir}/emacs/%{version}/etc/schema/docbook.rnc
 %{_datadir}/emacs/%{version}/etc/schema/locate.rnc
+%{_datadir}/emacs/%{version}/etc/schema/od-manifest-schema-v1.2-os.rnc
+%{_datadir}/emacs/%{version}/etc/schema/od-schema-v1.2-os.rnc
 %{_datadir}/emacs/%{version}/etc/schema/rdfxml.rnc
 %{_datadir}/emacs/%{version}/etc/schema/relaxng.rnc
 %{_datadir}/emacs/%{version}/etc/schema/schemas.xml
@@ -1767,6 +1647,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/apropos.elc
 %{_datadir}/emacs/%{version}/lisp/arc-mode.elc
 %{_datadir}/emacs/%{version}/lisp/array.elc
+%{_datadir}/emacs/%{version}/lisp/auth-source-pass.elc
+%{_datadir}/emacs/%{version}/lisp/auth-source.elc
 %{_datadir}/emacs/%{version}/lisp/autoarg.elc
 %{_datadir}/emacs/%{version}/lisp/autoinsert.elc
 %{_datadir}/emacs/%{version}/lisp/autorevert.elc
@@ -2041,9 +1923,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/desktop.elc
 %{_datadir}/emacs/%{version}/lisp/dframe.elc
 %{_datadir}/emacs/%{version}/lisp/dired-aux.elc
+%{_datadir}/emacs/%{version}/lisp/dired-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/dired-x.elc
 %{_datadir}/emacs/%{version}/lisp/dired.elc
 %{_datadir}/emacs/%{version}/lisp/dirtrack.elc
+%{_datadir}/emacs/%{version}/lisp/display-line-numbers.elc
 %{_datadir}/emacs/%{version}/lisp/disp-table.elc
 %{_datadir}/emacs/%{version}/lisp/dnd.elc
 %{_datadir}/emacs/%{version}/lisp/doc-view.elc
@@ -2055,6 +1939,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/dynamic-setting.elc
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.elc
 %{_datadir}/emacs/%{version}/lisp/echistory.elc
+%{_datadir}/emacs/%{version}/lisp/ecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/edmacro.elc
 %{_datadir}/emacs/%{version}/lisp/ehelp.elc
 %{_datadir}/emacs/%{version}/lisp/elec-pair.elc
@@ -2081,6 +1966,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.elc
@@ -2097,6 +1983,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-core.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-custom.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-datadebug.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-opt.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-speedbar.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio.elc
@@ -2125,10 +2012,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pcase.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pp.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/radix-tree.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/re-builder.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/regexp-opt.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/regi.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ring.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/rmc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/seq.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.elc
@@ -2141,6 +2030,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/thunk.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer-list.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tq.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/trace.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/unsafep.elc
@@ -2269,12 +2159,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/generic-x.el
 %dir %{_datadir}/emacs/%{version}/lisp/gnus/
 %{_datadir}/emacs/%{version}/lisp/gnus/.dir-locals.el
-%{_datadir}/emacs/%{version}/lisp/gnus/auth-source.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/canlock.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/compface.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/ecomplete.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/flow-fill.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gmm-utils.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-agent.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-art.elc
@@ -2292,7 +2178,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-draft.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-dup.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-eform.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-ems.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-fun.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.elc
@@ -2309,6 +2194,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-picon.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-range.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-registry.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-rfc1843.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-salt.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.elc
@@ -2316,7 +2202,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-srvr.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-start.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sum.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-sync.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-topic.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-undo.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-util.elc
@@ -2324,17 +2209,10 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-vm.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gssapi.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/html2text.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/ietf-drums.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/mail-parse.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/mail-prsvr.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mail-source.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/mailcap.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/message.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/messcompat.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-bodies.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-decode.elc
@@ -2376,29 +2254,13 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/nntp.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnweb.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/plstore.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/pop3.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/qp.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/registry.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc1843.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2045.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2047.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2231.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/rtree.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/score-mode.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve-manage.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve-mode.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/smiley.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/smime.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-report.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-stat.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-wash.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/spam.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/starttls.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/utf7.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/yenc.elc
-%{_datadir}/emacs/%{version}/lisp/gs.elc
 %{_datadir}/emacs/%{version}/lisp/help-at-pt.elc
 %{_datadir}/emacs/%{version}/lisp/help-fns.elc
 %{_datadir}/emacs/%{version}/lisp/help-macro.elc
@@ -2415,6 +2277,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/ibuf-ext.elc
 %{_datadir}/emacs/%{version}/lisp/ibuf-macs.elc
 %{_datadir}/emacs/%{version}/lisp/ibuffer.elc
+%{_datadir}/emacs/%{version}/lisp/ibuffer-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/icomplete.elc
 %{_datadir}/emacs/%{version}/lisp/ido.elc
 %{_datadir}/emacs/%{version}/lisp/ielm.elc
@@ -2424,13 +2287,15 @@ fi
 %{_datadir}/emacs/%{version}/lisp/image-mode.elc
 %{_datadir}/emacs/%{version}/lisp/image.elc
 %{_datadir}/emacs/%{version}/lisp/imenu.elc
+%dir %{_datadir}/emacs/%{version}/lisp/image/
+%{_datadir}/emacs/%{version}/lisp/image/compface.elc
+%{_datadir}/emacs/%{version}/lisp/image/gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/indent.elc
 %{_datadir}/emacs/%{version}/lisp/info-look.elc
 %{_datadir}/emacs/%{version}/lisp/info-xref.elc
 %{_datadir}/emacs/%{version}/lisp/info.elc
 %{_datadir}/emacs/%{version}/lisp/informat.elc
 %dir %{_datadir}/emacs/%{version}/lisp/international/
-%doc %{_datadir}/emacs/%{version}/lisp/international/README
 %{_datadir}/emacs/%{version}/lisp/international/ccl.elc
 %{_datadir}/emacs/%{version}/lisp/international/characters.elc
 %{_datadir}/emacs/%{version}/lisp/international/charprop.el
@@ -2455,6 +2320,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/mule.elc
 %{_datadir}/emacs/%{version}/lisp/international/ogonek.elc
 %{_datadir}/emacs/%{version}/lisp/international/quail.elc
+%{_datadir}/emacs/%{version}/lisp/international/rfc1843.elc
 %{_datadir}/emacs/%{version}/lisp/international/robin.elc
 %{_datadir}/emacs/%{version}/lisp/international/titdic-cnv.elc
 %{_datadir}/emacs/%{version}/lisp/international/ucs-normalize.elc
@@ -2471,8 +2337,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/uni-name.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-numeric.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-old-name.el
+%{_datadir}/emacs/%{version}/lisp/international/uni-special-lowercase.el
+%{_datadir}/emacs/%{version}/lisp/international/uni-special-titlecase.el
+%{_datadir}/emacs/%{version}/lisp/international/uni-special-uppercase.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-titlecase.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-uppercase.el
+%{_datadir}/emacs/%{version}/lisp/international/utf7.elc
 %{_datadir}/emacs/%{version}/lisp/international/utf-7.elc
 %{_datadir}/emacs/%{version}/lisp/isearch.elc
 %{_datadir}/emacs/%{version}/lisp/isearchb.elc
@@ -2480,6 +2350,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.elc
 %{_datadir}/emacs/%{version}/lisp/jka-compr.elc
 %{_datadir}/emacs/%{version}/lisp/json.elc
+%{_datadir}/emacs/%{version}/lisp/htmlfontify-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/kermit.elc
 %{_datadir}/emacs/%{version}/lisp/kmacro.elc
 %dir %{_datadir}/emacs/%{version}/lisp/language/
@@ -2601,10 +2472,14 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/blessmail.el
 %{_datadir}/emacs/%{version}/lisp/mail/emacsbug.elc
 %{_datadir}/emacs/%{version}/lisp/mail/feedmail.elc
+%{_datadir}/emacs/%{version}/lisp/mail/flow-fill.elc
 %{_datadir}/emacs/%{version}/lisp/mail/footnote.elc
 %{_datadir}/emacs/%{version}/lisp/mail/hashcash.elc
+%{_datadir}/emacs/%{version}/lisp/mail/ietf-drums.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mail-extr.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mail-hist.elc
+%{_datadir}/emacs/%{version}/lisp/mail/mail-parse.elc
+%{_datadir}/emacs/%{version}/lisp/mail/mail-prsvr.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mail-utils.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mailabbrev.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mailalias.elc
@@ -2612,7 +2487,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/mailheader.elc
 %{_datadir}/emacs/%{version}/lisp/mail/metamail.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mspools.elc
+%{_datadir}/emacs/%{version}/lisp/mail/qp.elc
 %{_datadir}/emacs/%{version}/lisp/mail/reporter.elc
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2045.elc
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2047.elc
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2231.elc
 %{_datadir}/emacs/%{version}/lisp/mail/rfc2368.elc
 %{_datadir}/emacs/%{version}/lisp/mail/rfc822.elc
 %{_datadir}/emacs/%{version}/lisp/mail/rmail-spam-filter.elc
@@ -2624,6 +2503,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/rmailout.elc
 %{_datadir}/emacs/%{version}/lisp/mail/rmailsort.elc
 %{_datadir}/emacs/%{version}/lisp/mail/rmailsum.elc
+%{_datadir}/emacs/%{version}/lisp/mail/rmail-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/mail/sendmail.elc
 %{_datadir}/emacs/%{version}/lisp/mail/smtpmail.elc
 %{_datadir}/emacs/%{version}/lisp/mail/supercite.elc
@@ -2631,6 +2511,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/undigest.elc
 %{_datadir}/emacs/%{version}/lisp/mail/unrmail.elc
 %{_datadir}/emacs/%{version}/lisp/mail/uudecode.elc
+%{_datadir}/emacs/%{version}/lisp/mail/yenc.elc
 %{_datadir}/emacs/%{version}/lisp/makesum.elc
 %{_datadir}/emacs/%{version}/lisp/man.elc
 %{_datadir}/emacs/%{version}/lisp/master.elc
@@ -2642,11 +2523,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-alias.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-buffers.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-comp.elc
-%{_datadir}/emacs/%{version}/lisp/mh-e/mh-compat.el
+%{_datadir}/emacs/%{version}/lisp/mh-e/mh-compat.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-e.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-folder.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-funcs.elc
-%{_datadir}/emacs/%{version}/lisp/mh-e/mh-gnus.el
+%{_datadir}/emacs/%{version}/lisp/mh-e/mh-gnus.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-identity.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-inc.elc
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-junk.elc
@@ -2696,6 +2577,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/hmac-md5.elc
 %{_datadir}/emacs/%{version}/lisp/net/imap.elc
 %{_datadir}/emacs/%{version}/lisp/net/ldap.elc
+%{_datadir}/emacs/%{version}/lisp/net/mailcap.elc
 %{_datadir}/emacs/%{version}/lisp/net/mairix.elc
 %{_datadir}/emacs/%{version}/lisp/net/net-utils.elc
 %{_datadir}/emacs/%{version}/lisp/net/netrc.elc
@@ -2708,7 +2590,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/newsticker.elc
 %{_datadir}/emacs/%{version}/lisp/net/nsm.elc
 %{_datadir}/emacs/%{version}/lisp/net/ntlm.elc
-%{_datadir}/emacs/%{version}/lisp/net/pinentry.elc
+%{_datadir}/emacs/%{version}/lisp/net/pop3.elc
+%{_datadir}/emacs/%{version}/lisp/net/puny.elc
 %{_datadir}/emacs/%{version}/lisp/net/quickurl.elc
 %{_datadir}/emacs/%{version}/lisp/net/rcirc.elc
 %{_datadir}/emacs/%{version}/lisp/net/rfc2104.elc
@@ -2719,12 +2602,16 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/sasl-scram-rfc.elc
 %{_datadir}/emacs/%{version}/lisp/net/sasl.elc
 %{_datadir}/emacs/%{version}/lisp/net/secrets.elc
+%{_datadir}/emacs/%{version}/lisp/net/sieve-manage.elc
+%{_datadir}/emacs/%{version}/lisp/net/sieve-mode.elc
+%{_datadir}/emacs/%{version}/lisp/net/sieve.elc
 %{_datadir}/emacs/%{version}/lisp/net/shr-color.elc
 %{_datadir}/emacs/%{version}/lisp/net/shr.elc
 %{_datadir}/emacs/%{version}/lisp/net/snmp-mode.elc
 %{_datadir}/emacs/%{version}/lisp/net/soap-client.elc
 %{_datadir}/emacs/%{version}/lisp/net/soap-inspect.elc
 %{_datadir}/emacs/%{version}/lisp/net/socks.elc
+%{_datadir}/emacs/%{version}/lisp/net/starttls.elc
 %{_datadir}/emacs/%{version}/lisp/net/telnet.elc
 %{_datadir}/emacs/%{version}/lisp/net/tls.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-adb.elc
@@ -2733,7 +2620,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/net/tramp-sh.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-smb.elc
@@ -2747,14 +2633,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/novice.elc
 %dir %{_datadir}/emacs/%{version}/lisp/nxml/
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-enc.elc
-%{_datadir}/emacs/%{version}/lisp/nxml/nxml-glyph.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-maint.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-mode.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-ns.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-outln.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-parse.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-rap.elc
-%{_datadir}/emacs/%{version}/lisp/nxml/nxml-uchnm.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-util.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/rng-cmpct.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/rng-dt.elc
@@ -2774,7 +2658,6 @@ fi
 %dir %{_datadir}/emacs/%{version}/lisp/obsolete/
 %{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/assoc.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/bruce.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc
@@ -2784,12 +2667,10 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/erc-hecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/eudcb-ph.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/gs.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/gulp.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-swed.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/html2text.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/iswitchb.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/keyswap.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/landmark.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/ledit.elc
@@ -2799,6 +2680,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/meese.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/messcompat.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc
@@ -2814,14 +2696,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp5.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/resume.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/s-region.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/scribe.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/spell.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/sregex.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/swedish.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/terminal.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.elc
@@ -2834,22 +2711,29 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/yow.elc
 %dir %{_datadir}/emacs/%{version}/lisp/org/
 %{_datadir}/emacs/%{version}/lisp/org/ob-C.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-J.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-R.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-abc.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-awk.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-calc.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-clojure.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-comint.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-coq.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-core.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-css.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-dot.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ebnf.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-eval.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-exp.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-forth.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-fortran.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-groovy.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-haskell.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-hledger.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-io.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-java.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-js.elc
@@ -2859,6 +2743,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-lilypond.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-lisp.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-lob.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-lua.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-makefile.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.elc
@@ -2869,19 +2754,22 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-perl.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-processing.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-python.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-ref.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-ruby.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-sass.elc
-%{_datadir}/emacs/%{version}/lisp/org/ob-scala.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-scheme.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-screen.elc
-%{_datadir}/emacs/%{version}/lisp/org/ob-sh.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-sed.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-shen.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-shell.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-sql.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-stan.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-table.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-tangle.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-vala.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-agenda.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-archive.elc
@@ -2896,9 +2784,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-ctags.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-duration.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-element.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-entities.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-eshell.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-eww.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-faces.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-feed.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-footnote.elc
@@ -2910,6 +2800,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-install.el
 %{_datadir}/emacs/%{version}/lisp/org/org-irc.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-lint.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-list.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/org/org-macro.elc
@@ -2949,6 +2840,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/pcmpl-unix.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-x.elc
 %{_datadir}/emacs/%{version}/lisp/pcomplete.elc
+%{_datadir}/emacs/%{version}/lisp/pixel-scroll.elc
 %dir %{_datadir}/emacs/%{version}/lisp/play/
 %{_datadir}/emacs/%{version}/lisp/play/5x5.elc
 %{_datadir}/emacs/%{version}/lisp/play/animate.elc
@@ -2975,6 +2867,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/studly.elc
 %{_datadir}/emacs/%{version}/lisp/play/tetris.elc
 %{_datadir}/emacs/%{version}/lisp/play/zone.elc
+%{_datadir}/emacs/%{version}/lisp/plstore.elc
 %{_datadir}/emacs/%{version}/lisp/printing.elc
 %{_datadir}/emacs/%{version}/lisp/proced.elc
 %{_datadir}/emacs/%{version}/lisp/profiler.elc
@@ -3022,6 +2915,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/executable.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/f90.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/flymake.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/flymake-proc.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/fortran.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/gdb-mi.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/glasses.elc
@@ -3070,16 +2964,19 @@ fi
 %{_datadir}/emacs/%{version}/lisp/ps-def.elc
 %{_datadir}/emacs/%{version}/lisp/ps-mule.elc
 %{_datadir}/emacs/%{version}/lisp/ps-print.elc
+%{_datadir}/emacs/%{version}/lisp/ps-print-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/ps-samp.elc
 %{_datadir}/emacs/%{version}/lisp/recentf.elc
 %{_datadir}/emacs/%{version}/lisp/rect.elc
 %{_datadir}/emacs/%{version}/lisp/register.elc
+%{_datadir}/emacs/%{version}/lisp/registry.elc
 %{_datadir}/emacs/%{version}/lisp/repeat.elc
 %{_datadir}/emacs/%{version}/lisp/replace.elc
 %{_datadir}/emacs/%{version}/lisp/reposition.elc
 %{_datadir}/emacs/%{version}/lisp/reveal.elc
 %{_datadir}/emacs/%{version}/lisp/rfn-eshadow.elc
 %{_datadir}/emacs/%{version}/lisp/rot13.elc
+%{_datadir}/emacs/%{version}/lisp/rtree.elc
 %{_datadir}/emacs/%{version}/lisp/ruler-mode.elc
 %{_datadir}/emacs/%{version}/lisp/savehist.elc
 %{_datadir}/emacs/%{version}/lisp/saveplace.elc
@@ -3102,6 +2999,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/strokes.elc
 %{_datadir}/emacs/%{version}/lisp/subdirs.el
 %{_datadir}/emacs/%{version}/lisp/subr.elc
+%{_datadir}/emacs/%{version}/lisp/svg.elc
 %{_datadir}/emacs/%{version}/lisp/t-mouse.elc
 %{_datadir}/emacs/%{version}/lisp/tabify.elc
 %{_datadir}/emacs/%{version}/lisp/talk.elc
@@ -3116,6 +3014,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/cygwin.elc
 %{_datadir}/emacs/%{version}/lisp/term/internal.elc
 %{_datadir}/emacs/%{version}/lisp/term/iris-ansi.elc
+%{_datadir}/emacs/%{version}/lisp/term/konsole.elc
 %{_datadir}/emacs/%{version}/lisp/term/linux.elc
 %{_datadir}/emacs/%{version}/lisp/term/lk201.elc
 %{_datadir}/emacs/%{version}/lisp/term/news.elc
@@ -3124,6 +3023,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/rxvt.elc
 %{_datadir}/emacs/%{version}/lisp/term/screen.elc
 %{_datadir}/emacs/%{version}/lisp/term/sun.elc
+%{_datadir}/emacs/%{version}/lisp/term/tmux.elc
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.elc
 %{_datadir}/emacs/%{version}/lisp/term/tvi970.elc
 %{_datadir}/emacs/%{version}/lisp/term/vt100.elc
@@ -3145,7 +3045,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.elc
+%{_datadir}/emacs/%{version}/lisp/textmodes/less-css-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.elc
+%{_datadir}/emacs/%{version}/lisp/textmodes/mhtml-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/nroff-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/page-ext.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/page.elc
@@ -3160,6 +3062,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-dcr.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-global.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-index.elc
+%{_datadir}/emacs/%{version}/lisp/textmodes/reftex-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-parse.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-ref.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/reftex-sel.elc
@@ -3283,6 +3186,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/window.elc
 %{_datadir}/emacs/%{version}/lisp/winner.elc
 %{_datadir}/emacs/%{version}/lisp/woman.elc
+%{_datadir}/emacs/%{version}/lisp/xdg.elc
 %{_datadir}/emacs/%{version}/lisp/x-dnd.elc
 %{_datadir}/emacs/%{version}/lisp/xml.elc
 %{_datadir}/emacs/%{version}/lisp/xt-mouse.elc
@@ -3299,10 +3203,9 @@ fi
 %dir %{_datadir}/emacs/site-lisp/site-start.d/
 %{_mandir}/man1/*.1%{ext_man}
 %exclude %{_mandir}/man1/*tags.1%{ext_man}
-%dir %{_localstatedir}/games
-%dir %{_localstatedir}/games/emacs
-%{_localstatedir}/games/emacs/snake-scores
-%{_localstatedir}/games/emacs/tetris-scores
+%dir %attr(770,games,games) %{_localstatedir}/games/emacs
+%attr(660,games,games) %{_localstatedir}/games/emacs/snake-scores
+%attr(660,games,games) %{_localstatedir}/games/emacs/tetris-scores
 
 %files       -n emacs-nox
 %defattr(-, root, root)
@@ -3314,9 +3217,6 @@ fi
 %{_bindir}/emacs-gtk
 %dir %{appDefaultsDir}
 %{appDefaultsFile}
-%if 0%{suse_version} < 1320
-%dir %{_datadir}/appdata/
-%endif
 %{_datadir}/appdata/emacs.appdata.xml
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/icons/hicolor/128x128/apps/emacs.png
@@ -3346,6 +3246,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/apropos.el.gz
 %{_datadir}/emacs/%{version}/lisp/arc-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/array.el.gz
+%{_datadir}/emacs/%{version}/lisp/auth-source-pass.el.gz
+%{_datadir}/emacs/%{version}/lisp/auth-source.el.gz
 %{_datadir}/emacs/%{version}/lisp/autoarg.el.gz
 %{_datadir}/emacs/%{version}/lisp/autoinsert.el.gz
 %{_datadir}/emacs/%{version}/lisp/autorevert.el.gz
@@ -3603,6 +3505,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/dired.el.gz
 %{_datadir}/emacs/%{version}/lisp/dirtrack.el.gz
 %{_datadir}/emacs/%{version}/lisp/disp-table.el.gz
+%{_datadir}/emacs/%{version}/lisp/display-line-numbers.el.gz
 %{_datadir}/emacs/%{version}/lisp/dnd.el.gz
 %{_datadir}/emacs/%{version}/lisp/doc-view.el.gz
 %{_datadir}/emacs/%{version}/lisp/dom.el.gz
@@ -3613,6 +3516,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/dynamic-setting.el.gz
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.el.gz
 %{_datadir}/emacs/%{version}/lisp/echistory.el.gz
+%{_datadir}/emacs/%{version}/lisp/ecomplete.el.gz
 %{_datadir}/emacs/%{version}/lisp/edmacro.el.gz
 %{_datadir}/emacs/%{version}/lisp/ehelp.el.gz
 %{_datadir}/emacs/%{version}/lisp/elec-pair.el.gz
@@ -3637,6 +3541,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-lib.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.el.gz
@@ -3691,12 +3596,15 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/subr-x.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/radix-tree.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/rmc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tabulated-list.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-unsafep.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/thunk.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer-list.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tq.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/trace.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/unsafep.el.gz
@@ -3817,12 +3725,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/frame.el.gz
 %{_datadir}/emacs/%{version}/lisp/frameset.el.gz
 %{_datadir}/emacs/%{version}/lisp/fringe.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/auth-source.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/canlock.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/compface.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/ecomplete.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/flow-fill.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gmm-utils.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-agent.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-art.el.gz
@@ -3840,7 +3744,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-draft.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-dup.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-eform.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-ems.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-fun.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.el.gz
@@ -3857,6 +3760,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-picon.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-range.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-registry.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-rfc1843.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-salt.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.el.gz
@@ -3864,7 +3768,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-srvr.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-start.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sum.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-sync.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-topic.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-undo.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-util.el.gz
@@ -3872,17 +3775,10 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-vm.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gravatar.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gssapi.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/html2text.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/ietf-drums.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/mail-parse.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/mail-prsvr.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mail-source.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/mailcap.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/message.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/messcompat.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-bodies.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-decode.el.gz
@@ -3924,29 +3820,13 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/nntp.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnweb.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/plstore.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/pop3.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/qp.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/registry.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc1843.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2045.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2047.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/rfc2231.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/rtree.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/score-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve-manage.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/sieve.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/smiley.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/smime.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-report.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-stat.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/spam-wash.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/spam.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/starttls.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/utf7.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/yenc.el.gz
-%{_datadir}/emacs/%{version}/lisp/gs.el.gz
 %{_datadir}/emacs/%{version}/lisp/help-at-pt.el.gz
 %{_datadir}/emacs/%{version}/lisp/help-fns.el.gz
 %{_datadir}/emacs/%{version}/lisp/help-macro.el.gz
@@ -3971,6 +3851,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/image-file.el.gz
 %{_datadir}/emacs/%{version}/lisp/image-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/image.el.gz
+%{_datadir}/emacs/%{version}/lisp/image/compface.el.gz
+%{_datadir}/emacs/%{version}/lisp/image/gravatar.el.gz
 %{_datadir}/emacs/%{version}/lisp/imenu.el.gz
 %{_datadir}/emacs/%{version}/lisp/indent.el.gz
 %{_datadir}/emacs/%{version}/lisp/info-look.el.gz
@@ -4000,10 +3882,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/mule.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/ogonek.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/quail.el.gz
+%{_datadir}/emacs/%{version}/lisp/international/rfc1843.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/robin.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/titdic-cnv.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/ucs-normalize.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/utf-7.el.gz
+%{_datadir}/emacs/%{version}/lisp/international/utf7.el.gz
 %{_datadir}/emacs/%{version}/lisp/isearch.el.gz
 %{_datadir}/emacs/%{version}/lisp/isearchb.el.gz
 %{_datadir}/emacs/%{version}/lisp/jit-lock.el.gz
@@ -4121,10 +4005,14 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/binhex.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/emacsbug.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/feedmail.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/flow-fill.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/footnote.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/hashcash.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/ietf-drums.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mail-extr.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mail-hist.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/mail-parse.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/mail-prsvr.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mail-utils.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mailabbrev.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mailalias.el.gz
@@ -4132,7 +4020,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/mailheader.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/metamail.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mspools.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/qp.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/reporter.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2045.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2047.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/rfc2231.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/rfc2368.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/rfc822.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/rmail-spam-filter.el.gz
@@ -4151,6 +4043,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/undigest.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/unrmail.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/uudecode.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/yenc.el.gz
 %{_datadir}/emacs/%{version}/lisp/makesum.el.gz
 %{_datadir}/emacs/%{version}/lisp/man.el.gz
 %{_datadir}/emacs/%{version}/lisp/master.el.gz
@@ -4160,9 +4053,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-alias.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-buffers.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-comp.el.gz
+%{_datadir}/emacs/%{version}/lisp/mh-e/mh-compat.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-e.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-folder.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-funcs.el.gz
+%{_datadir}/emacs/%{version}/lisp/mh-e/mh-gnus.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-identity.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-inc.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/mh-junk.el.gz
@@ -4210,6 +4105,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/hmac-md5.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/imap.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/ldap.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/mailcap.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/mairix.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/net-utils.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/netrc.el.gz
@@ -4222,8 +4118,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/newsticker.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/nsm.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/ntlm.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/pinentry.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/pop3.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/quickurl.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/puny.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/rcirc.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/rfc2104.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/rlogin.el.gz
@@ -4233,12 +4130,16 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/sasl-scram-rfc.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/sasl.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/secrets.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/sieve-manage.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/sieve-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/sieve.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/shr-color.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/shr.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/snmp-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/soap-client.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/soap-inspect.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/socks.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/starttls.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/telnet.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tls.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-adb.el.gz
@@ -4247,7 +4148,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-sh.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-smb.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-uu.el.gz
@@ -4259,14 +4159,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/notifications.el.gz
 %{_datadir}/emacs/%{version}/lisp/novice.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-enc.el.gz
-%{_datadir}/emacs/%{version}/lisp/nxml/nxml-glyph.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-maint.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-ns.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-outln.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-parse.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-rap.el.gz
-%{_datadir}/emacs/%{version}/lisp/nxml/nxml-uchnm.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/rng-cmpct.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/rng-dt.el.gz
@@ -4285,7 +4183,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obarray.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/assoc.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/bruce.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.el.gz
@@ -4296,11 +4193,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/eudcb-ph.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/gulp.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/iso-swed.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/gs.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/iswitchb.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/keyswap.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/html2text.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/landmark.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/ledit.el.gz
@@ -4325,14 +4220,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp5.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/resume.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/s-region.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/scribe.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/spell.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/sregex.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/swedish.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/terminal.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.el.gz
@@ -4344,22 +4234,29 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/xesam.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/yow.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-C.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-J.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-R.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-abc.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-awk.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-calc.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-clojure.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-comint.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-coq.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-core.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-css.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-dot.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ebnf.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-eval.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-exp.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-forth.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-fortran.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-groovy.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-haskell.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-hledger.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-io.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-java.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-js.el.gz
@@ -4369,6 +4266,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-lilypond.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-lisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-lob.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-lua.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-makefile.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.el.gz
@@ -4379,19 +4277,22 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-perl.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-processing.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-python.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-ref.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-ruby.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-sass.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/ob-scala.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-scheme.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-screen.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/ob-sh.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-sed.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-shell.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-shen.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-sql.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-stan.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-table.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-tangle.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-vala.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-agenda.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-archive.el.gz
@@ -4406,9 +4307,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-ctags.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-duration.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-element.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-entities.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-eshell.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-eww.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-faces.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-feed.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-footnote.el.gz
@@ -4419,6 +4322,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-info.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-irc.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-lint.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-list.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-macro.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-macs.el.gz
@@ -4456,6 +4360,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/pcmpl-unix.el.gz
 %{_datadir}/emacs/%{version}/lisp/pcmpl-x.el.gz
 %{_datadir}/emacs/%{version}/lisp/pcomplete.el.gz
+%{_datadir}/emacs/%{version}/lisp/pixel-scroll.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/5x5.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/animate.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/blackbox.el.gz
@@ -4481,6 +4386,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/studly.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/tetris.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/zone.el.gz
+%{_datadir}/emacs/%{version}/lisp/plstore.el.gz
 %{_datadir}/emacs/%{version}/lisp/printing.el.gz
 %{_datadir}/emacs/%{version}/lisp/proced.el.gz
 %{_datadir}/emacs/%{version}/lisp/profiler.el.gz
@@ -4527,6 +4433,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/executable.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/f90.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/flymake.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/flymake-proc.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/fortran.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/gdb-mi.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/glasses.el.gz
@@ -4579,6 +4486,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/recentf.el.gz
 %{_datadir}/emacs/%{version}/lisp/rect.el.gz
 %{_datadir}/emacs/%{version}/lisp/register.el.gz
+%{_datadir}/emacs/%{version}/lisp/registry.el.gz
 %{_datadir}/emacs/%{version}/lisp/repeat.el.gz
 %{_datadir}/emacs/%{version}/lisp/replace.el.gz
 %{_datadir}/emacs/%{version}/lisp/reposition.el.gz
@@ -4586,6 +4494,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/rfn-eshadow.el.gz
 %{_datadir}/emacs/%{version}/lisp/rot13.el.gz
 %{_datadir}/emacs/%{version}/lisp/ruler-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/rtree.el.gz
 %{_datadir}/emacs/%{version}/lisp/savehist.el.gz
 %{_datadir}/emacs/%{version}/lisp/saveplace.el.gz
 %{_datadir}/emacs/%{version}/lisp/sb-image.el.gz
@@ -4604,6 +4513,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/startup.el.gz
 %{_datadir}/emacs/%{version}/lisp/strokes.el.gz
 %{_datadir}/emacs/%{version}/lisp/subr.el.gz
+%{_datadir}/emacs/%{version}/lisp/svg.el.gz
 %{_datadir}/emacs/%{version}/lisp/t-mouse.el.gz
 %{_datadir}/emacs/%{version}/lisp/tabify.el.gz
 %{_datadir}/emacs/%{version}/lisp/talk.el.gz
@@ -4616,6 +4526,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/cygwin.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/internal.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/konsole.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/linux.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/lk201.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/news.el.gz
@@ -4624,6 +4535,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/rxvt.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/screen.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/sun.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/tmux.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/tvi970.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/vt100.el.gz
@@ -4643,7 +4555,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.gz
+%{_datadir}/emacs/%{version}/lisp/textmodes/less-css-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.el.gz
+%{_datadir}/emacs/%{version}/lisp/textmodes/mhtml-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/nroff-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/page-ext.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/page.el.gz
@@ -4780,11 +4694,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/winner.el.gz
 %{_datadir}/emacs/%{version}/lisp/woman.el.gz
 %{_datadir}/emacs/%{version}/lisp/x-dnd.el.gz
+%{_datadir}/emacs/%{version}/lisp/xdg.el.gz
 %{_datadir}/emacs/%{version}/lisp/xml.el.gz
 %{_datadir}/emacs/%{version}/lisp/xt-mouse.el.gz
 %{_datadir}/emacs/%{version}/lisp/xwidget.el.gz
 
-%if 0%{suse_version} >= 1300
 %files -n etags
 %defattr(-,root,root)
 %doc etc/ETAGS.EBNF
@@ -4797,6 +4711,5 @@ fi
 %ghost %{_sysconfdir}/alternatives/ctags
 %ghost %{_mandir}/man1/ctags.1%{ext_man}
 %ghost %{_sysconfdir}/alternatives/ctags.1%{ext_man}
-%endif
 
 %changelog
diff --git a/gnulib.git-94e01571.patch b/gnulib.git-94e01571.patch
deleted file mode 100644
index ed71415..0000000
--- a/gnulib.git-94e01571.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 94e01571507835ff59dd8ce2a0b56a4b566965a4 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Mon, 24 Apr 2017 01:43:36 -0700
-Subject: [PATCH] time_rz: fix heap buffer overflow vulnerability
-
-This issue has been assigned CVE-2017-7476 and was
-detected with American Fuzzy Lop 2.41b run on the
-coreutils date(1) program with ASAN enabled.
-
-  ERROR: AddressSanitizer: heap-buffer-overflow on address 0x...
-  WRITE of size 8 at 0x60d00000cff8 thread T0
-  #1 0x443020 in extend_abbrs lib/time_rz.c:88
-  #2 0x443356 in save_abbr lib/time_rz.c:155
-  #3 0x44393f in localtime_rz lib/time_rz.c:290
-  #4 0x41e4fe in parse_datetime2 lib/parse-datetime.y:1798
-
-A minimized reproducer is the following 120 byte TZ value,
-which goes beyond the value of ABBR_SIZE_MIN (119) on x86_64.
-Extend the aa...b portion to overwrite more of the heap.
-
-  date -d $(printf 'TZ="aaa%020daaaaaab%089d"')
-
-localtime_rz and mktime_z were affected since commit 4bc76593.
-parse_datetime was affected since commit 4e6e16b3f.
-
-* lib/time_rz.c (save_abbr): Rearrange the calculation determining
-whether there is enough buffer space available.  The rearrangement
-ensures we're only dealing with positive numbers, thus avoiding
-the problematic promotion of signed to unsigned causing an invalid
-comparison when zone_copy is more than ABBR_SIZE_MIN bytes beyond
-the start of the buffer.
-* tests/test-parse-datetime.c (main): Add a test case written by
-Paul Eggert, which overwrites enough of the heap so that
-standard glibc will fail with "free(): invalid pointer"
-without the patch applied.
-Reported and analyzed at https://bugzilla.redhat.com/1444774
----
- lib/time_rz.c |   15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
---- lib/time_rz.c
-+++ lib/time_rz.c	2017-05-02 11:00:09.386018503 +0000
-@@ -27,6 +27,7 @@
- #include <time.h>
- 
- #include <errno.h>
-+#include <limits.h>
- #include <stdbool.h>
- #include <stddef.h>
- #include <stdlib.h>
-@@ -34,6 +35,10 @@
- 
- #include "time-internal.h"
- 
-+#ifndef SIZE_MAX
-+# define SIZE_MAX ((size_t) -1)
-+#endif
-+
- #if !HAVE_TZSET
- static void tzset (void) { }
- #endif
-@@ -42,7 +47,7 @@ static void tzset (void) { }
-    the largest "small" request for the GNU C library malloc.  */
- enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 };
- 
--/* Minimum size of the ABBRS member of struct abbr.  ABBRS is larger
-+/* Minimum size of the ABBRS member of struct tm_zone.  ABBRS is larger
-    only in the unlikely case where an abbreviation longer than this is
-    used.  */
- enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) };
-@@ -149,7 +154,13 @@ save_abbr (timezone_t tz, struct tm *tm)
-           if (! (*zone_copy || (zone_copy == tz->abbrs && tz->tz_is_set)))
-             {
-               size_t zone_size = strlen (zone) + 1;
--              if (zone_size < tz->abbrs + ABBR_SIZE_MIN - zone_copy)
-+              size_t zone_used = zone_copy - tz->abbrs;
-+              if (SIZE_MAX - zone_used < zone_size)
-+                {
-+                  errno = ENOMEM;
-+                  return false;
-+                }
-+              if (zone_used + zone_size < ABBR_SIZE_MIN)
-                 extend_abbrs (zone_copy, zone, zone_size);
-               else
-                 {