diff --git a/CVE-2014-3421.patch b/CVE-2014-3421.patch
deleted file mode 100644
index 25c6fd8..0000000
--- a/CVE-2014-3421.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Based on revno: 117066
-revision-id: address@hidden
-parent: address@hidden
-fixes bug: http://bugs.debian.org/747100
-committer: Glenn Morris <address@hidden>
-branch nick: emacs-24
-timestamp: Mon 2014-05-05 20:50:51 -0700
-message:
-  * gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name.
-modified:
-  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
-  lisp/gnus/gnus-fun.el          gnusfun.el-20091113204419-o5vbwnq5f7feedwu-3243
-
---- lisp/gnus/gnus-fun.el
-+++ lisp/gnus/gnus-fun.el	2014-05-08 11:52:32.362735285 +0000
-@@ -250,20 +250,21 @@ colors of the displayed X-Faces."
-   (interactive)
-   (shell-command "xawtv-remote snap ppm")
-   (let ((file nil)
-+       (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
- 	result)
-     (while (null (setq file (directory-files "/tftpboot/sparky/tmp"
- 					     t "snap.*ppm")))
-       (sleep-for 1))
-     (setq file (car file))
-     (shell-command
--     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
--	     file))
-+     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm >> %s"
-+            file tempfile))
-     (let ((gnus-convert-image-to-face-command
- 	   (format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
- 		   (gnus-fun-ppm-change-string))))
--      (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
-+      (setq result (gnus-face-from-file tempfile)))
-     (delete-file file)
--    ;;(delete-file "/tmp/gnus.face.ppm")
-+    ;;(delete-file tempfile)    ; FIXME why are we not deleting it?!
-     result))
- 
- (defun gnus-fun-ppm-change-string ()
diff --git a/CVE-2014-3422.patch b/CVE-2014-3422.patch
deleted file mode 100644
index 1a1e052..0000000
--- a/CVE-2014-3422.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Based on revno: 117067
-revision-id: address@hidden
-parent: address@hidden
-fixes bug: http://bugs.debian.org/747100
-committer: Glenn Morris <address@hidden>
-branch nick: emacs-24
-timestamp: Mon 2014-05-05 20:53:31 -0700
-message:
-  find-gc.el misc fixes
-  
-  The whole file looks obsolete and/or broken.
-  
-  * lisp/emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
-  (find-gc-source-files): Update some names.
-  (trace-call-tree): Simplify and update.  Avoid predictable temp-file names.
-modified:
-  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
-  lisp/emacs-lisp/find-gc.el     findgc.el-20091113204419-o5vbwnq5f7feedwu-2220
-
---- lisp/emacs-lisp/find-gc.el
-+++ lisp/emacs-lisp/find-gc.el	2014-05-08 11:53:44.738766224 +0000
-@@ -23,14 +23,15 @@
- 
- ;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
- ;; This expects the Emacs sources to live in find-gc-source-directory.
--;; It creates a temporary working directory /tmp/esrc.
- 
- ;;; Code:
- 
- (defvar find-gc-unsafe-list nil
-   "The list of unsafe functions is placed here by `find-gc-unsafe'.")
- 
--(defvar find-gc-source-directory)
-+(defvar find-gc-source-directory
-+  (file-name-as-directory (expand-file-name "src" source-directory))
-+  "Directory containing Emacs C sources.")
- 
- (defvar find-gc-subrs-callers nil
-   "Alist of users of subrs, from GC testing.
-@@ -59,14 +60,14 @@ Each entry has the form (FUNCTION . FUNC
-     "indent.c" "search.c" "regex.c" "undo.c"
-     "alloc.c" "data.c" "doc.c" "editfns.c"
-     "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
--    "abbrev.c" "syntax.c" "unexcoff.c"
-+    "syntax.c" "unexcoff.c"
-     "bytecode.c" "process.c" "callproc.c" "doprnt.c"
--    "x11term.c" "x11fns.c"))
-+    "xterm.c" "xfns.c"))
- 
- 
- (defun find-gc-unsafe ()
-   "Return a list of unsafe functions--that is, which can call GC.
--Also store it in `find-gc-unsafe'."
-+Also store it in `find-gc-unsafe-list'."
-   (trace-call-tree nil)
-   (trace-use-tree)
-   (find-unsafe-funcs 'Fgarbage_collect)
-@@ -102,47 +103,38 @@ Also store it in `find-gc-unsafe'."
- 
- 
- 
--(defun trace-call-tree (&optional already-setup)
-+(defun trace-call-tree (&optional ignored)
-   (message "Setting up directories...")
--  (or already-setup
--      (progn
--	;; Gee, wouldn't a built-in "system" function be handy here.
--	(call-process "csh" nil nil nil "-c" "rm -rf /tmp/esrc")
--	(call-process "csh" nil nil nil "-c" "mkdir /tmp/esrc")
--	(call-process "csh" nil nil nil "-c"
--		      (format "ln -s %s/*.[ch] /tmp/esrc"
--			      find-gc-source-directory))))
--  (with-current-buffer (get-buffer-create "*Trace Call Tree*")
--    (setq find-gc-subrs-called nil)
--    (let ((case-fold-search nil)
--	  (files find-gc-source-files)
--	  name entry)
--      (while files
--	(message "Compiling %s..." (car files))
--	(call-process "csh" nil nil nil "-c"
--		      (format "gcc -dr -c /tmp/esrc/%s -o /dev/null"
--			      (car files)))
--	(erase-buffer)
--	(insert-file-contents (concat "/tmp/esrc/" (car files) ".rtl"))
--	(while (re-search-forward ";; Function \\|(call_insn " nil t)
--	  (if (= (char-after (- (point) 3)) ?o)
--	      (progn
--		(looking-at "[a-zA-Z0-9_]+")
--		(setq name (intern (buffer-substring (match-beginning 0)
--						     (match-end 0))))
--		(message "%s : %s" (car files) name)
--		(setq entry (list name)
--		      find-gc-subrs-called (cons entry find-gc-subrs-called)))
--	    (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
-+  (setq find-gc-subrs-called nil)
-+  (let ((case-fold-search nil)
-+       (default-directory find-gc-source-directory)
-+       (files find-gc-source-files)
-+       name entry rtlfile)
-+    (dolist (file files)
-+      (message "Compiling %s..." file)
-+      (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
-+                   "-fdump-rtl-expand" "-o" null-device "-c" file)
-+      (setq rtlfile
-+           (file-expand-wildcards (format "%s.*.expand" file) t))
-+      (if (/= 1 (length rtlfile))
-+         (message "Error compiling `%s'?" file)
-+       (with-temp-buffer
-+         (insert-file-contents (setq rtlfile (car rtlfile)))
-+         (delete-file rtlfile)
-+         (while (re-search-forward ";; Function \\|(call_insn " nil t)
-+           (if (= (char-after (- (point) 3)) ?o)
- 		(progn
--		  (setq name (intern (buffer-substring (match-beginning 1)
--						       (match-end 1))))
--		  (or (memq name (cdr entry))
--		      (setcdr entry (cons name (cdr entry))))))))
--	(delete-file (concat "/tmp/esrc/" (car files) ".rtl"))
--	(setq files (cdr files)))))
--)
--
-+                 (looking-at "[a-zA-Z0-9_]+")
-+                 (setq name (intern (match-string 0)))
-+                 (message "%s : %s" (car files) name)
-+                 (setq entry (list name)
-+                       find-gc-subrs-called
-+                       (cons entry find-gc-subrs-called)))
-+             (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
-+                 (progn
-+                   (setq name (intern (match-string 1)))
-+                   (or (memq name (cdr entry))
-+                       (setcdr entry (cons name (cdr entry)))))))))))))
- 
- (defun trace-use-tree ()
-   (setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))
diff --git a/CVE-2014-3423.patch b/CVE-2014-3423.patch
deleted file mode 100644
index 9d4f415..0000000
--- a/CVE-2014-3423.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Based on revno: 117068
-revision-id: address@hidden
-parent: address@hidden
-committer: Glenn Morris <address@hidden>
-branch nick: emacs-24
-timestamp: Mon 2014-05-05 20:55:54 -0700
-message:
-  browse-url.el comment
-modified:
-  lisp/net/browse-url.el         
-browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
-
---- lisp/net/browse-url.el
-+++ lisp/net/browse-url.el	2014-05-08 11:54:48.194721113 +0000
-@@ -1335,6 +1335,9 @@ used instead of `browse-url-new-window-f
- 	  (kill-buffer nil)))
-     (if (and pid (zerop (signal-process pid 0))) ; Mosaic running
- 	(save-excursion
-+         ;; This is a predictable temp-file name, which is bad,
-+         ;; but it is what Mosaic uses/used.
-+         ;; So it's not Emacs's problem.  http://bugs.debian.org/747100
- 	  (find-file (format "/tmp/Mosaic.%d" pid))
- 	  (erase-buffer)
- 	  (insert (if (browse-url-maybe-new-window new-window)
diff --git a/CVE-2014-3424.patch b/CVE-2014-3424.patch
deleted file mode 100644
index cd64198..0000000
--- a/CVE-2014-3424.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Based on revno: 117071
-revision-id: address@hidden
-parent: address@hidden
-committer: Michael Albinus <address@hidden>
-branch nick: emacs-24
-timestamp: Tue 2014-05-06 11:51:05 +0200
-message:
-  Fix Bug#17415.
-  
-  * net/tramp-sh.el (tramp-uudecode): Replace the hard-coded temporary
-  file name by a format specifier.
-  (tramp-remote-coding-commands): Enhance docstring.
-  (tramp-find-inline-encoding): Replace "%t" by a temporary file name.
-modified:
-  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
-  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
-
---- lisp/net/tramp-sh.el
-+++ lisp/net/tramp-sh.el	2014-05-08 11:56:08.770262271 +0000
-@@ -605,9 +605,9 @@ This list is used for copying/renaming w
- See `tramp-actions-before-shell' for more info.")
- 
- (defconst tramp-uudecode
--  "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
--cat /tmp/tramp.$$
--rm -f /tmp/tramp.$$"
-+  "(echo begin 600 %t; tail -n +2) | uudecode
-+cat %t
-+rm -f %t"
-   "Shell function to implement `uudecode' to standard output.
- Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
- for this or `uudecode -p', but some systems don't, and for them
-@@ -3938,7 +3938,7 @@ Each item is a list that looks like this
- 
- \(FORMAT ENCODING DECODING [TEST]\)
- 
--FORMAT is  symbol describing the encoding/decoding format.  It can be
-+FORMAT is a symbol describing the encoding/decoding format.  It can be
- `b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
- 
- ENCODING and DECODING can be strings, giving commands, or symbols,
-@@ -3948,9 +3948,11 @@ filename will be put into the command li
- specifier is not present, the input should be read from standard
- input.
- 
--If they are variables, this variable is a string containing a Perl
--implementation for this functionality.  This Perl program will be transferred
--to the remote host, and it is available as shell function with the same name.
-+If they are variables, this variable is a string containing a
-+Perl or Shell implementation for this functionality.  This
-+program will be transferred to the remote host, and it is
-+available as shell function with the same name.  A \"%t\" format
-+specifier in the variable value denotes a temporary file.
- 
- The optional TEST command can be used for further tests, whether
- ENCODING and DECODING are applicable.")
-@@ -4025,10 +4027,25 @@ Goes through the list `tramp-local-codin
- 		    (throw 'wont-work-remote nil))
- 
- 		  (when (not (stringp rem-dec))
--		    (let ((name (symbol-name rem-dec)))
-+                   (let ((name (symbol-name rem-dec))
-+                         (value (symbol-value rem-dec))
-+                         tmpfile)
- 		      (while (string-match (regexp-quote "-") name)
- 			(setq name (replace-match "_" nil t name)))
--		      (tramp-maybe-send-script vec (symbol-value rem-dec) name)
-+                     (when (string-match "%t" value)
-+                       (setq tmpfile
-+                             (make-temp-name
-+                              (expand-file-name
-+                               tramp-temp-name-prefix
-+                               (tramp-get-remote-tmpdir vec)))
-+                             value
-+                             (format-spec
-+                              value
-+                              (format-spec-make
-+                               ?t
-+                               (tramp-file-name-handler
-+                                'file-remote-p tmpfile 'localname)))))
-+                     (tramp-maybe-send-script vec value name)
- 		      (setq rem-dec name)))
- 		  (tramp-message
- 		   vec 5
diff --git a/emacs-24.3-decl.dif b/emacs-24.3-decl.dif
deleted file mode 100644
index 2f5d1fc..0000000
--- a/emacs-24.3-decl.dif
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/frame.c
-+++ src/frame.c	2013-05-21 15:13:32.849939500 +0000
-@@ -22,6 +22,9 @@ along with GNU Emacs.  If not, see <http
- #define FRAME_INLINE EXTERN_INLINE
- 
- #include <stdio.h>
-+#ifdef STDC_HEADERS
-+#include <stdlib.h>
-+#endif
- #include <errno.h>
- #include <limits.h>
- 
diff --git a/emacs-24.3-giflib5.patch b/emacs-24.3-giflib5.patch
deleted file mode 100644
index 88ef17b..0000000
--- a/emacs-24.3-giflib5.patch
+++ /dev/null
@@ -1,125 +0,0 @@
----
- emacs-24.3/src/image.c |   36 ++++++++++++++++++++++++++++--------
- 1 file changed, 28 insertions(+), 8 deletions(-)
-
---- emacs-24.3/src/image.c
-+++ emacs-24.3/src/image.c	2014-09-03 10:07:32.000000000 +0000
-@@ -7095,11 +7095,19 @@ gif_image_p (Lisp_Object object)
- 
- #endif /* HAVE_NTGUI */
- 
-+#ifndef GIFLIB_MAJOR
-+# define GIFLIB_MAJOR 0
-+#endif
- 
- #ifdef WINDOWSNT
- 
- /* GIF library details.  */
-+#if (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
-+DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *, int *));
-+#else
- DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *));
-+#define DGifCloseFile(a, b) DGifCloseFile(a)
-+#endif
- DEF_IMGLIB_FN (int, DGifSlurp, (GifFileType *));
- DEF_IMGLIB_FN (GifFileType *, DGifOpen, (void *, InputFunc));
- DEF_IMGLIB_FN (GifFileType *, DGifOpenFileName, (const char *));
-@@ -7121,7 +7129,11 @@ init_gif_functions (void)
- 
- #else
- 
--#define fn_DGifCloseFile	DGifCloseFile
-+#if (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
-+#define fn_DGifCloseFile(a,b)	DGifCloseFile(a,b)
-+#else
-+#define fn_DGifCloseFile(a,b)	DGifCloseFile(a)
-+#endif
- #define fn_DGifSlurp		DGifSlurp
- #define fn_DGifOpen		DGifOpen
- #define fn_DGifOpenFileName	DGifOpenFileName
-@@ -7192,7 +7204,11 @@ gif_load (struct frame *f, struct image
- 	}
- 
-       /* Open the GIF file.  */
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpenFileName (SSDATA (file));
-+#else
-+      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
-+#endif
-       if (gif == NULL)
- 	{
- 	  image_error ("Cannot open `%s'", file, Qnil);
-@@ -7213,7 +7229,11 @@ gif_load (struct frame *f, struct image
-       memsrc.len = SBYTES (specified_data);
-       memsrc.index = 0;
- 
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
-+#else
-+      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
-+#endif
-       if (!gif)
- 	{
- 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
-@@ -7225,7 +7245,7 @@ gif_load (struct frame *f, struct image
-   if (!check_image_size (f, gif->SWidth, gif->SHeight))
-     {
-       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
--      fn_DGifCloseFile (gif);
-+      fn_DGifCloseFile (gif, NULL);
-       return 0;
-     }
- 
-@@ -7234,7 +7254,7 @@ gif_load (struct frame *f, struct image
-   if (rc == GIF_ERROR || gif->ImageCount <= 0)
-     {
-       image_error ("Error reading `%s'", img->spec, Qnil);
--      fn_DGifCloseFile (gif);
-+      fn_DGifCloseFile (gif, NULL);
-       return 0;
-     }
- 
-@@ -7246,7 +7266,7 @@ gif_load (struct frame *f, struct image
-       {
- 	image_error ("Invalid image number `%s' in image `%s'",
- 		     image_number, img->spec);
--	fn_DGifCloseFile (gif);
-+	fn_DGifCloseFile (gif, NULL);
- 	return 0;
-       }
-   }
-@@ -7264,14 +7284,14 @@ gif_load (struct frame *f, struct image
-   if (!check_image_size (f, width, height))
-     {
-       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
--      fn_DGifCloseFile (gif);
-+      fn_DGifCloseFile (gif, NULL);
-       return 0;
-     }
- 
-   /* Create the X image and pixmap.  */
-   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
-     {
--      fn_DGifCloseFile (gif);
-+      fn_DGifCloseFile (gif, NULL);
-       return 0;
-     }
- 
-@@ -7370,7 +7390,7 @@ gif_load (struct frame *f, struct image
- 	  }
- 
-       /* Apply the pixel values.  */
--      if (gif->SavedImages[j].ImageDesc.Interlace)
-+      if (GIFLIB_MAJOR < 5 && gif->SavedImages[j].ImageDesc.Interlace)
- 	{
- 	  int row, pass;
- 
-@@ -7447,7 +7467,7 @@ gif_load (struct frame *f, struct image
- 			    Fcons (make_number (gif->ImageCount),
- 				   img->lisp_data));
- 
--  fn_DGifCloseFile (gif);
-+  fn_DGifCloseFile (gif, NULL);
- 
-   /* Maybe fill in the background field while we have ximg handy. */
-   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
diff --git a/emacs-24.3-nntp-typhoon-fix.patch b/emacs-24.3-nntp-typhoon-fix.patch
deleted file mode 100644
index 0056f09..0000000
--- a/emacs-24.3-nntp-typhoon-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- lisp/gnus/nntp.el |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lisp/gnus/nntp.el
-+++ b/lisp/gnus/nntp.el
-@@ -1282,7 +1282,7 @@ If SEND-IF-FORCE, only send authinfo to
- 		     "nntpd" pbuffer nntp-address nntp-port-number
- 		     :type (cadr (assoc nntp-open-connection-function map))
- 		     :end-of-command "^\\([2345]\\|[.]\\).*\n"
--		     :capability-command "CAPABILITIES\r\n"
-+		     :capability-command "HELP\r\n"
- 		     :success "^3"
- 		     :starttls-function
- 		     (lambda (capabilities)
diff --git a/emacs-24.3-nonvoid.patch b/emacs-24.3-nonvoid.patch
deleted file mode 100644
index ca7dff9..0000000
--- a/emacs-24.3-nonvoid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xmenu.c
-+++ src/xmenu.c	2013-05-21 15:21:41.301439390 +0000
-@@ -310,8 +310,8 @@ for instance using the window manager, t
- #else
-   {
-     Lisp_Object title;
--    const char *error_name;
--    Lisp_Object selection;
-+    const char *error_name = NULL;
-+    Lisp_Object selection = Qnil;
-     ptrdiff_t specpdl_count = SPECPDL_INDEX ();
- 
-     /* Decode the dialog items from what was specified.  */
diff --git a/emacs-24.4-decl.dif b/emacs-24.4-decl.dif
new file mode 100644
index 0000000..0852237
--- /dev/null
+++ b/emacs-24.4-decl.dif
@@ -0,0 +1,16 @@
+---
+ 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.3-flyspell.patch b/emacs-24.4-flyspell.patch
similarity index 77%
rename from emacs-24.3-flyspell.patch
rename to emacs-24.4-flyspell.patch
index a3593f8..cdf6493 100644
--- a/emacs-24.3-flyspell.patch
+++ b/emacs-24.4-flyspell.patch
@@ -1,19 +1,23 @@
+---
+ lisp/textmodes/flyspell.el |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
 --- lisp/textmodes/flyspell.el
-+++ lisp/textmodes/flyspell.el	2009-08-11 12:54:35.749901460 +0000
-@@ -284,6 +284,12 @@ If this variable is nil, all regions are
-   "The key binding for flyspell auto correction."
++++ lisp/textmodes/flyspell.el	2014-10-21 14:14:59.191838679 +0000
+@@ -286,6 +286,12 @@ If this variable is nil, all regions are
+   :type 'key-sequence
    :group 'flyspell)
  
 +(defvar flyspell-signature-separator
 +  (if (boundp 'message-signature-separator)
-+       message-signature-separator
++	message-signature-separator
 +     "^-- $")
 +  "*String used to recognize .signatures.")
 +
  ;;*---------------------------------------------------------------------*/
  ;;*    Mode specific options                                            */
  ;;*    -------------------------------------------------------------    */
-@@ -307,7 +313,6 @@ property of the major mode name.")
+@@ -309,7 +315,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)
@@ -21,7 +25,7 @@
  (defun mail-mode-flyspell-verify ()
    "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
    (let ((header-end (save-excursion
-@@ -319,11 +324,11 @@ property of the major mode name.")
+@@ -321,11 +326,11 @@ property of the major mode name.")
  		       nil t)
  		      (point)))
  	(signature-begin
diff --git a/emacs-24.3-glibc.patch b/emacs-24.4-glibc.patch
similarity index 52%
rename from emacs-24.3-glibc.patch
rename to emacs-24.4-glibc.patch
index 35f2396..3370868 100644
--- a/emacs-24.3-glibc.patch
+++ b/emacs-24.4-glibc.patch
@@ -1,14 +1,20 @@
+---
+ configure           |    2 ++
+ configure.ac        |    2 ++
+ lib-src/Makefile.in |    6 ++++--
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
 --- configure.ac
-+++ configure.ac	2013-05-21 14:16:11.589439382 +0000
-@@ -1692,6 +1692,7 @@ system_malloc=no
++++ configure.ac	2014-10-21 13:50:36.287837811 +0000
+@@ -1988,6 +1988,7 @@ system_malloc=$emacs_cv_sanitize_address
  case "$opsys" in
    ## darwin ld insists on the use of malloc routines in the System framework.
    darwin|sol2-10) system_malloc=yes ;;
 +  gnu-linux) system_malloc=yes ;;
  esac
  
- if test "${system_malloc}" = "yes"; then
-@@ -1732,6 +1733,7 @@ fi
+ GMALLOC_OBJ=
+@@ -2045,6 +2046,7 @@ fi
  use_mmap_for_buffers=no
  case "$opsys" in
    cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
@@ -17,16 +23,16 @@
  
  AC_FUNC_MMAP
 --- configure
-+++ configure	2013-05-21 13:59:14.357439665 +0000
-@@ -9828,6 +9828,7 @@ system_malloc=no
++++ configure	2014-10-21 13:51:36.143837910 +0000
+@@ -10862,6 +10862,7 @@ system_malloc=$emacs_cv_sanitize_address
  case "$opsys" in
    ## darwin ld insists on the use of malloc routines in the System framework.
    darwin|sol2-10) system_malloc=yes ;;
 +  gnu-linux) system_malloc=yes ;;
  esac
  
- if test "${system_malloc}" = "yes"; then
-@@ -9871,6 +9872,7 @@ fi
+ GMALLOC_OBJ=
+@@ -10949,6 +10950,7 @@ fi
  use_mmap_for_buffers=no
  case "$opsys" in
    cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
@@ -35,32 +41,30 @@
  
  
 --- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2013-05-21 14:51:33.357939393 +0000
-@@ -296,14 +296,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
++++ lib-src/Makefile.in	2014-10-21 13:55:07.003837593 +0000
+@@ -314,13 +314,15 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
  ../lib/libgnu.a: $(config_h)
  	cd ../lib && $(MAKE) libgnu.a
  
-+REGEXPOBJ =
-+#REGEXPOBJ = regex.o
++#REGEXPOBJ =
++REGEXPOBJ = regex.o
  regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
- 	${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
- 	  ${srcdir}/../src/regex.c
+ 	${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
  
--etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
-+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) $(config_h)
+ etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
  	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
  	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  regex.o $(LOADLIBES) -o etags
-+	  $(REGEXPOBJ) $(LOADLIBES) -o etags
+-	  regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
++	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
  
- ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
- 	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
-@@ -314,7 +316,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
+ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
+                    $(config_h)
+@@ -332,7 +334,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
  ctags${EXEEXT}: etags${EXEEXT}
  	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
  	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  regex.o $(LOADLIBES) -o ctags
-+	  $(REGEXPOBJ) $(LOADLIBES) -o ctags
+-	  regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
++	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
  
- profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+ profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
diff --git a/emacs-24.4-nonvoid.patch b/emacs-24.4-nonvoid.patch
new file mode 100644
index 0000000..675eb4e
--- /dev/null
+++ b/emacs-24.4-nonvoid.patch
@@ -0,0 +1,17 @@
+---
+ src/xmenu.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- src/xmenu.c
++++ src/xmenu.c	2014-10-21 14:06:22.923837970 +0000
+@@ -2031,8 +2031,8 @@ Lisp_Object
+ xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
+ {
+   Lisp_Object title;
+-  const char *error_name;
+-  Lisp_Object selection;
++  const char *error_name = NULL;
++  Lisp_Object selection = Qnil;
+   ptrdiff_t specpdl_count = SPECPDL_INDEX ();
+ 
+   check_window_system (f);
diff --git a/emacs-24.3-ps-bdf.patch b/emacs-24.4-ps-bdf.patch
similarity index 79%
rename from emacs-24.3-ps-bdf.patch
rename to emacs-24.4-ps-bdf.patch
index 7be9e9a..047498a 100644
--- a/emacs-24.3-ps-bdf.patch
+++ b/emacs-24.4-ps-bdf.patch
@@ -1,7 +1,12 @@
+---
+ lisp/ldefs-boot.el |    4 ++--
+ lisp/ps-bdf.el     |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
 --- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el	2012-06-26 16:26:01.900010474 +0000
-@@ -21658,9 +21658,9 @@ With prefix argument ARG, restart the Pr
- ;;;;;;  18685 911514 0))
++++ lisp/ldefs-boot.el	2014-10-21 14:01:58.127837849 +0000
+@@ -21589,9 +21589,9 @@ With prefix argument ARG, restart the Pr
+ ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21291 53104 431149 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")) "\
diff --git a/emacs-24.3-xim.patch b/emacs-24.4-xim.patch
similarity index 52%
rename from emacs-24.3-xim.patch
rename to emacs-24.4-xim.patch
index 8c866ab..189e64a 100644
--- a/emacs-24.3-xim.patch
+++ b/emacs-24.4-xim.patch
@@ -1,8 +1,12 @@
+---
+ src/xfns.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- src/xfns.c
-+++ src/xfns.c	2007-05-15 16:37:13.282161551 +0000
-@@ -1845,8 +1845,8 @@ static XIMStyle best_xim_style (XIMStyle
++++ src/xfns.c	2014-10-21 14:09:49.520338231 +0000
+@@ -1648,8 +1648,8 @@ static XIMStyle best_xim_style (XIMStyle
  
- static XIMStyle supported_xim_styles[] =
+ static const XIMStyle supported_xim_styles[] =
  {
 -  XIMPreeditPosition | XIMStatusArea,
    XIMPreeditPosition | XIMStatusNothing,
diff --git a/emacs-24.3.dif b/emacs-24.4.dif
similarity index 87%
rename from emacs-24.3.dif
rename to emacs-24.4.dif
index 3049efd..ecea373 100644
--- a/emacs-24.3.dif
+++ b/emacs-24.4.dif
@@ -1,40 +1,61 @@
+---
+ Makefile.in                     |   11 +---
+ configure                       |    4 -
+ configure.ac                    |    4 -
+ doc/man/etags.1                 |   20 ++++----
+ lib-src/Makefile.in             |    6 +-
+ lib-src/pop.c                   |    1 
+ lisp/cmuscheme.el               |    3 -
+ lisp/international/mule-cmds.el |    1 
+ lisp/net/ange-ftp.el            |    8 +--
+ lisp/site-load.el               |   41 ++++++++++++++++
+ lisp/speedbar.el                |    1 
+ lisp/textmodes/ispell.el        |   60 +++++++++++++++++++++++-
+ site-lisp/term/func-keys.el     |   33 +++++++++++++
+ site-lisp/term/gnome.el         |   97 ++++++++++++++++++++++++++++++++++++++++
+ site-lisp/term/kvt.el           |   97 ++++++++++++++++++++++++++++++++++++++++
+ site-lisp/term/linux.el         |   79 ++++++++++++++++++++++++++++++++
+ site-lisp/term/locale.el        |   13 +++++
+ src/lisp.mk                     |    2 
+ 18 files changed, 448 insertions(+), 33 deletions(-)
+
 --- Makefile.in
-+++ Makefile.in	2013-05-21 15:58:29.533438706 +0000
-@@ -444,12 +444,8 @@ install-arch-dep: src install-arch-indep
- 	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
++++ Makefile.in	2014-10-21 14:24:43.751837432 +0000
+@@ -490,12 +490,8 @@ install-arch-dep: src install-arch-indep
+ 	    libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
  	    INSTALL_STRIP=${INSTALL_STRIP}
  	if test "${ns_self_contained}" = "no"; then \
--	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
--	  chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
+-	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
+-	  chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
 -	  if test "x${NO_BIN_LINK}" = x; then \
--	    rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
--	    cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+-	    rm -f "$(DESTDIR)${bindir}/$(EMACS)" ; \
+-	    cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
 -	  fi; \
 +	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS) || exit 1 ; \
 +	  chmod 1755 $(DESTDIR)${bindir}/$(EMACS) || true; \
  	else \
  	  subdir=${ns_appresdir}/site-lisp; \
  	  ${write_subdir} || exit 1; \
-@@ -631,6 +627,7 @@ install-man:
- 	umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
+@@ -684,6 +680,7 @@ install-man:
+ 	umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
  	thisdir=`/bin/pwd`; \
  	cd ${mansrcdir}; \
 +	cp ctags.1 gnuctags.1; \
  	for page in *.1; do \
  	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
- 	  (cd $${thisdir}; \
-@@ -710,7 +707,7 @@ uninstall:
+ 	  (cd "$${thisdir}"; \
+@@ -770,7 +767,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; \
+ 	     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)
- 	(if cd $(DESTDIR)${icondir}; then \
+-	(cd "$(DESTDIR)${bindir}" && rm -f $(EMACSFULL) $(EMACS) || true)
++	(cd "$(DESTDIR)${bindir}" && rm -f $(EMACS) || true)
+ 	(if cd "$(DESTDIR)${icondir}"; then \
  	   rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
  	     hicolor/scalable/apps/${EMACS_NAME}.svg \
---- configure
-+++ configure	2013-05-21 16:02:53.797440383 +0000
-@@ -9438,8 +9438,8 @@ fi
+--- configure.ac
++++ configure.ac	2013-05-21 16:02:45.000000000 +0000
+@@ -1595,8 +1595,8 @@ fi
  LD_SWITCH_X_SITE_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
@@ -45,9 +66,9 @@
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
---- configure.ac
-+++ configure.ac	2013-05-21 16:02:44.821439363 +0000
-@@ -1405,8 +1405,8 @@
+--- configure
++++ configure	2013-05-21 16:02:54.000000000 +0000
+@@ -10123,8 +10123,8 @@ fi
  LD_SWITCH_X_SITE_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
@@ -114,7 +135,7 @@
  .TP
  .B \-\-declarations
  In C and derived languages, create tags for function declarations,
-@@ -157,7 +157,7 @@ the previous ones.  The regexps are of o
+@@ -158,7 +158,7 @@ the previous ones.  The regexps are of o
  where \fItagregexp\fP is used to match the tag.  It should not match
  useless characters.  If the match is such that more characters than
  needed are unavoidably matched by \fItagregexp\fP, it may be useful to
@@ -123,7 +144,7 @@
  ignores regexps without a \fInameregexp\fP.  The syntax of regexps is
  the same as in emacs.  The following character escape sequences are
  supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
-@@ -236,15 +236,15 @@ tag entries for other files in place.  C
+@@ -237,15 +237,15 @@ tag entries for other files in place.  C
  by deleting the existing entries for the given files and then
  rewriting the new entries at the end of the tags file.  It is often
  faster to simply rebuild the entire tag file than to use this.
@@ -143,17 +164,17 @@
  .B \-h, \-H, \-\-help
  Print usage information.  Followed by one or more \-\-language=LANG
 --- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2012-06-27 10:41:38.716510300 +0000
-@@ -114,7 +114,7 @@ MKDIR_P = @MKDIR_P@
- # ========================== Lists of Files ===========================
++++ lib-src/Makefile.in	2014-10-21 14:25:38.807837913 +0000
+@@ -118,7 +118,7 @@ MKDIR_P = @MKDIR_P@
+ CLIENTW = @CLIENTW@
  
  # Things that a user might actually run, which should be installed in bindir.
--INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
-+INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} \
+-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
++INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
                 ebrowse${EXEEXT}
  
  INSTALLABLE_SCRIPTS = grep-changelog
-@@ -313,10 +313,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
+@@ -331,10 +331,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
  
  ## We depend on etags to assure that parallel makes do not write two
  ## etags.o files on top of each other.
@@ -161,10 +182,10 @@
 +gnuctags${EXEEXT}: etags${EXEEXT}
  	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
  	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  $(REGEXPOBJ) $(LOADLIBES) -o ctags
-+	  $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
+-	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
++	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
  
- profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+ profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
 --- lib-src/pop.c
 +++ lib-src/pop.c	2011-11-28 08:38:56.000000000 +0000
@@ -188,8 +209,56 @@
  	(set-buffer (apply 'make-comint "scheme" (car cmdlist)
  			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
  	(inferior-scheme-mode)))
+--- lisp/international/mule-cmds.el
++++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.000000000 +0000
+@@ -41,6 +41,7 @@
+ 
+ (defvar mule-keymap
+   (let ((map (make-sparse-keymap)))
++    (define-key map "m" 'toggle-enable-multibyte-characters)
+     (define-key map "f" 'set-buffer-file-coding-system)
+     (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	2009-08-12 13:35:06.000000000 +0000
+@@ -4977,7 +4977,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)
+-;  (and ange-ftp-vos-host-regexp
++;  (and host ange-ftp-vos-host-regexp
+ ;       (save-match-data
+ ;	 (string-match ange-ftp-vos-host-regexp host))))
+ ;
+@@ -5092,7 +5092,7 @@ NEWNAME should be the name to give the n
+ 
+ ;; Return non-nil if HOST is running VMS.
+ (defun ange-ftp-vms-host (host)
+-  (and ange-ftp-vms-host-regexp
++  (and host ange-ftp-vms-host-regexp
+        (string-match-p ange-ftp-vms-host-regexp host)))
+ 
+ ;; Because some VMS ftp servers convert filenames to lower case
+@@ -5600,7 +5600,7 @@ Other orders of $ and _ seem to all work
+ 
+ ;; Return non-nil if HOST is running MTS.
+ (defun ange-ftp-mts-host (host)
+-  (and ange-ftp-mts-host-regexp
++  (and host ange-ftp-mts-host-regexp
+        (string-match-p ange-ftp-mts-host-regexp host)))
+ 
+ ;; Parse the current buffer which is assumed to be in mts ftp dir format.
+@@ -5798,7 +5798,7 @@ Other orders of $ and _ seem to all work
+ 
+ ;; Return non-nil if HOST is running CMS.
+ (defun ange-ftp-cms-host (host)
+-  (and ange-ftp-cms-host-regexp
++  (and host ange-ftp-cms-host-regexp
+        (string-match-p ange-ftp-cms-host-regexp host)))
+ 
+ (defun ange-ftp-add-cms-host (host)
 --- lisp/site-load.el
-+++ lisp/site-load.el	2013-05-21 15:51:51.649940239 +0000
++++ lisp/site-load.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,41 @@
 +;;;;
 +;;; emacs20.xx/lisp/site-load.el
@@ -233,8 +302,8 @@
 +
 +;;; site-load.el ends here
 --- lisp/speedbar.el
-+++ lisp/speedbar.el	2012-06-27 11:04:52.701369888 +0000
-@@ -802,6 +802,7 @@ If you want to change this while speedba
++++ lisp/speedbar.el	2012-06-27 11:04:53.000000000 +0000
+@@ -806,6 +806,7 @@ If you want to change this while speedba
  
      ;; Navigation.
      (define-key map "n" 'speedbar-next)
@@ -242,56 +311,8 @@
      (define-key map "p" 'speedbar-prev)
      (define-key map "\M-n" 'speedbar-restricted-next)
      (define-key map "\M-p" 'speedbar-restricted-prev)
---- lisp/international/mule-cmds.el
-+++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.000000000 +0000
-@@ -39,6 +39,7 @@
- 
- (defvar mule-keymap
-   (let ((map (make-sparse-keymap)))
-+    (define-key map "m" 'toggle-enable-multibyte-characters)
-     (define-key map "f" 'set-buffer-file-coding-system)
-     (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	2009-08-12 13:35:06.000000000 +0000
-@@ -4976,7 +4976,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)
--;  (and ange-ftp-vos-host-regexp
-+;  (and host ange-ftp-vos-host-regexp
- ;       (save-match-data
- ;	 (string-match ange-ftp-vos-host-regexp host))))
- ;
-@@ -5091,7 +5091,7 @@ NEWNAME should be the name to give the n
- 
- ;; Return non-nil if HOST is running VMS.
- (defun ange-ftp-vms-host (host)
--  (and ange-ftp-vms-host-regexp
-+  (and host ange-ftp-vms-host-regexp
-        (string-match-p ange-ftp-vms-host-regexp host)))
- 
- ;; Because some VMS ftp servers convert filenames to lower case
-@@ -5599,7 +5599,7 @@ Other orders of $ and _ seem to all work
- 
- ;; Return non-nil if HOST is running MTS.
- (defun ange-ftp-mts-host (host)
--  (and ange-ftp-mts-host-regexp
-+  (and host ange-ftp-mts-host-regexp
-        (string-match-p ange-ftp-mts-host-regexp host)))
- 
- ;; Parse the current buffer which is assumed to be in mts ftp dir format.
-@@ -5797,7 +5797,7 @@ Other orders of $ and _ seem to all work
- 
- ;; Return non-nil if HOST is running CMS.
- (defun ange-ftp-cms-host (host)
--  (and ange-ftp-cms-host-regexp
-+  (and host ange-ftp-cms-host-regexp
-        (string-match-p ange-ftp-cms-host-regexp host)))
- 
- (defun ange-ftp-add-cms-host (host)
 --- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el	2013-05-21 16:06:31.241439612 +0000
++++ lisp/textmodes/ispell.el	2014-10-21 14:26:54.515839767 +0000
 @@ -351,10 +351,12 @@ Must be greater than 1."
    :group 'ispell)
  
@@ -301,15 +322,15 @@
 -      (executable-find "hunspell")
 -      "ispell")
 +  (if (functionp 'append-ispell-dict-alist)
-+      "ispell"
++	"ispell"
 +    (or (executable-find "aspell")
-+	 (executable-find "ispell")
-+	 (executable-find "hunspell")
-+	 "ispell"))
++	(executable-find "ispell")
++	(executable-find "hunspell")
++	"ispell"))
    "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
    :type 'string
-   :group 'ispell)
-@@ -1182,6 +1185,56 @@ The variable `ispell-library-directory'
+   :set (lambda (symbol value)
+@@ -1473,6 +1475,56 @@ The variable `ispell-library-directory'
  (if ispell-menu-map-needed
      (progn
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
@@ -367,7 +388,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	2013-05-21 15:51:52.049939078 +0000
++++ site-lisp/term/func-keys.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,33 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path
@@ -403,7 +424,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von func-keys.el
 --- site-lisp/term/gnome.el
-+++ site-lisp/term/gnome.el	2013-05-21 15:51:52.125559846 +0000
++++ site-lisp/term/gnome.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/gnomw.el for site-lisp path
@@ -503,7 +524,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von gnomw.el
 --- site-lisp/term/kvt.el
-+++ site-lisp/term/kvt.el	2013-05-21 15:51:52.197439092 +0000
++++ site-lisp/term/kvt.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/kvt.el for site-lisp path
@@ -603,7 +624,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von kvt.el
 --- site-lisp/term/linux.el
-+++ site-lisp/term/linux.el	2013-05-21 15:51:52.273939005 +0000
++++ site-lisp/term/linux.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,79 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/linux.el for site-lisp path
@@ -685,7 +706,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von linux.el
 --- site-lisp/term/locale.el
-+++ site-lisp/term/locale.el	2013-05-21 15:51:52.349939373 +0000
++++ site-lisp/term/locale.el	2013-05-21 15:51:52.000000000 +0000
 @@ -0,0 +1,13 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/locale.el for site-lisp path
@@ -701,13 +722,13 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von locale.el
 --- src/lisp.mk
-+++ src/lisp.mk	2012-06-27 11:10:56.532510062 +0000
-@@ -149,6 +149,8 @@ lisp = \
++++ src/lisp.mk	2014-10-21 14:27:53.832337794 +0000
+@@ -151,6 +151,8 @@ lisp = \
  	$(lispsource)/w32-vars.elc \
  	$(lispsource)/term/w32-win.elc \
  	$(lispsource)/ls-lisp.elc \
 +	$(lispsource)/lpr.elc \
 +	$(lispsource)/delsel.elc \
  	$(lispsource)/disp-table.elc \
+ 	$(lispsource)/w32-common-fns.elc \
  	$(lispsource)/dos-w32.elc \
- 	$(lispsource)/w32-fns.elc \
diff --git a/emacs-24.4.tar.xz b/emacs-24.4.tar.xz
new file mode 100644
index 0000000..3c701dc
--- /dev/null
+++ b/emacs-24.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd
+size 39733124
diff --git a/emacs.changes b/emacs.changes
index 2782d9b..e2c731a 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,113 @@
+-------------------------------------------------------------------
+Tue Oct 21 14:47:54 UTC 2014 - werner@suse.de
+
+- Update to to emacs version 24.4
+  * Emacs can now be compiled with ACL (access control list) support.
+  * Emacs can now be compiled with file notification support.
+  * Emacs can now be compiled with zlib support.
+  * Support for ACLs (access control lists).
+  * Emacs preserves the ACL entries of files when backing up.
+  * New functions `file-acl' and `set-file-acl' get and set file ACLs.
+  * Support for menus on text-mode terminals.
+  * New option `load-prefer-newer' affects how the `load' function chooses
+  * Multi-monitor support
+  * New function `zlib-decompress-region', which decompresses gzip- and
+    zlib-format compressed data using built-in zlib support (if available).
+  * The *Messages* buffer is created in `messages-buffer-mode'
+  * The cursor stops blinking after 10 blinks (by default) on X and Nextstep.
+  * In keymaps where SPC scrolls forward, S-SPC now scrolls backward.
+  * The default value of `make-backup-file-name-function' is no longer nil.
+  * The command `apropos-variable' is renamed to `apropos-user-option'.
+  * The key `?' now describes prefix bindings, like `C-h'.
+  * The command `describe-function' has been extended for EIEIO.
+  * The function `quail-help' is no longer an interactive command.
+    Use `C-h C-\' (`describe-input-method') instead.
+  * New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
+    bound to <f11> and M-<f10>, respectively.
+  * New hooks `focus-in-hook', `focus-out-hook'.
+    These are normal hooks run when an Emacs frame gains or loses input focus.
+  * The function `window-in-direction' now takes additional arguments
+    for specifying a reference point, wrapping the selection around frame
+    borders, and specifying ways to select the minibuffer window.
+  * Emacs can now change frame sizes in units of pixels, rather than
+    text rows or columns.
+  * Emacs can now change window sizes in units of pixels.
+  * The functions `window-body-height' and `window-body-width' now never
+    count partially visible lines or columns if called with a nil PIXELWISE
+    argument.
+  * Emacs can now draw dividers between adjacent windows.
+  * New functions to return the pixel sizes of window components
+  * The new function `window-text-pixel-size' returns the size of the
+    text of a window's buffer in pixels.
+  * `fit-window-to-buffer' can now resize windows in both dimensions.
+  * `fit-frame-to-buffer' now fits frames in both dimensions.  The new
+    options `fit-frame-to-buffer-margins' and `fit-frame-to-buffer-sizes'
+    control the size of the frame and its position on screen.
+  * Temp Buffer Resize Mode can now adjust the height and width of
+    windows and frames.
+  * `split-window' is now a non-interactive function, not a command.
+  * The functions `window-size' and `window-total-size' now have an
+    optional argument to return a rounded size value.
+  * `window-state-put' now allows you to put a window state into internal
+    windows too.
+  * New option `scroll-bar-adjust-thumb-portion'.
+    Available only on X, this option allows you to control over-scrolling
+    using the scroll bar (i.e., dragging the thumb down even when the end
+    of the buffer is visible).
+  * `display-buffer-at-bottom' chooses or creates a window at the
+    bottom of the selected frame.
+  * `display-buffer-no-window' to not display the buffer in a window.
+  * New display action alist entry `allow-no-window' to indicate the
+    caller of `display-buffer' is ready to handle the case of not displaying
+    the buffer in a window.
+  * `display-buffer-in-previous-window' is now a member of
+    `display-buffer-fallback-action'.
+  * `eval-defun' on an already defined defcustom calls the :set function,
+    if there is one.
+  * `electric-indent-mode' is now enabled by default.
+  * New buffer-local `electric-indent-local-mode'.
+  * The behavior of `C-x TAB' (`indent-rigidly') has changed.
+  * `tab-stop-list' is now implicitly extended to infinity by repeating
+    the last step.  Its default value is changed to nil, which means a tab
+    stop every `tab-width' columns.
+  * Uniquify is enabled by default, with `post-forward-angle-brackets' style.
+  * New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region.
+    Most commands are still unaware of it, but kill/yank do work on the rectangle.
+  * New option `visual-order-cursor-movement'.
+  * New command `delete-duplicate-lines'.
+  * New command `cycle-spacing' acts like a smarter `just-one-space'.
+  * `blink-matching-paren' now only highlights the matching open-paren
+    by default, instead of moving the cursor.  Set this variable to `jump' to
+    restore the old behavior.
+  * The new function `fill-single-char-nobreak-p' can stop fill from breaking
+    a line after a one-letter word, which is an error in some typographical
+    conventions.  To use it, add it to the `fill-nobreak-predicate' hook.
+  * All interactive commands that read a register (`copy-to-register', etc.)
+    now display a temporary window after `register-preview-delay' seconds
+    that summarizes existing registers.
+  * New command `frameset-to-register' bound to `C-x r f', replacing
+    `frame-configuration-to-register'.  It offers similar functionality,
+    plus enhancements like the ability to restore deleted frames.
+    (`frame-configuration-to-register' still exists, but no longer has a
+    key binding.)
+  * New command `C-x C-k x' (`kmacro-to-register') stores keyboard
+    macros in registers.
+- Remove patches now upstream
+  CVE-2014-3421.patch
+  CVE-2014-3422.patch
+  CVE-2014-3423.patch
+  CVE-2014-3424.patch
+  emacs-24.3-giflib5.patch 
+  emacs-24.3-nntp-typhoon-fix.patch
+- Change patches
+  emacs-24.3-decl.dif becomes emacs-24.4-decl.dif
+  emacs-24.3-flyspell.patch becomes emacs-24.4-flyspell.patch
+  emacs-24.3-glibc.patch becomes emacs-24.4-glibc.patch
+  emacs-24.3-nonvoid.patch becomes emacs-24.4-nonvoid.patch
+  emacs-24.3-ps-bdf.patch becomes emacs-24.4-ps-bdf.patch
+  emacs-24.3-xim.patch becomes emacs-24.4-xim.patch
+  emacs-24.3.dif becomes emacs-24.4.dif
+
 -------------------------------------------------------------------
 Wed Sep  3 10:31:56 UTC 2014 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 55af481..70a95e6 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -16,6 +16,8 @@
 #
 
 
+%bcond_without  autoconf
+
 Name:           emacs
 BuildRequires:  ImageMagick
 BuildRequires:  ImageMagick-devel
@@ -41,6 +43,7 @@ BuildRequires:  gtk3-devel
 BuildRequires:  gtk2-devel
 %endif
 BuildRequires:  krb5-devel
+BuildRequires:  libacl-devel
 BuildRequires:  libgnutls-devel
 %if 0%{?suse_version} > 1140
 BuildRequires:  libgnutls-openssl-devel
@@ -64,8 +67,9 @@ BuildRequires:  update-desktop-files
 BuildRequires:  xaw3d-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  xz
+BuildRequires:  zlib-devel
 Url:            http://www.gnu.org/software/emacs/
-Version:        24.3
+Version:        24.4
 Release:        0
 %if 0%{suse_version} >= 1300
 Requires:       etags
@@ -82,34 +86,24 @@ Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
 Requires(pre):  fileutils
-Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.3.tar.xz
+Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.4.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
 Source4:        emacs-rpmlintrc
 Source5:        emacs.sh
-Patch:          emacs-24.3.dif
-Patch2:         emacs-24.3-glibc.patch
-Patch3:         emacs-24.3-decl.dif
+Patch:          emacs-24.4.dif
+Patch2:         emacs-24.4-glibc.patch
+Patch3:         emacs-24.4-decl.dif
 Patch4:         emacs-24.3-asian-print.patch
-Patch5:         emacs-24.3-ps-bdf.patch
+Patch5:         emacs-24.4-ps-bdf.patch
 Patch7:         emacs-24.1-ps-mule.patch
-Patch8:         emacs-24.3-nonvoid.patch
-Patch11:        emacs-24.3-xim.patch
+Patch8:         emacs-24.4-nonvoid.patch
+Patch11:        emacs-24.4-xim.patch
 Patch12:        emacs-24.3-x11r7.patch
 Patch15:        emacs-24.3-iconic.patch
-Patch16:        emacs-24.3-flyspell.patch
-# PATCH-FIX-USTREAM -- Unsecure use of temporary files (patch 1) (bnc#876847)
-Patch17:        CVE-2014-3421.patch
-# PATCH-FIX-USTREAM -- Unsecure use of temporary files (patch 2) (bnc#876847)
-Patch18:        CVE-2014-3422.patch
-# PATCH-FIX-USTREAM -- Unsecure use of temporary files (patch 3) (bnc#876847)
-Patch19:        CVE-2014-3423.patch
-# PATCH-FIX-USTREAM -- Unsecure use of temporary files (patch 4) (bnc#876847)
-Patch20:        CVE-2014-3424.patch
+Patch16:        emacs-24.4-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
-Patch25:        emacs-24.3-giflib5.patch
-Patch26:        emacs-24.3-nntp-typhoon-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -127,7 +121,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define appDefaultsDir %{_x11data}/app-defaults
 %define appDefaultsFile %{appDefaultsDir}/Emacs
 %endif
-%define info_files  emacs eintr elisp ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-gnutls emacs-mime epa erc ert eshell eudc efaq flymake forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode tramp url vip viper widget wisent woman
+%define info_files  emacs eintr elisp ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq efaq-w32 eieio emacs-gnutls emacs-mime epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vip viper widget wisent woman
 
 %description
 Basic package for the GNU Emacs editor. Requires emacs-x11 or
@@ -219,14 +213,8 @@ and most assembler-like syntaxes.
 %patch12 -p0 -b .x11r7
 %patch15 -p0 -b .iconic
 %patch16 -p0 -b .flyspell
-%patch17 -p0 -b .CVE-2014-3421
-%patch18 -p0 -b .CVE-2014-3422
-%patch19 -p0 -b .CVE-2014-3423
-%patch20 -p0 -b .CVE-2014-3424
-%patch   -p0
-%patch22 -p0
-%patch25 -p1
-%patch26 -p1 
+%patch22 -p0 -b .obsolate
+%patch   -p0 -b .0
 
 %if %{without autoconf}
 # We don't want to run autoconf
@@ -370,7 +358,9 @@ DESKTOP="--with-x \
 	 --with-kerberos5 \
 	 --with-xim \
 	 --with-wide-int \
+	 --with-file-notification=inotify \
 	 --enable-autodepend \
+	 --enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp
 "
 
 ##OIFS="$IFS"; IFS=.
@@ -619,20 +609,23 @@ fi
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
-%dir %{_docdir}/emacs/
-%{_docdir}/emacs/doc
+%{_datadir}/X11/app-defaults/Emacs
+%dir %{_datadir}/applications/
+%{_datadir}/applications/emacs.desktop
+%dir %{_datadir}/doc/packages/emacs/
+%{_datadir}/doc/packages/emacs/doc
 %dir %{_datadir}/emacs/
 %dir %{_datadir}/emacs/%{version}/
 %dir %{_datadir}/emacs/%{version}/etc/
 %doc %{_datadir}/emacs/%{version}/etc/AUTHORS
+%doc %{_datadir}/emacs/%{version}/etc/CALC-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/CENSORSHIP
 %doc %{_datadir}/emacs/%{version}/etc/CONTRIBUTE
-%doc %{_datadir}/emacs/%{version}/etc/COOKIES
 %doc %{_datadir}/emacs/%{version}/etc/COPYING
 %doc %{_datadir}/emacs/%{version}/etc/DEBUG
 %doc %{_datadir}/emacs/%{version}/etc/DEVEL.HUMOR
 %doc %{_datadir}/emacs/%{version}/etc/DISTRIB
-%{_datadir}/emacs/%{version}/etc/DOC-%{version}.1
+%{_datadir}/emacs/%{version}/etc/DOC
 %doc %{_datadir}/emacs/%{version}/etc/ERC-NEWS
 %if 0%{suse_version} < 1300
 %doc %{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
@@ -642,14 +635,11 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/GNU
 %doc %{_datadir}/emacs/%{version}/etc/GNUS-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/HELLO
-%doc %{_datadir}/emacs/%{version}/etc/INTERVIEW
 %doc %{_datadir}/emacs/%{version}/etc/JOKES
 %doc %{_datadir}/emacs/%{version}/etc/LINUX-GNU
 %doc %{_datadir}/emacs/%{version}/etc/MACHINES
-%doc %{_datadir}/emacs/%{version}/etc/MAILINGLISTS
 %doc %{_datadir}/emacs/%{version}/etc/MH-E-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/MORE.STUFF
-%doc %{_datadir}/emacs/%{version}/etc/MOTIVATION
 %{_datadir}/emacs/%{version}/etc/NEWS
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.1-17
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.18
@@ -664,12 +654,10 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/ORG-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/PROBLEMS
 %doc %{_datadir}/emacs/%{version}/etc/README
-%doc %{_datadir}/emacs/%{version}/etc/SERVICE
 %doc %{_datadir}/emacs/%{version}/etc/TERMS
 %doc %{_datadir}/emacs/%{version}/etc/THE-GNU-PROJECT
 %doc %{_datadir}/emacs/%{version}/etc/TODO
 %doc %{_datadir}/emacs/%{version}/etc/WHY-FREE
-%doc %{_datadir}/emacs/%{version}/etc/celibacy.1.gz
 %dir %{_datadir}/emacs/%{version}/etc/charsets/
 %{_datadir}/emacs/%{version}/etc/charsets/8859-10.map
 %{_datadir}/emacs/%{version}/etc/charsets/8859-11.map
@@ -804,17 +792,15 @@ fi
 %{_datadir}/emacs/%{version}/etc/charsets/stdenc.map
 %{_datadir}/emacs/%{version}/etc/charsets/symbol.map
 %{_datadir}/emacs/%{version}/etc/compilation.txt
-%{_datadir}/emacs/%{version}/etc/condom.1.gz
-%{_datadir}/emacs/%{version}/etc/copying.paper
 %dir %{_datadir}/emacs/%{version}/etc/e/
 %doc %{_datadir}/emacs/%{version}/etc/e/README
 %{_datadir}/emacs/%{version}/etc/e/eterm-color
 %{_datadir}/emacs/%{version}/etc/e/eterm-color.ti
-%{_datadir}/emacs/%{version}/etc/echo.msg
 %{_datadir}/emacs/%{version}/etc/edt-user.el
 %{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb
+%{_datadir}/emacs/%{version}/etc/emacs.appdata.xml
 %{_datadir}/emacs/%{version}/etc/emacs.icon
-%{_datadir}/emacs/%{version}/etc/enriched.doc
+%{_datadir}/emacs/%{version}/etc/enriched.txt
 %dir %{_datadir}/emacs/%{version}/etc/forms/
 %doc %{_datadir}/emacs/%{version}/etc/forms/README
 %{_datadir}/emacs/%{version}/etc/forms/forms-d2.dat
@@ -1423,6 +1409,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/org/OrgOdtContentTemplate.xml
 %{_datadir}/emacs/%{version}/etc/org/OrgOdtStyles.xml
 %doc %{_datadir}/emacs/%{version}/etc/org/README
+%{_datadir}/emacs/%{version}/etc/package-keyring.gpg
 %{_datadir}/emacs/%{version}/etc/ps-prin0.ps
 %{_datadir}/emacs/%{version}/etc/ps-prin1.ps
 %{_datadir}/emacs/%{version}/etc/publicsuffix.txt
@@ -1435,6 +1422,7 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/refcards/cs-dired-ref.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/cs-refcard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/cs-refcard.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/cs-survival.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/cs-survival.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/de-refcard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/de-refcard.tex
@@ -1445,6 +1433,7 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-dired-ref.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-refcard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-refcard.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/fr-survival.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-survival.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/gnus-booklet.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/gnus-logo.eps
@@ -1466,9 +1455,13 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-dired-ref.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-refcard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-refcard.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/sk-survival.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-survival.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/survival.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/survival.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/vipcard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/vipcard.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/viperCard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/viperCard.tex
 %{_datadir}/emacs/%{version}/etc/rgb.txt
 %dir %{_datadir}/emacs/%{version}/etc/schema/
@@ -1519,7 +1512,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/schema/xhtml.rnc
 %{_datadir}/emacs/%{version}/etc/schema/xslt.rnc
 %{_datadir}/emacs/%{version}/etc/ses-example.ses
-%{_datadir}/emacs/%{version}/etc/sex.6.gz
 %{_datadir}/emacs/%{version}/etc/spook.lines
 %dir %{_datadir}/emacs/%{version}/etc/srecode/
 %{_datadir}/emacs/%{version}/etc/srecode/c.srt
@@ -1542,6 +1534,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/themes/adwaita-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/deeper-blue-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/dichromacy-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/leuven-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/light-blue-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/manoj-dark-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/misterioso-theme.el
@@ -1577,70 +1570,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.translators
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.zh
 %{_datadir}/emacs/%{version}/etc/yow.lines
-%dir %{_datadir}/emacs/%{version}/leim/
-%dir %{_datadir}/emacs/%{version}/leim/ja-dic/
-%{_datadir}/emacs/%{version}/leim/ja-dic/ja-dic.elc
-%{_datadir}/emacs/%{version}/leim/leim-list.el
-%dir %{_datadir}/emacs/%{version}/leim/quail/
-%{_datadir}/emacs/%{version}/leim/quail/4Corner.elc
-%{_datadir}/emacs/%{version}/leim/quail/ARRAY30.elc
-%{_datadir}/emacs/%{version}/leim/quail/CCDOSPY.elc
-%{_datadir}/emacs/%{version}/leim/quail/CTLau-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/CTLau.elc
-%{_datadir}/emacs/%{version}/leim/quail/ECDICT.elc
-%{_datadir}/emacs/%{version}/leim/quail/ETZY.elc
-%{_datadir}/emacs/%{version}/leim/quail/PY-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/PY.elc
-%{_datadir}/emacs/%{version}/leim/quail/Punct-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/Punct.elc
-%{_datadir}/emacs/%{version}/leim/quail/QJ-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/QJ.elc
-%{_datadir}/emacs/%{version}/leim/quail/SW.elc
-%{_datadir}/emacs/%{version}/leim/quail/TONEPY.elc
-%{_datadir}/emacs/%{version}/leim/quail/ZIRANMA.elc
-%{_datadir}/emacs/%{version}/leim/quail/ZOZY.elc
-%{_datadir}/emacs/%{version}/leim/quail/arabic.elc
-%{_datadir}/emacs/%{version}/leim/quail/croatian.elc
-%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.elc
-%{_datadir}/emacs/%{version}/leim/quail/cyrillic.elc
-%{_datadir}/emacs/%{version}/leim/quail/czech.elc
-%{_datadir}/emacs/%{version}/leim/quail/ethiopic.elc
-%{_datadir}/emacs/%{version}/leim/quail/georgian.elc
-%{_datadir}/emacs/%{version}/leim/quail/greek.elc
-%{_datadir}/emacs/%{version}/leim/quail/hangul.elc
-%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.elc
-%{_datadir}/emacs/%{version}/leim/quail/hanja.elc
-%{_datadir}/emacs/%{version}/leim/quail/hanja3.elc
-%{_datadir}/emacs/%{version}/leim/quail/hebrew.elc
-%{_datadir}/emacs/%{version}/leim/quail/indian.elc
-%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.elc
-%{_datadir}/emacs/%{version}/leim/quail/ipa.elc
-%{_datadir}/emacs/%{version}/leim/quail/japanese.elc
-%{_datadir}/emacs/%{version}/leim/quail/lao.elc
-%{_datadir}/emacs/%{version}/leim/quail/latin-alt.elc
-%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.elc
-%{_datadir}/emacs/%{version}/leim/quail/latin-post.elc
-%{_datadir}/emacs/%{version}/leim/quail/latin-pre.elc
-%{_datadir}/emacs/%{version}/leim/quail/lrt.elc
-%{_datadir}/emacs/%{version}/leim/quail/persian.elc
-%{_datadir}/emacs/%{version}/leim/quail/py-punct.elc
-%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/quick-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/quick-cns.elc
-%{_datadir}/emacs/%{version}/leim/quail/rfc1345.elc
-%{_datadir}/emacs/%{version}/leim/quail/sgml-input.elc
-%{_datadir}/emacs/%{version}/leim/quail/sisheng.elc
-%{_datadir}/emacs/%{version}/leim/quail/slovak.elc
-%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.elc
-%{_datadir}/emacs/%{version}/leim/quail/thai.elc
-%{_datadir}/emacs/%{version}/leim/quail/tibetan.elc
-%{_datadir}/emacs/%{version}/leim/quail/tsang-b5.elc
-%{_datadir}/emacs/%{version}/leim/quail/tsang-cns.elc
-%{_datadir}/emacs/%{version}/leim/quail/uni-input.elc
-%{_datadir}/emacs/%{version}/leim/quail/viqr.elc
-%{_datadir}/emacs/%{version}/leim/quail/vntelex.elc
-%{_datadir}/emacs/%{version}/leim/quail/vnvni.elc
-%{_datadir}/emacs/%{version}/leim/quail/welsh.elc
 %dir %{_datadir}/emacs/%{version}/lisp/
 %{_datadir}/emacs/%{version}/lisp/COPYING
 %doc %{_datadir}/emacs/%{version}/lisp/README
@@ -1663,8 +1592,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/buff-menu.elc
 %{_datadir}/emacs/%{version}/lisp/button.elc
 %dir %{_datadir}/emacs/%{version}/lisp/calc/
-%doc %{_datadir}/emacs/%{version}/lisp/calc/README
-%doc %{_datadir}/emacs/%{version}/lisp/calc/README.prev
 %{_datadir}/emacs/%{version}/lisp/calc/calc-aent.elc
 %{_datadir}/emacs/%{version}/lisp/calc/calc-alg.elc
 %{_datadir}/emacs/%{version}/lisp/calc/calc-arith.elc
@@ -1751,7 +1678,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/cedet.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/data-debug.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/ede.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/ede/
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/auto.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/autoconf-edit.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/base.elc
@@ -1791,15 +1717,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/mode-local.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/pulse.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/complete.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/debug.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/fcn.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/refs.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/c-by.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/c.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/debug.elc
@@ -1826,7 +1749,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/db.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/debug.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/decorate.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/decorate/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/decorate/include.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/decorate/mode.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/dep.elc
@@ -1853,7 +1775,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/senator.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/sort.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/symref.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/symref/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/symref/cscope.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/symref/filter.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/symref/global.elc
@@ -1868,7 +1789,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/util-modes.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/util.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/comp.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/grammar.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/java-tags.elc
@@ -1879,7 +1799,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/python.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/wisent.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode.elc
-%dir %{_datadir}/emacs/%{version}/lisp/cedet/srecode/
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/args.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/compile.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/cpp.elc
@@ -1906,6 +1825,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/template.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/texi.elc
 %{_datadir}/emacs/%{version}/lisp/chistory.elc
+%{_datadir}/emacs/%{version}/lisp/cmuscheme.el.0
 %{_datadir}/emacs/%{version}/lisp/cmuscheme.elc
 %{_datadir}/emacs/%{version}/lisp/color.elc
 %{_datadir}/emacs/%{version}/lisp/comint.elc
@@ -1940,6 +1860,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/echistory.elc
 %{_datadir}/emacs/%{version}/lisp/edmacro.elc
 %{_datadir}/emacs/%{version}/lisp/ehelp.elc
+%{_datadir}/emacs/%{version}/lisp/elec-pair.elc
 %{_datadir}/emacs/%{version}/lisp/electric.elc
 %{_datadir}/emacs/%{version}/lisp/elide-head.elc
 %dir %{_datadir}/emacs/%{version}/lisp/emacs-lisp/
@@ -1973,6 +1894,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/easymenu.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/edebug.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-base.elc
+%{_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-opt.elc
@@ -1985,7 +1907,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ewoc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-func.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-gc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gulp.elc
@@ -1996,6 +1917,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/nadvice.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package-x.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pcase.elc
@@ -2007,6 +1929,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/subr-x.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tabulated-list.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.elc
@@ -2102,6 +2025,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/eshell/em-script.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-smart.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-term.elc
+%{_datadir}/emacs/%{version}/lisp/eshell/em-tramp.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-unix.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-xtra.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-arg.elc
@@ -2123,6 +2047,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/faces.elc
 %{_datadir}/emacs/%{version}/lisp/ffap.elc
 %{_datadir}/emacs/%{version}/lisp/filecache.elc
+%{_datadir}/emacs/%{version}/lisp/filenotify.elc
 %{_datadir}/emacs/%{version}/lisp/files-x.elc
 %{_datadir}/emacs/%{version}/lisp/files.elc
 %{_datadir}/emacs/%{version}/lisp/filesets.elc
@@ -2141,6 +2066,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/format.elc
 %{_datadir}/emacs/%{version}/lisp/forms.elc
 %{_datadir}/emacs/%{version}/lisp/frame.elc
+%{_datadir}/emacs/%{version}/lisp/frameset.elc
 %{_datadir}/emacs/%{version}/lisp/fringe.elc
 %{_datadir}/emacs/%{version}/lisp/generic-x.el
 %dir %{_datadir}/emacs/%{version}/lisp/gnus/
@@ -2172,6 +2098,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-html.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-icalendar.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-int.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-kill.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-logic.elc
@@ -2262,8 +2189,6 @@ fi
 %{_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/shr-color.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/shr.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/sieve-manage.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/sieve-mode.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/sieve.elc
@@ -2325,6 +2250,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/kkc.elc
 %{_datadir}/emacs/%{version}/lisp/international/latexenc.elc
 %{_datadir}/emacs/%{version}/lisp/international/latin1-disp.elc
+%{_datadir}/emacs/%{version}/lisp/international/mule-cmds.el.0
 %{_datadir}/emacs/%{version}/lisp/international/mule-cmds.elc
 %{_datadir}/emacs/%{version}/lisp/international/mule-conf.elc
 %{_datadir}/emacs/%{version}/lisp/international/mule-diag.elc
@@ -2352,7 +2278,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/utf-7.elc
 %{_datadir}/emacs/%{version}/lisp/isearch.elc
 %{_datadir}/emacs/%{version}/lisp/isearchb.elc
-%{_datadir}/emacs/%{version}/lisp/iswitchb.elc
 %{_datadir}/emacs/%{version}/lisp/jit-lock.elc
 %{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.elc
 %{_datadir}/emacs/%{version}/lisp/jka-compr.elc
@@ -2399,12 +2324,75 @@ fi
 %{_datadir}/emacs/%{version}/lisp/language/viet-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/vietnamese.elc
 %{_datadir}/emacs/%{version}/lisp/ldefs-boot.el
+%dir %{_datadir}/emacs/%{version}/lisp/leim/
+%dir %{_datadir}/emacs/%{version}/lisp/leim/ja-dic/
+%{_datadir}/emacs/%{version}/lisp/leim/ja-dic/ja-dic.elc
+%{_datadir}/emacs/%{version}/lisp/leim/leim-list.el
+%dir %{_datadir}/emacs/%{version}/lisp/leim/quail/
+%{_datadir}/emacs/%{version}/lisp/leim/quail/4Corner.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ARRAY30.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CCDOSPY.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CTLau-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CTLau.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ECDICT.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ETZY.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/PY-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/PY.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/Punct-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/Punct.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/QJ-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/QJ.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/SW.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/TONEPY.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ZIRANMA.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ZOZY.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/arabic.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/croatian.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/cyril-jis.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/cyrillic.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/czech.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ethiopic.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/georgian.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/greek.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hangul.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja-jis.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja3.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hebrew.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/indian.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ipa-praat.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ipa.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/japanese.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/lao.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-alt.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-ltx.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-post.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-pre.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/lrt.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/persian.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/py-punct.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/pypunct-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-cns.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/rfc1345.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/sgml-input.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/sisheng.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/slovak.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/symbol-ksc.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/thai.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tibetan.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tsang-b5.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tsang-cns.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/uni-input.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/viqr.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/vntelex.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/vnvni.elc
+%{_datadir}/emacs/%{version}/lisp/leim/quail/welsh.elc
 %{_datadir}/emacs/%{version}/lisp/linum.elc
 %{_datadir}/emacs/%{version}/lisp/loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/loadhist.elc
 %{_datadir}/emacs/%{version}/lisp/loadup.el
 %{_datadir}/emacs/%{version}/lisp/locate.elc
-%{_datadir}/emacs/%{version}/lisp/longlines.elc
 %{_datadir}/emacs/%{version}/lisp/lpr.elc
 %{_datadir}/emacs/%{version}/lisp/ls-lisp.elc
 %{_datadir}/emacs/%{version}/lisp/macros.elc
@@ -2488,6 +2476,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/msb.elc
 %{_datadir}/emacs/%{version}/lisp/mwheel.elc
 %dir %{_datadir}/emacs/%{version}/lisp/net/
+%{_datadir}/emacs/%{version}/lisp/net/ange-ftp.el.0
 %{_datadir}/emacs/%{version}/lisp/net/ange-ftp.elc
 %{_datadir}/emacs/%{version}/lisp/net/browse-url.elc
 %{_datadir}/emacs/%{version}/lisp/net/dbus.elc
@@ -2502,6 +2491,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-ldap.elc
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-mab.elc
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-ph.elc
+%{_datadir}/emacs/%{version}/lisp/net/eww.elc
 %{_datadir}/emacs/%{version}/lisp/net/gnutls.elc
 %{_datadir}/emacs/%{version}/lisp/net/goto-addr.elc
 %{_datadir}/emacs/%{version}/lisp/net/hmac-def.elc
@@ -2521,19 +2511,21 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/ntlm.elc
 %{_datadir}/emacs/%{version}/lisp/net/quickurl.elc
 %{_datadir}/emacs/%{version}/lisp/net/rcirc.elc
-%{_datadir}/emacs/%{version}/lisp/net/rcompile.elc
 %{_datadir}/emacs/%{version}/lisp/net/rlogin.elc
 %{_datadir}/emacs/%{version}/lisp/net/sasl-cram.elc
 %{_datadir}/emacs/%{version}/lisp/net/sasl-digest.elc
 %{_datadir}/emacs/%{version}/lisp/net/sasl-ntlm.elc
 %{_datadir}/emacs/%{version}/lisp/net/sasl.elc
 %{_datadir}/emacs/%{version}/lisp/net/secrets.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/telnet.elc
 %{_datadir}/emacs/%{version}/lisp/net/tls.elc
+%{_datadir}/emacs/%{version}/lisp/net/tramp-adb.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cache.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.elc
@@ -2547,7 +2539,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/tramp.elc
 %{_datadir}/emacs/%{version}/lisp/net/trampver.elc
 %{_datadir}/emacs/%{version}/lisp/net/webjump.elc
-%{_datadir}/emacs/%{version}/lisp/net/xesam.elc
 %{_datadir}/emacs/%{version}/lisp/net/zeroconf.elc
 %{_datadir}/emacs/%{version}/lisp/newcomment.elc
 %{_datadir}/emacs/%{version}/lisp/notifications.elc
@@ -2590,17 +2581,21 @@ fi
 %{_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/iswitchb.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/keyswap.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/ledit.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/longlines.elc
 %{_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/mouse-sel.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/options.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/otodo-mode.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-select.elc
@@ -2610,14 +2605,20 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp.elc
 %{_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.el.obsolate
 %{_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/vc-mcvs.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/xesam.elc
+%{_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-R.elc
@@ -2626,6 +2627,7 @@ fi
 %{_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-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
@@ -2644,6 +2646,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-makefile.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.elc
@@ -2669,10 +2672,8 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-agenda.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-archive.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-ascii.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-attach.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-bbdb.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-beamer.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-bibtex.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-capture.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-clock.elc
@@ -2681,57 +2682,50 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-crypt.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-ctags.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-docbook.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.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-exp-blocks.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-exp.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
-%{_datadir}/emacs/%{version}/lisp/org/org-freemind.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-gnus.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-habit.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-html.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-icalendar.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-id.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-indent.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-info.elc
 %{_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-jsinfo.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-latex.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-list.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-loaddefs.el
-%{_datadir}/emacs/%{version}/lisp/org/org-lparse.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-mac-message.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-macro.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-macs.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-mew.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-mhe.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-mks.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-mobile.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-mouse.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-odt.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-plot.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-protocol.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-publish.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-remember.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-rmail.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-special-blocks.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-src.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-table.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-taskjuggler.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-timer.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-version.el
-%{_datadir}/emacs/%{version}/lisp/org/org-vm.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-w3m.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-wl.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-xoxo.elc
 %{_datadir}/emacs/%{version}/lisp/org/org.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-ascii.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-beamer.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-html.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-icalendar.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-latex.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-man.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-md.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-odt.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-org.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-publish.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox-texinfo.elc
+%{_datadir}/emacs/%{version}/lisp/org/ox.elc
 %{_datadir}/emacs/%{version}/lisp/outline.elc
 %{_datadir}/emacs/%{version}/lisp/paren.elc
 %{_datadir}/emacs/%{version}/lisp/password-cache.elc
@@ -2740,6 +2734,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/pcmpl-linux.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-rpm.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-unix.elc
+%{_datadir}/emacs/%{version}/lisp/pcmpl-x.elc
 %{_datadir}/emacs/%{version}/lisp/pcomplete.elc
 %dir %{_datadir}/emacs/%{version}/lisp/play/
 %{_datadir}/emacs/%{version}/lisp/play/5x5.elc
@@ -2759,7 +2754,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/hanoi.elc
 %{_datadir}/emacs/%{version}/lisp/play/landmark.elc
 %{_datadir}/emacs/%{version}/lisp/play/life.elc
-%{_datadir}/emacs/%{version}/lisp/play/meese.elc
 %{_datadir}/emacs/%{version}/lisp/play/morse.elc
 %{_datadir}/emacs/%{version}/lisp/play/mpuz.elc
 %{_datadir}/emacs/%{version}/lisp/play/pong.elc
@@ -2768,7 +2762,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/spook.elc
 %{_datadir}/emacs/%{version}/lisp/play/studly.elc
 %{_datadir}/emacs/%{version}/lisp/play/tetris.elc
-%{_datadir}/emacs/%{version}/lisp/play/yow.elc
 %{_datadir}/emacs/%{version}/lisp/play/zone.elc
 %{_datadir}/emacs/%{version}/lisp/printing.elc
 %{_datadir}/emacs/%{version}/lisp/proced.elc
@@ -2781,6 +2774,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/antlr-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/asm-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/autoconf.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/bat-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/bug-reference.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cap-words.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-align.elc
@@ -2804,7 +2798,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/cpp.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cwarn.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/dcl-mode.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/delphi.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-abn.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-bnf.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-dtd.elc
@@ -2840,10 +2833,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/meta-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/mixal-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/modula2.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/octave-inf.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/octave-mod.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/octave.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/opascal.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/pascal.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/perl-mode.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/prog-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/prolog.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/ps-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/python.elc
@@ -2887,9 +2881,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/shell.elc
 %{_datadir}/emacs/%{version}/lisp/simple.elc
 %{_datadir}/emacs/%{version}/lisp/site-load.el
+%{_datadir}/emacs/%{version}/lisp/site-load.el.0
 %{_datadir}/emacs/%{version}/lisp/skeleton.el
 %{_datadir}/emacs/%{version}/lisp/sort.elc
 %{_datadir}/emacs/%{version}/lisp/soundex.elc
+%{_datadir}/emacs/%{version}/lisp/speedbar.el.0
 %{_datadir}/emacs/%{version}/lisp/speedbar.elc
 %{_datadir}/emacs/%{version}/lisp/startup.elc
 %{_datadir}/emacs/%{version}/lisp/strokes.elc
@@ -2918,7 +2914,6 @@ 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/sup-mouse.elc
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.elc
 %{_datadir}/emacs/%{version}/lisp/term/tvi970.elc
 %{_datadir}/emacs/%{version}/lisp/term/vt100.elc
@@ -2937,7 +2932,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/wyse50.elc
 %{_datadir}/emacs/%{version}/lisp/term/x-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/xterm.el
-%{_datadir}/emacs/%{version}/lisp/terminal.elc
 %dir %{_datadir}/emacs/%{version}/lisp/textmodes/
 %{_datadir}/emacs/%{version}/lisp/textmodes/artist.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/bib-mode.elc
@@ -2949,6 +2943,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.elc
+%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.0
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/nroff-mode.elc
@@ -3099,7 +3094,16 @@ fi
 %{_datadir}/emacs/%{version}/site-lisp/term/linux.el
 %{_datadir}/emacs/%{version}/site-lisp/term/locale.el
 %dir %{_datadir}/emacs/site-lisp/
-%dir %{_datadir}/emacs/site-lisp/site-start.d 
+%{_datadir}/emacs/site-lisp/ger-keys.elc
+%{_datadir}/emacs/site-lisp/maple.elc
+%{_datadir}/emacs/site-lisp/php-mode.elc
+%{_datadir}/emacs/site-lisp/rmailgen.elc
+%{_datadir}/emacs/site-lisp/rmime.elc
+%dir %{_datadir}/emacs/site-lisp/site-start.d/
+%{_datadir}/emacs/site-lisp/site-start.el
+%{_datadir}/emacs/site-lisp/subdirs.el
+%{_datadir}/emacs/site-lisp/vt200-esc-fix.elc
+%{_datadir}/emacs/site-lisp/xfonts.elc
 %{_mandir}/man1/*.1.gz
 %exclude %{_mandir}/man1/*tags.1.gz
 %dir %{_localstatedir}/games/emacs/
@@ -3117,8 +3121,14 @@ fi
 %dir %{appDefaultsDir}
 %{appDefaultsFile}
 %{_datadir}/applications/emacs.desktop
+%{_datadir}/icons/hicolor/128x128/apps/emacs.png
+%{_datadir}/icons/hicolor/16x16/apps/emacs.png
+%{_datadir}/icons/hicolor/24x24/apps/emacs.png
+%{_datadir}/icons/hicolor/32x32/apps/emacs.png
+%{_datadir}/icons/hicolor/48x48/apps/emacs.png
+%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
 %{_datadir}/pixmaps/emacs.png
-%{_datadir}/icons/hicolor
 
 %files       -n emacs-info
 %defattr(-, root, root)
@@ -3127,66 +3137,6 @@ fi
 
 %files       -n emacs-el
 %defattr(-, root, root)
-%{_datadir}/emacs/%{version}/leim/ja-dic/ja-dic.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/4Corner.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ARRAY30.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/CCDOSPY.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/CTLau-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/CTLau.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ECDICT.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ETZY.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/PY-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/PY.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/Punct-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/Punct.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/QJ-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/QJ.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/SW.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/TONEPY.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ZIRANMA.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ZOZY.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/arabic.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/croatian.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/cyrillic.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/czech.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ethiopic.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/georgian.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/greek.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/hangul.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/hanja.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/hanja3.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/hebrew.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/indian.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/ipa.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/japanese.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/lao.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/latin-alt.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/latin-post.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/latin-pre.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/lrt.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/persian.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/py-punct.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/quick-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/quick-cns.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/rfc1345.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/sgml-input.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/sisheng.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/slovak.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/thai.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/tibetan.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/tsang-b5.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/tsang-cns.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/uni-input.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/viqr.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/vntelex.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/vnvni.el.gz
-%{_datadir}/emacs/%{version}/leim/quail/welsh.el.gz
 %{_datadir}/emacs/%{version}/lisp/abbrev.el.gz
 %{_datadir}/emacs/%{version}/lisp/align.el.gz
 %{_datadir}/emacs/%{version}/lisp/allout-widgets.el.gz
@@ -3284,6 +3234,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/cedet.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/data-debug.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede.el.gz
+%dir %{_datadir}/emacs/%{version}/lisp/cedet/ede/
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/auto.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/autoconf-edit.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/ede/base.el.gz
@@ -3322,6 +3273,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/mode-local.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/pulse.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic.el.gz
+%dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/complete.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/debug.el.gz
@@ -3403,6 +3355,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/python.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/wisent.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode.el.gz
+%dir %{_datadir}/emacs/%{version}/lisp/cedet/srecode/
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/args.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/compile.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/cpp.el.gz
@@ -3460,6 +3413,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/echistory.el.gz
 %{_datadir}/emacs/%{version}/lisp/edmacro.el.gz
 %{_datadir}/emacs/%{version}/lisp/ehelp.el.gz
+%{_datadir}/emacs/%{version}/lisp/elec-pair.el.gz
 %{_datadir}/emacs/%{version}/lisp/electric.el.gz
 %{_datadir}/emacs/%{version}/lisp/elide-head.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/advice.el.gz
@@ -3491,6 +3445,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/easymenu.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/edebug.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-base.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-core.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-custom.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-datadebug.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-opt.el.gz
@@ -3503,7 +3458,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ewoc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-func.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-gc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gulp.el.gz
@@ -3514,6 +3468,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/nadvice.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package-x.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pcase.el.gz
@@ -3525,6 +3480,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.el.gz
 %{_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/tabulated-list.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.el.gz
@@ -3617,6 +3573,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/eshell/em-script.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/em-smart.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/em-term.el.gz
+%{_datadir}/emacs/%{version}/lisp/eshell/em-tramp.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/em-unix.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/em-xtra.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-arg.el.gz
@@ -3637,6 +3594,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/faces.el.gz
 %{_datadir}/emacs/%{version}/lisp/ffap.el.gz
 %{_datadir}/emacs/%{version}/lisp/filecache.el.gz
+%{_datadir}/emacs/%{version}/lisp/filenotify.el.gz
 %{_datadir}/emacs/%{version}/lisp/files-x.el.gz
 %{_datadir}/emacs/%{version}/lisp/files.el.gz
 %{_datadir}/emacs/%{version}/lisp/filesets.el.gz
@@ -3654,6 +3612,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/format.el.gz
 %{_datadir}/emacs/%{version}/lisp/forms.el.gz
 %{_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
@@ -3682,6 +3641,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-html.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-icalendar.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-int.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-kill.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-logic.el.gz
@@ -3772,8 +3732,6 @@ fi
 %{_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/shr-color.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/shr.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
@@ -3843,7 +3801,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/utf-7.el.gz
 %{_datadir}/emacs/%{version}/lisp/isearch.el.gz
 %{_datadir}/emacs/%{version}/lisp/isearchb.el.gz
-%{_datadir}/emacs/%{version}/lisp/iswitchb.el.gz
 %{_datadir}/emacs/%{version}/lisp/jit-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el.gz
 %{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
@@ -3888,10 +3845,69 @@ fi
 %{_datadir}/emacs/%{version}/lisp/language/utf-8-lang.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/viet-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/vietnamese.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/ja-dic/ja-dic.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/4Corner.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ARRAY30.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CCDOSPY.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CTLau-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/CTLau.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ECDICT.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ETZY.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/PY-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/PY.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/Punct-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/Punct.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/QJ-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/QJ.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/SW.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/TONEPY.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ZIRANMA.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ZOZY.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/arabic.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/croatian.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/cyril-jis.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/cyrillic.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/czech.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ethiopic.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/georgian.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/greek.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hangul.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja-jis.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hanja3.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/hebrew.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/indian.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ipa-praat.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/ipa.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/japanese.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/lao.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-alt.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-ltx.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-post.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/latin-pre.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/lrt.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/persian.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/py-punct.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/pypunct-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-cns.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/rfc1345.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/sgml-input.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/sisheng.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/slovak.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/symbol-ksc.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/thai.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tibetan.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tsang-b5.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/tsang-cns.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/uni-input.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/viqr.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/vntelex.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/vnvni.el.gz
+%{_datadir}/emacs/%{version}/lisp/leim/quail/welsh.el.gz
 %{_datadir}/emacs/%{version}/lisp/linum.el.gz
 %{_datadir}/emacs/%{version}/lisp/loadhist.el.gz
 %{_datadir}/emacs/%{version}/lisp/locate.el.gz
-%{_datadir}/emacs/%{version}/lisp/longlines.el.gz
 %{_datadir}/emacs/%{version}/lisp/lpr.el.gz
 %{_datadir}/emacs/%{version}/lisp/ls-lisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/macros.el.gz
@@ -3981,6 +3997,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-ldap.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-mab.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-ph.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/eww.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/gnutls.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/goto-addr.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/hmac-def.el.gz
@@ -4000,19 +4017,21 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/ntlm.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/quickurl.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/rcirc.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/rcompile.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/rlogin.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/sasl-cram.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/sasl-digest.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/sasl-ntlm.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/sasl.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/secrets.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/telnet.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tls.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/tramp-adb.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cache.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.el.gz
@@ -4025,7 +4044,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/tramp.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/trampver.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/webjump.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/xesam.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/zeroconf.el.gz
 %{_datadir}/emacs/%{version}/lisp/newcomment.el.gz
 %{_datadir}/emacs/%{version}/lisp/notifications.el.gz
@@ -4065,16 +4083,20 @@ fi
 %{_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/iswitchb.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/ledit.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/longlines.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/meese.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/options.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/otodo-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-select.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-def.el.gz
@@ -4083,14 +4105,19 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp.el.gz
 %{_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/vc-mcvs.el.gz
+%{_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-R.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.el.gz
@@ -4098,6 +4125,7 @@ fi
 %{_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-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
@@ -4116,6 +4144,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-makefile.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.el.gz
@@ -4141,10 +4170,8 @@ fi
 %{_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
-%{_datadir}/emacs/%{version}/lisp/org/org-ascii.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-attach.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-bbdb.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-beamer.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-bibtex.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-capture.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-clock.el.gz
@@ -4153,54 +4180,47 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-crypt.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-ctags.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-docbook.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.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-exp-blocks.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-exp.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
-%{_datadir}/emacs/%{version}/lisp/org/org-freemind.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-gnus.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-habit.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-html.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-icalendar.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-id.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-indent.el.gz
 %{_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-jsinfo.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-latex.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-list.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-lparse.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-mac-message.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-macro.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-macs.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-mew.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-mhe.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-mks.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-mobile.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-mouse.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-odt.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-plot.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-protocol.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-publish.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-remember.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-rmail.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-special-blocks.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-src.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-table.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-taskjuggler.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-timer.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-vm.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-w3m.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-wl.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-xoxo.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-ascii.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-beamer.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-html.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-icalendar.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-latex.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-man.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-md.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-odt.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-org.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-publish.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox-texinfo.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ox.el.gz
 %{_datadir}/emacs/%{version}/lisp/outline.el.gz
 %{_datadir}/emacs/%{version}/lisp/paren.el.gz
 %{_datadir}/emacs/%{version}/lisp/password-cache.el.gz
@@ -4209,6 +4229,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/pcmpl-linux.el.gz
 %{_datadir}/emacs/%{version}/lisp/pcmpl-rpm.el.gz
 %{_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/play/5x5.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/animate.el.gz
@@ -4227,7 +4248,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/hanoi.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/landmark.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/life.el.gz
-%{_datadir}/emacs/%{version}/lisp/play/meese.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/morse.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/mpuz.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/pong.el.gz
@@ -4236,7 +4256,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/spook.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/studly.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/tetris.el.gz
-%{_datadir}/emacs/%{version}/lisp/play/yow.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/zone.el.gz
 %{_datadir}/emacs/%{version}/lisp/printing.el.gz
 %{_datadir}/emacs/%{version}/lisp/proced.el.gz
@@ -4248,6 +4267,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/antlr-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/asm-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/autoconf.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/bat-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/bug-reference.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cap-words.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-align.el.gz
@@ -4271,7 +4291,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/cpp.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cwarn.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/dcl-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/delphi.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-abn.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-bnf.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-dtd.el.gz
@@ -4307,10 +4326,11 @@ fi
 %{_datadir}/emacs/%{version}/lisp/progmodes/meta-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/mixal-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/modula2.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/octave-inf.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/octave-mod.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/octave.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/opascal.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/pascal.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/perl-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/prog-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/prolog.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ps-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/python.el.gz
@@ -4380,7 +4400,6 @@ 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/sup-mouse.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
@@ -4398,7 +4417,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/term/w32console.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/wyse50.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/x-win.el.gz
-%{_datadir}/emacs/%{version}/lisp/terminal.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/artist.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/bib-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/bibtex-style.el.gz