From 95d0dbb2d2d797ba362bd392b86ce5602bcb10b500fc99e2e269369ac3073dc2 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 28 Jun 2012 09:17:09 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=81
---
 emacs-22.0.99-sendmail-path.patch             |  16 -
 emacs-23.1-bnc628268.patch                    |  58 --
 emacs-23.1-glibc.patch                        |  82 --
 emacs-23.1-ppc64.patch                        |  27 -
 emacs-23.2-linkscr.patch                      | 158 ----
 emacs-23.3-bnc740447.patch                    | 377 --------
 emacs-23.3-s390x.dif                          |  24 -
 emacs-23.3-tinfo.dif                          |  45 -
 emacs-23.3-xgselect.patch                     |  14 -
 emacs-23.3b.tar.bz2                           |   3 -
 emacs-24.1-bnc628268.patch                    |  29 +
 emacs-23.2-decl.dif => emacs-24.1-decl.dif    |   6 +-
 emacs-24.1-glibc.patch                        |  58 ++
 ...-nonvoid.patch => emacs-24.1-nonvoid.patch |   8 +-
 emacs-24.1-ppc64.patch                        |  36 +
 ....3-ps-bdf.patch => emacs-24.1-ps-bdf.patch |   8 +-
 ...-ps-mule.patch => emacs-24.1-ps-mule.patch |  14 +-
 emacs-24.1-s390x.dif                          |  12 +
 emacs-24.1-sendmail-path.patch                |  17 +
 emacs-24.1-tinfo.dif                          |  32 +
 emacs-24.1-xgselect.patch                     |  16 +
 emacs-23.3.dif => emacs-24.1.dif              | 732 ++++-----------
 emacs-24.1.tar.bz2                            |   3 +
 emacs-sparc.diff                              |  17 -
 emacs.changes                                 |  13 +
 emacs.spec                                    | 840 +++++++++++-------
 26 files changed, 920 insertions(+), 1725 deletions(-)
 delete mode 100644 emacs-22.0.99-sendmail-path.patch
 delete mode 100644 emacs-23.1-bnc628268.patch
 delete mode 100644 emacs-23.1-glibc.patch
 delete mode 100644 emacs-23.1-ppc64.patch
 delete mode 100644 emacs-23.2-linkscr.patch
 delete mode 100644 emacs-23.3-bnc740447.patch
 delete mode 100644 emacs-23.3-s390x.dif
 delete mode 100644 emacs-23.3-tinfo.dif
 delete mode 100644 emacs-23.3-xgselect.patch
 delete mode 100644 emacs-23.3b.tar.bz2
 create mode 100644 emacs-24.1-bnc628268.patch
 rename emacs-23.2-decl.dif => emacs-24.1-decl.dif (66%)
 create mode 100644 emacs-24.1-glibc.patch
 rename emacs-22.0.99-nonvoid.patch => emacs-24.1-nonvoid.patch (55%)
 create mode 100644 emacs-24.1-ppc64.patch
 rename emacs-23.3-ps-bdf.patch => emacs-24.1-ps-bdf.patch (88%)
 rename emacs-23.1-ps-mule.patch => emacs-24.1-ps-mule.patch (70%)
 create mode 100644 emacs-24.1-s390x.dif
 create mode 100644 emacs-24.1-sendmail-path.patch
 create mode 100644 emacs-24.1-tinfo.dif
 create mode 100644 emacs-24.1-xgselect.patch
 rename emacs-23.3.dif => emacs-24.1.dif (62%)
 create mode 100644 emacs-24.1.tar.bz2
 delete mode 100644 emacs-sparc.diff

diff --git a/emacs-22.0.99-sendmail-path.patch b/emacs-22.0.99-sendmail-path.patch
deleted file mode 100644
index 63090a7..0000000
--- a/emacs-22.0.99-sendmail-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lisp/mail/sendmail.el
-+++ lisp/mail/sendmail.el	2007-05-15 18:28:59.121703192 +0200
-@@ -48,12 +48,7 @@
-   :group 'sendmail
-   :version "22.1")
- 
--(defcustom sendmail-program
--  (cond
--    ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
--    ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
--    ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
--    (t "fakemail"))			;In ../etc, to interface to /bin/mail.
-+(defcustom sendmail-program "/usr/sbin/sendmail"
-   "Program used to send messages."
-   :group 'mail
-   :type 'file)
diff --git a/emacs-23.1-bnc628268.patch b/emacs-23.1-bnc628268.patch
deleted file mode 100644
index a383e83..0000000
--- a/emacs-23.1-bnc628268.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- lisp/loaddefs.el
-+++ lisp/loaddefs.el	2010-08-12 15:38:16.235126810 +0000
-@@ -25974,7 +25974,7 @@ as its \"correct\" spelling; then the qu
- 
- \(fn)" t nil)
- 
--(make-obsolete 'spell-buffer 'ispell-buffer "23.1")
-+(define-obsolete-function-alias 'spell-buffer 'ispell-buffer "23.1")
- 
- (autoload 'spell-word "spell" "\
- Check spelling of word at or before point.
-@@ -25983,7 +25983,7 @@ and `query-replace' the entire buffer to
- 
- \(fn)" t nil)
- 
--(make-obsolete 'spell-word 'ispell-word "23.1")
-+(define-obsolete-function-alias 'spell-word 'ispell-word "23.1")
- 
- (autoload 'spell-region "spell" "\
- Like `spell-buffer' but applies only to region.
-@@ -25993,7 +25993,7 @@ for example, \"word\".
- 
- \(fn START END &optional DESCRIPTION)" t nil)
- 
--(make-obsolete 'spell-region 'ispell-region "23.1")
-+(define-obsolete-function-alias 'spell-region 'ispell-region "23.1")
- 
- (autoload 'spell-string "spell" "\
- Check spelling of string supplied as argument.
---- lisp/textmodes/spell.el
-+++ lisp/textmodes/spell.el	2010-08-12 15:36:22.119126692 +0000
-@@ -63,7 +63,7 @@ as its \"correct\" spelling; then the qu
-   (with-no-warnings
-     (spell-region (point-min) (point-max) "buffer")))
- ;;;###autoload
--(make-obsolete 'spell-buffer 'ispell-buffer "23.1")
-+(define-obsolete-function-alias 'spell-buffer 'ispell-buffer "23.1")
- 
- ;;;###autoload
- (defun spell-word ()
-@@ -82,7 +82,7 @@ and `query-replace' the entire buffer to
-     (with-no-warnings
-       (spell-region beg end (buffer-substring beg end)))))
- ;;;###autoload
--(make-obsolete 'spell-word 'ispell-word "23.1")
-+(define-obsolete-function-alias 'spell-word 'ispell-word "23.1")
- 
- ;;;###autoload
- (defun spell-region (start end &optional description)
-@@ -145,7 +145,7 @@ for example, \"word\"."
- 	     (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b")
- 				   newword)))))))
- ;;;###autoload
--(make-obsolete 'spell-region 'ispell-region "23.1")
-+(define-obsolete-function-alias 'spell-region 'ispell-region "23.1")
- 
- ;;;###autoload
- (defun spell-string (string)
diff --git a/emacs-23.1-glibc.patch b/emacs-23.1-glibc.patch
deleted file mode 100644
index 9dd708d..0000000
--- a/emacs-23.1-glibc.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2009-08-10 18:11:16.653901806 +0200
-@@ -232,6 +232,8 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
-    the information in ../src/config.h.  */
- ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-+ETAGS_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-+   -I. -I${srcdir} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
- LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
- CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-@@ -380,21 +382,31 @@ getopt.h: getopt_.h
- 	cp $(srcdir)/getopt_.h $@-t
- 	mv $@-t $@
- 
-+#ifdef GETOPT_IN_LIBC
-+GETOPTOBJS =
-+GETOPTDEPS =
-+#else
- GETOPTOBJS = @GETOPTOBJS@
- GETOPTDEPS = $(GETOPTOBJS) $(GETOPT_H)
- getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
- 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
- getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
- 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
-+#endif
- 
-+#ifdef REGEXP_IN_LIBC
-+REGEXPOBJ =
-+REGEXPDEPS =
-+#else
- REGEXPOBJ = regex.o
- REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
-+#endif
- 
- regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
- 	${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
- 
- etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
--	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
-+	$(CC) ${ETAGS_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
- 
- ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
- 	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
-@@ -402,7 +414,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
- /* We depend on etags to assure that parallel makes don\'t write two
-    etags.o files on top of each other.  */
- ctags${EXEEXT}: etags${EXEEXT}
--	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
-+	$(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
- 
- profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
---- lib-src/etags.c
-+++ lib-src/etags.c	2001-10-24 18:13:46.000000000 +0200
-@@ -93,7 +93,7 @@ char pot_etags_version[] = "@(#) pot rev
- #endif
- 
- #ifdef HAVE_CONFIG_H
--# include <config.h>
-+# include <../src/config.h>
-   /* On some systems, Emacs defines static as nothing for the sake
-      of unexec.  We don't want that here since we don't use unexec. */
- # undef static
---- src/s/gnu-linux.h
-+++ src/s/gnu-linux.h	2009-08-10 18:12:23.537901415 +0200
-@@ -275,5 +275,15 @@ along with GNU Emacs.  If not, see <http
- #endif
- #endif
- 
-+/* we also have getopt and regex in the GNU C-library. */
-+#define REGEXP_IN_LIBC
-+#define GETOPT_IN_LIBC
-+
-+/* Use system malloc from glibc and memory mappging */
-+#if !defined(__ia64__)
-+# define SYSTEM_MALLOC
-+# define USE_MMAP_FOR_BUFFERS
-+#endif
-+
- /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
-    (do not change this comment) */
diff --git a/emacs-23.1-ppc64.patch b/emacs-23.1-ppc64.patch
deleted file mode 100644
index c94d0bf..0000000
--- a/emacs-23.1-ppc64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.in
-+++ configure.in	2007-05-15 18:09:41.000000000 +0200
-@@ -426,7 +426,8 @@ dnl see the `changequote' comment above.
-   ;;
- 
-   ## Macintosh PowerPC
--  powerpc*-*-linux-gnu* )
-+  ppc*-*-linux* | \
-+  powerpc*-*-linux* )
-     machine=macppc opsys=gnu-linux
-   ;;
- 
---- src/m/macppc.h
-+++ src/m/macppc.h	2009-08-11 14:38:16.442402126 +0200
-@@ -42,6 +42,12 @@ along with GNU Emacs.  If not, see <http
- /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
-    For MkLinux/LinuxPPC.  */
- 
-+#ifdef __powerpc64__
-+#ifndef _ARCH_PPC64
-+#define _ARCH_PPC64
-+#endif
-+#endif
-+
- #ifdef GNU_LINUX
- #define LINKER $(CC) -nostdlib
- /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
diff --git a/emacs-23.2-linkscr.patch b/emacs-23.2-linkscr.patch
deleted file mode 100644
index a167794..0000000
--- a/emacs-23.2-linkscr.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- src/Makefile.in
-+++ src/Makefile.in	2010-10-18 14:26:59.211926181 +0000
-@@ -960,6 +960,13 @@ ${libsrc}make-docfile${EXEEXT}:
- buildobj.h: Makefile
- 	echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
- 
-+/* On the alpha the elf dumper is kind of broken... */
-+#if defined(__linux__) && defined(__alpha__)
-+LINK_SCRIPT = -Wl,-T,${srcdir}/elf64alpha.x
-+#else
-+LINK_SCRIPT =
-+#endif /* alpha linux */
-+
- temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
- #ifdef NS_IMPL_GNUSTEP
- 	$(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-@@ -969,7 +976,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILE
- #else
- 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
--    ${LIBES}
-+    ${LIBES} $(LINK_SCRIPT)
- #endif
- 
- /* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
---- src/elf64alpha.x
-+++ src/elf64alpha.x	2001-10-24 15:03:54.000000000 +0000
-@@ -0,0 +1,130 @@
-+OUTPUT_FORMAT("elf64-alpha", "elf64-alpha", "elf64-alpha")
-+OUTPUT_ARCH(alpha)
-+ENTRY(__start)
-+SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib);
-+SEARCH_DIR(/usr/alphaev5-unknown-linux-gnu/lib);
-+
-+SECTIONS
-+{
-+  /* Read-only sections, merged into text segment: */
-+  . = 0x120000000 + SIZEOF_HEADERS;
-+  .interp     : { *(.interp) 	}
-+  .hash          : { *(.hash)		}
-+  .dynsym        : { *(.dynsym)		}
-+  .dynstr        : { *(.dynstr)		}
-+  .gnu.version   : { *(.gnu.version)	}
-+  .gnu.version_d   : { *(.gnu.version_d)	}
-+  .gnu.version_r   : { *(.gnu.version_r)	}
-+  .rel.text      :
-+    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-+  .rela.text     :
-+    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-+  .rel.data      :
-+    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-+  .rela.data     :
-+    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-+  .rel.rodata    :
-+    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-+  .rela.rodata   :
-+    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-+  .rel.got       : { *(.rel.got)		}
-+  .rela.got      : { *(.rela.got)		}
-+  .rel.ctors     : { *(.rel.ctors)	}
-+  .rela.ctors    : { *(.rela.ctors)	}
-+  .rel.dtors     : { *(.rel.dtors)	}
-+  .rela.dtors    : { *(.rela.dtors)	}
-+  .rel.init      : { *(.rel.init)	}
-+  .rela.init     : { *(.rela.init)	}
-+  .rel.fini      : { *(.rel.fini)	}
-+  .rela.fini     : { *(.rela.fini)	}
-+  .rel.bss       : { *(.rel.bss)		}
-+  .rela.bss      : { *(.rela.bss)		}
-+  .rel.plt       : { *(.rel.plt)		}
-+  .rela.plt      : { *(.rela.plt)		}
-+  .init          : { *(.init)	} =0x47ff041f
-+  .text      :
-+  {
-+    *(.text)
-+    *(.stub)
-+    /* .gnu.warning sections are handled specially by elf32.em.  */
-+    *(.gnu.warning)
-+    *(.gnu.linkonce.t*)
-+  } =0x47ff041f
-+  _etext = .;
-+  PROVIDE (etext = .);
-+  .fini      : { *(.fini)    } =0x47ff041f
-+  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-+  .rodata1   : { *(.rodata1) }
-+  .reginfo : { *(.reginfo) }
-+  /* Adjust the address for the data segment.  We want to adjust up to
-+     the same address within the page on the next page up.  */
-+  . = ALIGN(0x100000) + (. & (0x100000 - 1));
-+  .ctors         :
-+  {
-+    *(.ctors)
-+  }
-+  .dtors         :
-+  {
-+    *(.dtors)
-+  }
-+  .plt      : { *(.plt)	}
-+  .got           : { *(.got.plt) *(.got) }
-+  .dynamic       : { *(.dynamic) }
-+  .data    :
-+  {
-+    *(.data)
-+    *(.sdata)
-+    *(.gnu.linkonce.d*)
-+    CONSTRUCTORS
-+  }
-+  /* We want the small data sections together, so single-instruction offsets
-+     can access them all, and initialized data all before uninitialized, so
-+     we can shorten the on-disk segment size.  */
-+  _edata  =  .;
-+  PROVIDE (edata = .);
-+  __bss_start = .;
-+  .bss       :
-+  {
-+   *(.sbss) *(.scommon)
-+   *(.dynbss)
-+   *(.bss)
-+   *(COMMON)
-+  }
-+  . = ALIGN(64 / 8);
-+  _end = . ;
-+  PROVIDE (end = .);
-+  /* Stabs debugging sections.  */
-+  .stab 0 : { *(.stab) }
-+  .stabstr 0 : { *(.stabstr) }
-+  .stab.excl 0 : { *(.stab.excl) }
-+  .stab.exclstr 0 : { *(.stab.exclstr) }
-+  .stab.index 0 : { *(.stab.index) }
-+  .stab.indexstr 0 : { *(.stab.indexstr) }
-+  .comment 0 : { *(.comment) }
-+  /* DWARF debug sections.
-+     Symbols in the DWARF debugging sections are relative to the beginning
-+     of the section so we begin them at 0.  */
-+  /* DWARF 1 */
-+  .debug          0 : { *(.debug) }
-+  .line           0 : { *(.line) }
-+  /* GNU DWARF 1 extensions */
-+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-+  .debug_sfnames  0 : { *(.debug_sfnames) }
-+  /* DWARF 1.1 and DWARF 2 */
-+  .debug_aranges  0 : { *(.debug_aranges) }
-+  .debug_pubnames 0 : { *(.debug_pubnames) }
-+  /* DWARF 2 */
-+  .debug_info     0 : { *(.debug_info) }
-+  .debug_abbrev   0 : { *(.debug_abbrev) }
-+  .debug_line     0 : { *(.debug_line) }
-+  .debug_frame    0 : { *(.debug_frame) }
-+  .debug_str      0 : { *(.debug_str) }
-+  .debug_loc      0 : { *(.debug_loc) }
-+  .debug_macinfo  0 : { *(.debug_macinfo) }
-+  /* SGI/MIPS DWARF 2 extensions */
-+  .debug_weaknames 0 : { *(.debug_weaknames) }
-+  .debug_funcnames 0 : { *(.debug_funcnames) }
-+  .debug_typenames 0 : { *(.debug_typenames) }
-+  .debug_varnames  0 : { *(.debug_varnames) }
-+  /* These must appear regardless of  .  */
-+}
diff --git a/emacs-23.3-bnc740447.patch b/emacs-23.3-bnc740447.patch
deleted file mode 100644
index 5f9d32c..0000000
--- a/emacs-23.3-bnc740447.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-BNC#740447 - VUL-0: CEDET/Emacs global-ede-mode file loading vulnerability
---- lisp/cedet/ede/auto.el
-+++ lisp/cedet/ede/auto.el	2012-01-10 11:31:40.027645193 +0000
-@@ -58,6 +58,13 @@ associated with a single object class, b
- 	  :initform t
- 	  :documentation
- 	  "Non-nil if this is an option when a user creates a project.")
-+   (safe-p :initarg :safe-p
-+	   :initform t
-+	   :documentation
-+	   "Non-nil if the project load files are \"safe\".
-+An unsafe project is one that loads project variables via Emacs
-+Lisp code.  A safe project is one that loads project variables by
-+scanning files without loading Lisp code from them.")
-    )
-   "Class representing minimal knowledge set to run preliminary EDE functions.
- When more advanced functionality is needed from a project type, that projects
-@@ -69,13 +76,15 @@ type is required and the load function u
- 			 :name "Make" :file 'ede/proj
- 			 :proj-file "Project.ede"
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "edeproject-automake"
- 			 :name "Automake" :file 'ede/proj
- 			 :proj-file "Project.ede"
- 			 :initializers '(:makefile-type Makefile.am)
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "automake"
- 			 :name "automake" :file 'ede/project-am
- 			 :proj-file "Makefile.am"
-@@ -84,6 +93,8 @@ type is required and the load function u
- 			 :new-p nil))
-   "List of vectors defining how to determine what type of projects exist.")
- 
-+(put 'ede-project-class-files 'risky-local-variable t)
-+
- ;;; EDE project-autoload methods
- ;;
- (defmethod ede-project-root ((this ede-project-autoload))
-@@ -122,6 +133,19 @@ Return nil if the project file does not
-     (when (and f (file-exists-p f))
-       f)))
- 
-+(defmethod ede-auto-load-project ((this ede-project-autoload) dir)
-+  "Load in the project associated with THIS project autoload description.
-+THIS project description should be valid for DIR, where the project will
-+be loaded."
-+  ;; Last line of defense: don't load unsafe projects.
-+  (when (not (or (oref this :safe-p)
-+		 (ede-directory-safe-p dir)))
-+    (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
-+  ;; Things are good - so load the project.
-+  (let ((o (funcall (oref this load-type) dir)))
-+    (when (not o)
-+      (error "Project type error: :load-type failed to create a project"))
-+    (ede-add-project-to-global-list o)))
- 
- (provide 'ede/auto)
- 
---- lisp/cedet/ede/simple.el
-+++ lisp/cedet/ede/simple.el	2012-01-10 11:28:14.131146968 +0000
-@@ -50,7 +50,8 @@
- 	      :name "Simple" :file 'ede/simple
- 	      :proj-file 'ede-simple-projectfile-for-dir
- 	      :load-type 'ede-simple-load
--	      :class-sym 'ede-simple-project)
-+	      :class-sym 'ede-simple-project
-+	      :safe-p nil)
- 	     t)
- 
- (defcustom ede-simple-save-directory "~/.ede"
---- lisp/cedet/ede.el
-+++ lisp/cedet/ede.el	2012-01-10 11:28:24.623644845 +0000
-@@ -94,6 +94,42 @@ target willing to take the file.  'never
-   :group 'ede
-   :type 'sexp) ; make this be a list of options some day
- 
-+(defcustom ede-project-directories nil
-+  "Directories in which EDE may search for project files.
-+If the value is t, EDE may search in any directory.
-+
-+If the value is a function, EDE calls that function with one
-+argument, the directory name; the function should return t iff
-+EDE should look for project files in the directory.
-+
-+Otherwise, the value should be a list of fully-expanded directory
-+names.  EDE searches for project files only in those directories.
-+If you invoke the commands \\[ede] or \\[ede-new] on a directory
-+that is not listed, Emacs will offer to add it to the list.
-+
-+Any other value disables searching for EDE project files."
-+  :group 'ede
-+  :type '(choice (const :tag "Any directory" t)
-+		 (repeat :tag "List of directories"
-+			 (directory))
-+		 (function :tag "Predicate"))
-+  :version "23.3"
-+  :risky t)
-+
-+(defun ede-directory-safe-p (dir)
-+  "Return non-nil if DIR is a safe directory to load projects from.
-+Projects that do not load a project definition as Emacs Lisp code
-+are safe, and can be loaded automatically.  Other project types,
-+such as those created with Project.ede files, are safe only if
-+specified by `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir)))
-+  ;; Load only if allowed by `ede-project-directories'.
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      (and (listp ede-project-directories)
-+	   (member dir ede-project-directories))))
-+
- 
- ;;; Management variables
- 
-@@ -419,24 +455,42 @@ provided `global-ede-mode' is enabled."
- Sets buffer local variables for EDE."
-   (let* ((ROOT nil)
- 	 (proj (ede-directory-get-open-project default-directory
--					       'ROOT)))
-+					       'ROOT))
-+	 (projauto nil))
-+
-     (when (or proj ROOT
--	      (ede-directory-project-p default-directory t))
-+	      ;; If there is no open project, look up the project
-+	      ;; autoloader to see if we should initialize.
-+	      (setq projauto (ede-directory-project-p default-directory t)))
-+
-+      (when (and (not proj) projauto)
-+
-+	;; No project was loaded, but we have a project description
-+	;; object.  This means that we can check if it is a safe
-+	;; project to load before requesting it to be loaded.
-+
-+	(when (or (oref projauto safe-p)
-+		  ;; The project style is not safe, so check if it is
-+		  ;; in `ede-project-directories'.
-+		  (let ((top (ede-toplevel-project default-directory)))
-+		    (ede-directory-safe-p top)))
- 
--      (when (not proj)
--	;; @todo - this could be wasteful.
--	(setq proj (ede-load-project-file default-directory 'ROOT)))
-+	  ;; The project is safe, so load it in.
-+	  (setq proj (ede-load-project-file default-directory 'ROOT))))
- 
--      (setq ede-object (ede-buffer-object (current-buffer)
-+      ;; Only initialize EDE state in this buffer if we found a project.
-+      (when proj
-+
-+	(setq ede-object (ede-buffer-object (current-buffer)
- 					  'ede-object-project))
- 
--      (setq ede-object-root-project
--	    (or ROOT (ede-project-root ede-object-project)))
-+	(setq ede-object-root-project
-+	      (or ROOT (ede-project-root ede-object-project)))
- 
--      (if (and (not ede-object) ede-object-project)
--	  (ede-auto-add-to-target))
-+	(if (and (not ede-object) ede-object-project)
-+	    (ede-auto-add-to-target))
- 
--      (ede-apply-target-options))))
-+	(ede-apply-target-options)))))
- 
- (defun ede-reset-all-buffers (onoff)
-   "Reset all the buffers due to change in EDE.
-@@ -555,13 +609,73 @@ of objects with the `ede-want-file-p' me
- 
- ;;; Interactive method invocations
- ;;
--(defun ede (file)
--  "Start up EDE on something.
--Argument FILE is the file or directory to load a project from."
--  (interactive "fProject File: ")
--  (if (not (file-exists-p file))
--      (ede-new file)
--    (ede-load-project-file (file-name-directory file))))
-+(defun ede (dir)
-+  "Start up EDE for directory DIR.
-+If DIR has an existing project file, load it.
-+Otherwise, create a new project for DIR."
-+  (interactive
-+   ;; When choosing a directory to turn on, and we see some directory here,
-+   ;; provide that as the default.
-+   (let* ((top (ede-toplevel-project default-directory))
-+	  (promptdflt (or top default-directory)))
-+     (list (read-directory-name "Project directory: "
-+				promptdflt promptdflt t))))
-+  (unless (file-directory-p dir)
-+    (error "%s is not a directory" dir))
-+  (when (ede-directory-get-open-project dir)
-+    (error "%s already has an open project associated with it" dir))
-+
-+  ;; Check if the directory has been added to the list of safe
-+  ;; directories.  It can also add the directory to the safe list if
-+  ;; the user chooses.
-+  (if (ede-check-project-directory dir)
-+      (progn
-+	;; If there is a project in DIR, load it, otherwise do
-+	;; nothing.
-+	(ede-load-project-file dir)
-+
-+	;; Check if we loaded anything on the previous line.
-+	(if (ede-current-project dir)
-+
-+	    ;; We successfully opened an existing project.  Some open
-+	    ;; buffers may also be referring to this project.
-+	    ;; Resetting all the buffers will get them to also point
-+	    ;; at this new open project.
-+	    (ede-reset-all-buffers 1)
-+
-+	  ;; ELSE
-+	  ;; There was no project, so switch to `ede-new' which is how
-+	  ;; a user can select a new kind of project to create.
-+	  (let ((default-directory (expand-file-name dir)))
-+	    (call-interactively 'ede-new))))
-+
-+    ;; If the proposed directory isn't safe, then say so.
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   dir)))
-+
-+(defun ede-check-project-directory (dir)
-+  "Check if DIR should be in `ede-project-directories'.
-+If it is not, try asking the user if it should be added; if so,
-+add it and save `ede-project-directories' via Customize.
-+Return nil iff DIR should not be in `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing /
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      ;; If `ede-project-directories' is a list, maybe add it.
-+      (when (listp ede-project-directories)
-+	(or (member dir ede-project-directories)
-+	    (when (y-or-n-p (format "`%s' is not listed in `ede-project-directories'.
-+Add it to the list of allowed project directories? "
-+				    dir))
-+	      (push dir ede-project-directories)
-+	      ;; If possible, save `ede-project-directories'.
-+	      (if (or custom-file user-init-file)
-+		  (let ((coding-system-for-read nil))
-+		    (customize-save-variable
-+		     'ede-project-directories
-+		     ede-project-directories)))
-+	      t)))))
- 
- (defun ede-new (type &optional name)
-   "Create a new project starting of project type TYPE.
-@@ -596,6 +710,11 @@ Optional argument NAME is the name to gi
-     (error "Cannot create project in non-existent directory %s" default-directory))
-   (when (not (file-writable-p default-directory))
-     (error "No write permissions for %s" default-directory))
-+  (unless (ede-check-project-directory default-directory)
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   default-directory))
-+  ;; Make sure the project directory is loadable in the future.
-+  (ede-check-project-directory default-directory)
-   ;; Create the project
-   (let* ((obj (object-assoc type 'name ede-project-class-files))
- 	 (nobj (let ((f (oref obj file))
-@@ -629,6 +748,10 @@ Optional argument NAME is the name to gi
- 	(ede-add-subproject pp nobj)
- 	(ede-commit-project pp)))
-     (ede-commit-project nobj))
-+  ;; Once the project is created, load it again.  This used to happen
-+  ;; lazily, but with project loading occurring less often and with
-+  ;; security in mind, this is now the safe time to reload.
-+  (ede-load-project-file default-directory)
-   ;; Have the menu appear
-   (setq ede-minor-mode t)
-   ;; Allert the user
-@@ -651,11 +774,16 @@ ARGS are additional arguments to pass to
- (defun ede-rescan-toplevel ()
-   "Rescan all project files."
-   (interactive)
--  (let ((toppath (ede-toplevel-project default-directory))
--	(ede-deep-rescan t))
--    (project-rescan (ede-load-project-file toppath))
--    (ede-reset-all-buffers 1)
--    ))
-+  (if (not (ede-directory-get-open-project default-directory))
-+      ;; This directory isn't open.  Can't rescan.
-+      (error "Attempt to rescan a project that isn't open")
-+
-+    ;; Continue
-+    (let ((toppath (ede-toplevel-project default-directory))
-+	  (ede-deep-rescan t))
-+
-+      (project-rescan (ede-load-project-file toppath))
-+      (ede-reset-all-buffers 1))))
- 
- (defun ede-new-target (&rest args)
-   "Create a new target specific to this type of project file.
-@@ -891,7 +1019,7 @@ Optional ROOTRETURN will return the root
-   ;; Do the load
-   ;;(message "EDE LOAD : %S" file)
-   (let* ((file dir)
--	 (path (expand-file-name (file-name-directory file)))
-+	 (path (file-name-as-directory (expand-file-name dir)))
- 	 (pfc (ede-directory-project-p path))
- 	 (toppath nil)
- 	 (o nil))
-@@ -920,13 +1048,11 @@ Optional ROOTRETURN will return the root
-       ;; See if it's been loaded before
-       (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
- 			    ede-projects))
--      (if (not o)
--	  ;; If not, get it now.
--	  (let ((ede-constructing pfc))
--	    (setq o (funcall (oref pfc load-type) toppath))
--	    (when (not o)
--	      (error "Project type error: :load-type failed to create a project"))
--	    (ede-add-project-to-global-list o)))
-+
-+      ;; If not open yet, load it.
-+      (unless o
-+	(let ((ede-constructing pfc))
-+	  (setq o (ede-auto-load-project pfc toppath))))
- 
-       ;; Return the found root project.
-       (when rootreturn (set rootreturn o))
-@@ -980,13 +1106,7 @@ Optional argument OBJ is an object to fi
- 	     (and root
- 		  (ede-find-subproject-for-directory root updir))
- 	     ;; Try the all structure based search.
--	     (ede-directory-get-open-project updir)
--	     ;; Load up the project file as a last resort.
--	     ;; Last resort since it uses file-truename, and other
--	     ;; slow features.
--	     (and (ede-directory-project-p updir)
--		  (ede-load-project-file
--		   (file-name-as-directory updir))))))))))
-+	     (ede-directory-get-open-project updir))))))))
- 
- (defun ede-current-project (&optional dir)
-   "Return the current project file.
-@@ -1000,11 +1120,7 @@ If optional DIR is provided, get the pro
-     ;; No current project.
-     (when (not ans)
-       (let* ((ldir (or dir default-directory)))
--	(setq ans (ede-directory-get-open-project ldir))
--	(or ans
--	    ;; No open project, if this dir pass project-p, then load.
--	    (when (ede-directory-project-p ldir)
--	      (setq ans (ede-load-project-file ldir))))))
-+	(setq ans (ede-directory-get-open-project ldir))))
-     ;; Return what we found.
-     ans))
- 
-@@ -1059,12 +1175,13 @@ If TARGET belongs to a subproject, retur
-   "Return the project which is the parent of TARGET.
- It is recommended you track the project a different way as this function
- could become slow in time."
--  ;; @todo - use ede-object-project as a starting point.
--  (let ((ans nil) (projs ede-projects))
--    (while (and (not ans) projs)
--      (setq ans (ede-target-in-project-p (car projs) target)
--	    projs (cdr projs)))
--    ans))
-+  (or ede-object-project
-+      ;; If not cached, derive it from the current directory of the target.
-+      (let ((ans nil) (projs ede-projects))
-+	(while (and (not ans) projs)
-+	  (setq ans (ede-target-in-project-p (car projs) target)
-+		projs (cdr projs)))
-+	ans)))
- 
- (defmethod ede-find-target ((proj ede-project) buffer)
-   "Fetch the target in PROJ belonging to BUFFER or nil."
diff --git a/emacs-23.3-s390x.dif b/emacs-23.3-s390x.dif
deleted file mode 100644
index f45a3c8..0000000
--- a/emacs-23.3-s390x.dif
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/m/ibms390x.h
-+++ src/m/ibms390x.h	2011-07-11 11:51:06.080426771 +0000
-@@ -78,7 +78,9 @@ NOTE-END */
-    working alloca function and it should be used.  Undefine it if an
-    assembler-language alloca in the file alloca.s should be used. */
- 
-+#ifndef HAVE_ALLOCA
- #define HAVE_ALLOCA
-+#endif
- 
- /* On the 64 bit architecture, we can use 60 bits for addresses */
- 
-@@ -88,7 +90,10 @@ NOTE-END */
- 
- /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
- 
--#define XPNTR(a) XUINT (a)
-+#undef DATA_SEG_BITS
-+#ifdef USE_LISP_UNION_TYPE
-+#undef USE_LISP_UNION_TYPE
-+#endif
- 
- #undef START_FILES
- #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
diff --git a/emacs-23.3-tinfo.dif b/emacs-23.3-tinfo.dif
deleted file mode 100644
index 6fec8ed..0000000
--- a/emacs-23.3-tinfo.dif
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.in
-+++ configure.in	2011-11-22 14:37:39.195146873 +0000
-@@ -2376,11 +2376,13 @@ AC_CHECK_FUNCS(getpt)
- # That is because we have not set up to link ncurses in lib-src.
- # It's better to believe a function is not available
- # than to expect to find it in ncurses.
--AC_CHECK_LIB(ncurses, tparm)
-+for lib in tinfo ncurses ; do
-+  AC_CHECK_LIB($lib, tparm)
-+done
- 
- case "$opsys" in
-   netbsd)
--    AC_SEARCH_LIBS(tputs, [ncurses terminfo termcap])
-+    AC_SEARCH_LIBS(tputs, [tinfo ncurses ncursesw terminfo termcap])
-     if test $ac_cv_search_tputs = -lterminfo; then
-       AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
-     fi
---- src/config.in
-+++ src/config.in	2011-11-22 14:34:49.199647061 +0000
-@@ -388,6 +388,9 @@ along with GNU Emacs.  If not, see <http
- /* Define to 1 if you have the `ncurses' library (-lncurses). */
- #undef HAVE_LIBNCURSES
- 
-+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
-+#undef HAVE_LIBTINFO
-+
- /* Define to 1 if using libotf. */
- #undef HAVE_LIBOTF
- 
---- src/s/gnu-linux.h
-+++ src/s/gnu-linux.h	2011-11-22 14:36:11.327146051 +0000
-@@ -230,8 +230,12 @@ along with GNU Emacs.  If not, see <http
- 
- #ifdef HAVE_LIBNCURSES
- #define TERMINFO
-+#ifdef HAVE_LIBTINFO
-+#define LIBS_TERMCAP -ltinfo
-+#else
- #define LIBS_TERMCAP -lncurses
- #endif
-+#endif
- 
- #define UNEXEC unexelf.o
- 
diff --git a/emacs-23.3-xgselect.patch b/emacs-23.3-xgselect.patch
deleted file mode 100644
index 7c7965f..0000000
--- a/emacs-23.3-xgselect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xgselect.c
-+++ src/xgselect.c	2012-05-24 11:07:45.793270370 +0000
-@@ -60,6 +60,11 @@ xg_select (max_fds, rfds, wfds, efds, ti
-         xfree (gfds);
-         gfds = xmalloc (sizeof (*gfds) * gfds_size);
-       }
-+    else if (!gfds)
-+      {
-+        gfds_size = 1;
-+        gfds = xmalloc (sizeof (*gfds));
-+      }
- 
-     n_gfds = g_main_context_query (context,
-                                    G_PRIORITY_LOW,
diff --git a/emacs-23.3b.tar.bz2 b/emacs-23.3b.tar.bz2
deleted file mode 100644
index d5c9fac..0000000
--- a/emacs-23.3b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86dcab9a3046ecb2bd1ebdb1f15157cc60e4ded6ef0d7950bbbfc027d7c2e6ee
-size 38684207
diff --git a/emacs-24.1-bnc628268.patch b/emacs-24.1-bnc628268.patch
new file mode 100644
index 0000000..ca18b54
--- /dev/null
+++ b/emacs-24.1-bnc628268.patch
@@ -0,0 +1,29 @@
+--- lisp/obsolete/spell.el
++++ lisp/obsolete/spell.el	2012-06-27 11:54:27.600009491 +0000
+@@ -64,7 +64,7 @@ as its \"correct\" spelling; then the qu
+   (with-no-warnings
+     (spell-region (point-min) (point-max) "buffer")))
+ ;;;###autoload
+-(make-obsolete 'spell-buffer 'ispell-buffer "23.1")
++(define-obsolete-function-alias 'spell-buffer 'ispell-buffer "23.1")
+ 
+ ;;;###autoload
+ (defun spell-word ()
+@@ -83,7 +83,7 @@ and `query-replace' the entire buffer to
+     (with-no-warnings
+       (spell-region beg end (buffer-substring beg end)))))
+ ;;;###autoload
+-(make-obsolete 'spell-word 'ispell-word "23.1")
++(define-obsolete-function-alias 'spell-word 'ispell-word "23.1")
+ 
+ ;;;###autoload
+ (defun spell-region (start end &optional description)
+@@ -141,7 +141,7 @@ for example, \"word\"."
+ 	     (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b")
+ 				   newword)))))))
+ ;;;###autoload
+-(make-obsolete 'spell-region 'ispell-region "23.1")
++(define-obsolete-function-alias 'spell-region 'ispell-region "23.1")
+ 
+ ;;;###autoload
+ (defun spell-string (string)
diff --git a/emacs-23.2-decl.dif b/emacs-24.1-decl.dif
similarity index 66%
rename from emacs-23.2-decl.dif
rename to emacs-24.1-decl.dif
index afcf59e..059d7de 100644
--- a/emacs-23.2-decl.dif
+++ b/emacs-24.1-decl.dif
@@ -1,5 +1,5 @@
 --- src/frame.c
-+++ src/frame.c	2010-10-18 13:34:00.000427490 +0000
++++ src/frame.c	2012-06-26 16:09:59.692010311 +0000
 @@ -21,6 +21,9 @@ along with GNU Emacs.  If not, see <http
  
  #include <stdio.h>
@@ -7,6 +7,6 @@
 +#ifdef STDC_HEADERS
 +#include <stdlib.h>
 +#endif
+ #include <errno.h>
+ #include <limits.h>
  #include <setjmp.h>
- #include "lisp.h"
- #include "character.h"
diff --git a/emacs-24.1-glibc.patch b/emacs-24.1-glibc.patch
new file mode 100644
index 0000000..8e5418a
--- /dev/null
+++ b/emacs-24.1-glibc.patch
@@ -0,0 +1,58 @@
+--- lib-src/Makefile.in
++++ lib-src/Makefile.in	2012-06-14 11:41:22.208010103 +0000
+@@ -307,14 +307,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
+ ../lib/libgnu.a: ../src/config.h
+ 	cd ../lib && $(MAKE) libgnu.a
+ 
++REGEXPOBJ =
++#REGEXPOBJ = regex.o
+ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
+ 	${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
+ 	  ${srcdir}/../src/regex.c
+ 
+-etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
++etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) ../src/config.h
+ 	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
+ 	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
+-	  regex.o $(LOADLIBES) -o etags
++	  $(REGEXPOBJ) $(LOADLIBES) -o etags
+ 
+ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h
+ 	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
+@@ -325,7 +330,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
+ 
+ profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
+ 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+--- lib-src/etags.c
++++ lib-src/etags.c	2012-06-26 16:03:43.356510061 +0000
+@@ -92,7 +92,7 @@ char pot_etags_version[] = "@(#) pot rev
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
+-# include <config.h>
++# include <../src/config.h>
+   /* This is probably not necessary any more.  On some systems, config.h
+      used to define static as nothing for the sake of unexec.  We don't
+      want that here since we don't use unexec.  None of these systems
+--- src/s/gnu-linux.h
++++ src/s/gnu-linux.h	2012-06-26 16:05:56.116010465 +0000
+@@ -159,3 +159,14 @@ along with GNU Emacs.  If not, see <http
+   } while (0)
+ #endif
+ #endif
++
++/* we have regex in the GNU C-library. */
++#define REGEXP_IN_LIBC
++
++/* Use system malloc from glibc and memory mappging */
++#if !defined(__ia64__)
++# define SYSTEM_MALLOC
++# define USE_MMAP_FOR_BUFFERS
++#endif
++
++
diff --git a/emacs-22.0.99-nonvoid.patch b/emacs-24.1-nonvoid.patch
similarity index 55%
rename from emacs-22.0.99-nonvoid.patch
rename to emacs-24.1-nonvoid.patch
index 4837ae3..7864e13 100644
--- a/emacs-22.0.99-nonvoid.patch
+++ b/emacs-24.1-nonvoid.patch
@@ -1,12 +1,12 @@
 --- src/xmenu.c
-+++ src/xmenu.c	2007-05-15 18:25:35.960111766 +0200
-@@ -1140,8 +1140,8 @@ for instance using the window manager, t
++++ src/xmenu.c	2012-06-26 17:12:22.856009442 +0000
+@@ -316,8 +316,8 @@ for instance using the window manager, t
  #else
    {
      Lisp_Object title;
--    char *error_name;
+-    const char *error_name;
 -    Lisp_Object selection;
-+    char *error_name = NULL;
++    const char *error_name = NULL;
 +    Lisp_Object selection = Qnil;
      int specpdl_count = SPECPDL_INDEX ();
  
diff --git a/emacs-24.1-ppc64.patch b/emacs-24.1-ppc64.patch
new file mode 100644
index 0000000..e546517
--- /dev/null
+++ b/emacs-24.1-ppc64.patch
@@ -0,0 +1,36 @@
+--- configure.in
++++ configure.in	2012-06-26 16:30:51.496510306 +0000
+@@ -420,7 +420,8 @@ case "${canonical}" in
+     case ${canonical} in
+       alpha*)	machine=alpha ;;
+       s390x-*)	machine=ibms390x ;;
+-      powerpc*)	machine=macppc ;;
++      powerpc*|ppc*)
++		machine=macppc ;;
+       sparc*)	machine=sparc ;;
+       ia64*)	machine=ia64 ;;
+       m68k*)	machine=m68k ;;
+@@ -1050,7 +1051,7 @@ if test "x$crt_files" != x; then
+       test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
+       ;;
+ 
+-      powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
++      powerpc64-*-linux-gnu* | ppc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
+     esac
+ 
+     case "$opsys" in
+--- src/m/macppc.h
++++ src/m/macppc.h	2012-06-26 16:31:30.584509749 +0000
+@@ -17,6 +17,12 @@ GNU General Public License for more deta
+ You should have received a copy of the GNU General Public License
+ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
++#ifdef __powerpc64__
++#ifndef _ARCH_PPC64
++#define _ARCH_PPC64
++#endif
++#endif
++
+ #ifdef _ARCH_PPC64
+ #ifndef _LP64
+ #define _LP64
diff --git a/emacs-23.3-ps-bdf.patch b/emacs-24.1-ps-bdf.patch
similarity index 88%
rename from emacs-23.3-ps-bdf.patch
rename to emacs-24.1-ps-bdf.patch
index 7f6fcaf..a205fb8 100644
--- a/emacs-23.3-ps-bdf.patch
+++ b/emacs-24.1-ps-bdf.patch
@@ -1,7 +1,7 @@
 --- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el	2009-08-10 16:21:22.000000000 +0000
-@@ -21525,9 +21525,9 @@ With prefix argument \\[universal-prefix
- ;;;;;;  41642))
++++ lisp/ldefs-boot.el	2012-06-26 16:26:01.900010474 +0000
+@@ -23074,9 +23074,9 @@ With prefix argument ARG, restart the Pr
+ ;;;;;;  65510))
  ;;; 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")) "\
@@ -14,7 +14,7 @@
  
 --- lisp/ps-bdf.el
 +++ lisp/ps-bdf.el	2009-08-10 16:21:47.000000000 +0000
-@@ -45,9 +45,9 @@
+@@ -42,9 +42,9 @@
  (defcustom bdf-directory-list
    (if (memq system-type '(ms-dos windows-nt))
        (list (expand-file-name "fonts/bdf" installation-directory))
diff --git a/emacs-23.1-ps-mule.patch b/emacs-24.1-ps-mule.patch
similarity index 70%
rename from emacs-23.1-ps-mule.patch
rename to emacs-24.1-ps-mule.patch
index f5eb17a..3941f19 100644
--- a/emacs-23.1-ps-mule.patch
+++ b/emacs-24.1-ps-mule.patch
@@ -1,6 +1,6 @@
 --- lisp/ps-mule.el
-+++ lisp/ps-mule.el	2009-08-11 14:41:44.493901698 +0200
-@@ -183,6 +183,8 @@ See also the variable `ps-font-info-data
++++ lisp/ps-mule.el	2009-08-11 12:41:44.000000000 +0000
+@@ -182,6 +182,8 @@ See also the variable `ps-font-info-data
  
  (defconst ps-mule-font-info-database-latin
    '((iso-8859-1
@@ -10,11 +10,11 @@
    "Sample setting of `ps-mule-font-info-database' to use latin fonts.")
  
 --- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el	2007-05-15 18:20:20.000000000 +0200
-@@ -1298,10 +1298,18 @@ Protects against bogus binding of `enabl
- (defun ispell-get-extended-character-mode ()
-   (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
- 	     (assoc ispell-current-dictionary ispell-dictionary-alist))))
++++ lisp/textmodes/ispell.el	2012-06-26 16:37:56.424010429 +0000
+@@ -1339,10 +1339,18 @@ Protects against bogus binding of `enabl
+       nil                        ;; in pipe mode. Disable extended-char-mode
+     (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+ 	       (assoc ispell-current-dictionary ispell-dictionary-alist)))))
 +;;
 +;; Most languages in ISO-8859-15 for EURO symbols uses ISO-8859-1 chars
 +;(defun ispell-get-coding-system ()
diff --git a/emacs-24.1-s390x.dif b/emacs-24.1-s390x.dif
new file mode 100644
index 0000000..99b8993
--- /dev/null
+++ b/emacs-24.1-s390x.dif
@@ -0,0 +1,12 @@
+--- src/m/ibms390x.h
++++ src/m/ibms390x.h	2012-06-26 17:21:34.240010197 +0000
+@@ -29,4 +29,8 @@ along with GNU Emacs.  If not, see <http
+ #define VALBITS         60
+ 
+ /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+-#define XPNTR(a) XUINT (a)
++
++#undef DATA_SEG_BITS
++#ifdef USE_LISP_UNION_TYPE
++#undef USE_LISP_UNION_TYPE
++#endif
diff --git a/emacs-24.1-sendmail-path.patch b/emacs-24.1-sendmail-path.patch
new file mode 100644
index 0000000..f6ddb71
--- /dev/null
+++ b/emacs-24.1-sendmail-path.patch
@@ -0,0 +1,17 @@
+--- lisp/mail/sendmail.el
++++ lisp/mail/sendmail.el	2012-06-26 17:16:27.176010331 +0000
+@@ -42,13 +42,7 @@
+   :group 'sendmail
+   :version "22.1")
+ 
+-(defcustom sendmail-program
+-  (or (executable-find "sendmail")
+-      (cond
+-       ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
+-       ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
+-       ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
+-       (t "sendmail")))
++(defcustom sendmail-program "/usr/sbin/sendmail"
+   "Program used to send messages."
+   :version "24.1"		; add executable-find, remove fakemail
+   :group 'mail
diff --git a/emacs-24.1-tinfo.dif b/emacs-24.1-tinfo.dif
new file mode 100644
index 0000000..4372102
--- /dev/null
+++ b/emacs-24.1-tinfo.dif
@@ -0,0 +1,32 @@
+--- configure.in
++++ configure.in	2012-06-26 17:32:44.272010723 +0000
+@@ -2803,7 +2803,7 @@ AC_DEFUN([tputs_link_source], [
+ ])
+ # Maybe curses should be tried earlier?
+ # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
+-for tputs_library in '' ncurses terminfo termcap curses; do
++for tputs_library in '' tinfo ncurses ncursesw terminfo termcap curses; do
+   OLIBS=$LIBS
+   if test -z "$tputs_library"; then
+     LIBS_TERMCAP=
+@@ -2855,7 +2855,7 @@ case "$opsys" in
+     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
+     if test "x$HAVE_LIBNCURSES" = "xyes"; then
+       TERMINFO=yes
+-      LIBS_TERMCAP="-lncurses"
++      LIBS_TERMCAP="-ltinfo"
+     fi
+     ;;
+ 
+--- src/config.in
++++ src/config.in	2011-11-22 14:34:49.000000000 +0000
+@@ -450,6 +450,9 @@ along with GNU Emacs.  If not, see <http
+ /* Define to 1 if you have the `ncurses' library (-lncurses). */
+ #undef HAVE_LIBNCURSES
+ 
++/* Define to 1 if you have the `tinfo' library (-ltinfo). */
++#undef HAVE_LIBTINFO
++
+ /* Define to 1 if using libotf. */
+ #undef HAVE_LIBOTF
+ 
diff --git a/emacs-24.1-xgselect.patch b/emacs-24.1-xgselect.patch
new file mode 100644
index 0000000..9c46f6f
--- /dev/null
+++ b/emacs-24.1-xgselect.patch
@@ -0,0 +1,16 @@
+--- src/xgselect.c
++++ src/xgselect.c	2012-06-27 11:58:47.756081195 +0000
+@@ -58,7 +58,12 @@ xg_select (int max_fds, SELECT_TYPE *rfd
+ 	gfds = xpalloc (0, &gfds_size, n_gfds - gfds_size, INT_MAX,
+ 			sizeof *gfds);
+       }
+-
++    else if (!gfds)
++      {
++	gfds_size = 1;
++	gfds = xmalloc (sizeof (*gfds));
++      }
++    
+     n_gfds = g_main_context_query (context,
+                                    G_PRIORITY_LOW,
+                                    &tmo_in_millisec,
diff --git a/emacs-23.3.dif b/emacs-24.1.dif
similarity index 62%
rename from emacs-23.3.dif
rename to emacs-24.1.dif
index e723e59..c65ce74 100644
--- a/emacs-23.3.dif
+++ b/emacs-24.1.dif
@@ -1,15 +1,15 @@
 --- Makefile.in
-+++ Makefile.in	2010-10-18 13:57:39.899926326 +0000
-@@ -131,7 +131,7 @@ libexecdir=@libexecdir@
++++ Makefile.in	2012-06-27 09:55:19.212009937 +0000
+@@ -127,7 +127,7 @@ libexecdir=@libexecdir@
  # (and they contain cross-references that expect them to be there).
  mandir=@mandir@
  man1dir=$(mandir)/man1
--MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-+MAN_PAGES=b2m.1 ebrowse.1 emacs.1 emacsclient.1 \
+-MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
++MAN_PAGES=ebrowse.1 emacs.1 emacsclient.1 gnuctags.1 \
            grep-changelog.1 rcs-checkin.1
  
  # Where to install and expect the info files describing Emacs.	In the
-@@ -414,10 +414,8 @@ install-arch-dep: mkdir
+@@ -472,10 +472,8 @@ install-arch-dep: mkdir
  	    exec_prefix=${exec_prefix} bindir=${bindir} \
  	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
  	    INSTALL_STRIP=${INSTALL_STRIP})
@@ -19,17 +19,10 @@
 -	-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
 +	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS)
 +	-chmod 1755 $(DESTDIR)${bindir}/$(EMACS)
- 	-unset CDPATH; \
- 	for f in `cd lib-src && echo fns-*.el`; do \
- 	  if test -r lib-src/$$f ; then \
-@@ -586,15 +584,19 @@ install-arch-indep: mkdir info install-e
- 	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- 	    (cd $${thisdir}; \
- 	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	     chmod a+r $(DESTDIR)${infodir}/$$elt; \
-+	     gzip -f9  $(DESTDIR)${infodir}/$$elt; \
- 	  done; \
- 	else true; fi
+ 	if test "${ns_appresdir}" != ""; then \
+ 	  ( cd ${ns_appresdir} ; \
+ 	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
+@@ -649,6 +647,7 @@ install-arch-indep: mkdir info install-e
  	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
  	thisdir=`/bin/pwd`; \
  	cd ${mansrcdir}; \
@@ -37,137 +30,30 @@
  	for page in ${MAN_PAGES}; do \
  	  (cd $${thisdir}; \
  	   ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
- 	   chmod a+r $(DESTDIR)${man1dir}/$${page}); \
-+	   gzip -f9  $(DESTDIR)${man1dir}/$${page}${manext}; \
- 	done
- 
- ## Install those items from etc/ that need to end up elsewhere.
-@@ -677,7 +679,7 @@ uninstall:
- 	    done; \
- 	  done;)
- 	(cd $(DESTDIR)${man1dir}  && rm -f $(MAN_PAGES))
+@@ -743,7 +742,7 @@ uninstall:
+ 	    ext=.gz; else ext=; fi; \
+ 	 cd $(DESTDIR)${man1dir} && for page in ${MAN_PAGES}; do \
+ 	   rm -f $$page$$ext; done )
 -	(cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(EMACS))
 +	(cd $(DESTDIR)${bindir}  && rm -f $(EMACS))
  	(cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg )
  	-rm -f $(DESTDIR)${desktopdir}/emacs.desktop
  	for file in snake-scores tetris-scores; do \
 --- configure.in
-+++ configure.in	2011-07-11 10:45:13.843926716 +0200
-@@ -457,11 +457,11 @@ dnl see the `changequote' comment above.
-     esac
-   ;;
- 
--  alpha*-*-linux-gnu* )
-+  alpha*-*-linux* )
-     machine=alpha opsys=gnu-linux
-   ;;
- 
--  arm*-*-linux-gnu* )
-+  arm*-*-linux* )
-     machine=arm opsys=gnu-linux
-   ;;
- 
-@@ -497,15 +497,15 @@ dnl see the `changequote' comment above.
-     machine=hp800 opsys=hpux11
-   ;;
- 
--  hppa*-*-linux-gnu* )
-+  hppa*-*-linux* )
-     machine=hp800 opsys=gnu-linux
-   ;;
- 
-   ## IBM machines
--  s390-*-linux-gnu* )
-+  s390-*-linux* )
-     machine=ibms390 opsys=gnu-linux
-   ;;
--  s390x-*-linux-gnu* )
-+  s390x-*-linux* )
-     machine=ibms390x opsys=gnu-linux
-   ;;
-   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
-@@ -539,7 +539,7 @@ dnl see the `changequote' comment above.
-   ;;
- 
-   ## Suns
--  sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
-+  sparc-*-linux* | sparc64-*-linux* )
-     machine=sparc opsys=gnu-linux
-   ;;
- 
-@@ -611,7 +611,7 @@ dnl see the `changequote' comment above.
-       *-darwin* )               opsys=darwin
-                                 CPP="${CC-cc} -E -no-cpp-precomp"
-  				;;
--      *-linux-gnu* )		opsys=gnu-linux ;;
-+      *-linux* )		opsys=gnu-linux ;;
-       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-       *-sysv5uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-       *-sysv5OpenUNIX* )  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-@@ -620,28 +620,28 @@ dnl see the `changequote' comment above.
-   ;;
- 
-   ## m68k Linux-based GNU system
--  m68k-*-linux-gnu* )
-+  m68k-*-linux* )
-     machine=m68k opsys=gnu-linux
-   ;;
- 
-   ## Mips Linux-based GNU system
--  mips-*-linux-gnu* | mipsel-*-linux-gnu* \
--    | mips64-*-linux-gnu* | mips64el-*-linux-gnu* )
-+  mips-*-linux* | mipsel-*-linux* \
-+    | mips64-*-linux* | mips64el-*-linux* )
-     machine=mips opsys=gnu-linux
-   ;;
- 
-   ## AMD x86-64 Linux-based GNU system
--  x86_64-*-linux-gnu* )
-+  x86_64-*-linux* )
-     machine=amdx86-64 opsys=gnu-linux
-   ;;
- 
-   ## Tensilica Xtensa Linux-based GNU system
--  xtensa*-*-linux-gnu* )
-+  xtensa*-*-linux* )
-     machine=xtensa opsys=gnu-linux
-     ;;
- 
-   ## SuperH Linux-based GNU system
--  sh[34]*-*-linux-gnu* )
-+  sh[34]*-*-linux* )
-     machine=sh3 opsys=gnu-linux
-   ;;
- 
-@@ -1010,7 +1010,7 @@ AC_SYS_LARGEFILE
- ## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
- ## Other machine types hard-code the location in src/[ms]/*.h.
- case "${canonical}" in
--  x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
-+  x86_64-*-linux* | s390x-*-linux* )
-    ## On x86-64 and s390x GNU/Linux distributions, the standard library
-    ## can be in a variety of places.  We only try /usr/lib64 and /usr/lib.
-    ## For anything else (eg /usr/lib32), it is up the user to specify
-@@ -1321,8 +1321,8 @@ fi
- 
++++ configure.in	2012-06-27 09:58:47.056118544 +0000
+@@ -1438,9 +1438,9 @@ LD_SWITCH_X_SITE_AUX=
+ LD_SWITCH_X_SITE_AUX_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
 -    LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
 -    LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+-    LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'`
 +    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
++    LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}" 
++    LD_SWITCH_X_SITE_AUX_RPATH="-Wl,-rpath-link ${x_libraries%%:*}"
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
-@@ -2711,7 +2711,7 @@ AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${L
-  your loader can find on its own, you might want to add "-L/..." or
-  something similar.])
- AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX},
--		   [Define LD_SWITCH_X_SITE_AUX with an -R option
-+		   [Define LD_SWITCH_X_SITE_AUX with an -rpath-link option
- 		    in case it's needed (for Solaris, for example).])
- AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE,  ${C_SWITCH_X_SITE},
- [Define C_SWITCH_X_SITE to contain any special flags your compiler
 --- doc/man/etags.1
 +++ doc/man/etags.1	2009-08-11 12:59:38.000000000 +0000
 @@ -7,7 +7,7 @@
@@ -197,7 +83,7 @@
  format understood by
  .BR vi ( 1 )\c
  \&.  Both forms of the program understand
-@@ -53,7 +53,7 @@ PHP, Postscript, Python, Prolog, Scheme
+@@ -53,7 +53,7 @@ PHP, PostScript, Python, Prolog, Scheme
  most assembler\-like syntaxes.
  Both forms read the files specified on the command line, and write a tag
  table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for
@@ -252,71 +138,9 @@
  .TP
  .B \-h, \-H, \-\-help
  Print usage information.  Followed by one or more \-\-language=LANG
---- etc/MACHINES
-+++ etc/MACHINES	2009-08-12 13:15:31.000000000 +0000
-@@ -34,7 +34,7 @@ to operating system names (i.e. sunos4.1
- hppa1.1).  If you leave out the version number, the `configure' script
- will configure Emacs for the latest version it knows about.
- 
--Alpha (DEC) running GNU/Linux (alpha-dec-linux-gnu)
-+Alpha (DEC) running GNU/Linux (alpha-dec-linux)
- 
-   DEC C compiler version 5.9 (DEC C V5.9-005 on Digital UNIX V4.0f)
-   is reported to produce bogus binaries of Emacs 21.2 when the
-@@ -196,12 +196,12 @@ IBM RS/6000 (rs6000-ibm-aix*)
-   If anyone can fix the above problems, or confirm that they don't happen
-   with certain versions of various programs, we would appreciate it.
- 
--IBM System/390 running GNU/Linux (s390-*-linux-gnu)
-+IBM System/390 running GNU/Linux (s390-*-linux)
- 
-   As of Emacs 21.2, a 31-bit only version is supported on this
-   system.
- 
--Intel 386 (i386-*-freebsd,      i386-*-linux-gnu,
-+Intel 386 (i386-*-freebsd,      i386-*-linux,
- 	   i386-*-sol2.4,	i386-intsys-sysv,
- 	   i386-*-sysv4,	i386-*-sysv4.2,  i386-*-cygwin,
- 	   i386-*-msdos,	i386-*-windowsnt.
-@@ -211,7 +211,7 @@ Intel 386 (i386-*-freebsd,      i386-*-l
-   you specify does not matter, and you can use any name you like
-   (but it should not contain any dashes or stars).
- 
--  Use i386-*-linux-gnu for GNU/Linux systems; Emacs runs as of version 19.26.
-+  Use i386-*-linux for GNU/Linux systems; Emacs runs as of version 19.26.
-   Use i386-*-cygwin for Cygwin; Emacs builds as of version 22.1, in both X11
-   and non-X11 modes.  (The Cygwin site has source and binaries for 21.2.)
-   Use i386-intsys-sysv for Integrated Solutions 386 machines.
-@@ -322,7 +322,7 @@ Siemens Nixdorf RM600 and RM400 (mips-si
-     LIBXT= $(LIBW) -lXmu /usr/lib/libXt.a $(LIBXTR6) -lXext
- 
- Sun 4 (sparc), Sun 386 (sparc-sun-solaris2.*,
--    			       i386-sun-solaris2.*, sparc*-*-linux-gnu)
-+    			       i386-sun-solaris2.*, sparc*-*-linux)
- 
-   To build a 32-bit Emacs (i.e. if you are having any sort of problem
-   bootstrapping a 64-bit version), you can use the Sun Studio compiler
-@@ -426,7 +426,7 @@ Sun 4 (sparc), Sun 386 (sparc-sun-solari
-   (now remapped as part of the text).  These are never
-   swapped in.
- 
--SuperH (sh[34]*-*-linux-gnu)
-+SuperH (sh[34]*-*-linux)
- 
-   Emacs 23.0.60 was reported to work on GNU/Linux (October 2008).
-   Tested on a little-endian sh4 system (cpu type SH7751R) running
-@@ -525,7 +525,7 @@ X86_64 GNU/Linux
-   build a 32-bit Emacs, first ensure that the necessary 32-bit system
-   libraries and include files are installed.  Then use:
- 
--    env CC="gcc -m32" ./configure --build=i386-linux-gnu \
-+    env CC="gcc -m32" ./configure --build=i386-linux \
-       --x-libraries=/usr/X11R6/lib
- 
-   (using the location of the 32-bit X libraries on your system).
 --- leim/Makefile.in
-+++ leim/Makefile.in	2007-05-22 13:58:19.000000000 +0000
-@@ -222,6 +222,9 @@ leim-list.el: ${SUBDIRS} ${TIT-MISC} cha
++++ leim/Makefile.in	2012-06-27 10:39:29.320443798 +0000
+@@ -220,6 +220,9 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} cha
  
  MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
  
@@ -325,32 +149,37 @@
 +
  install: all
  	if [ ! -d ${INSTALLDIR} ] ; then \
-           umask 022; ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
+           umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \
 --- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2009-08-12 13:20:12.000000000 +0000
-@@ -105,7 +105,7 @@ INSTALL_STRIP =
++++ lib-src/Makefile.in	2012-06-27 10:41:38.716510300 +0000
+@@ -109,8 +109,8 @@ INSTALL_STRIP =
+ # ========================== Lists of Files ===========================
+ 
+ # Things that a user might actually run, which should be installed in bindir.
+-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
+-               ebrowse${EXEEXT}
++INSTALLABLES = emacsclient${EXEEXT} \
++               ebrowse${EXEEXT} gnuctags${EXEEXT}
  
- # Things that a user might actually run,
- # which should be installed in bindir.
--INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
-+INSTALLABLES = emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
  INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
+ STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
+@@ -327,10 +327,11 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
  
- # Things that Emacs runs internally, or during the build process,
-@@ -414,8 +414,8 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
- 
- /* We depend on etags to assure that parallel makes don\'t write two
-    etags.o files on top of each other.  */
+ ## We depend on etags to assure that parallel makes do not write two
+ ## etags.o files on top of each other.
 -ctags${EXEEXT}: etags${EXEEXT}
--	$(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 +gnuctags${EXEEXT}: etags${EXEEXT}
-+	$(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
+ 	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
+ 	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
+-	  $(REGEXPOBJ) $(LOADLIBES) -o ctags
++	  $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
++
  
  profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
 --- lib-src/pop.c
-+++ lib-src/pop.c	2011-11-28 08:38:56.235647209 +0000
-@@ -29,6 +29,7 @@ along with GNU Emacs.  If not, see <http
++++ lib-src/pop.c	2011-11-28 08:38:56.000000000 +0000
+@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http
  #ifdef MAIL_USE_POP
  
  #include <sys/types.h>
@@ -388,7 +217,7 @@
  			esac
 --- lisp/cmuscheme.el
 +++ lisp/cmuscheme.el	2009-08-12 13:29:47.000000000 +0000
-@@ -241,7 +241,8 @@ is run).
+@@ -240,7 +240,8 @@ is run).
  			 (read-string "Run Scheme: " scheme-program-name)
  			 scheme-program-name)))
    (if (not (comint-check-proc "*scheme*"))
@@ -399,28 +228,22 @@
  			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
  	(inferior-scheme-mode)))
 --- lisp/dired.el
-+++ lisp/dired.el	2010-10-18 14:02:19.947926253 +0000
-@@ -72,12 +72,12 @@ If nil, `dired-listing-switches' is used
- ;;;###autoload
- (defvar dired-chown-program
-   (purecopy
--  (if (memq system-type '(hpux usg-unix-v irix linux gnu/linux cygwin))
-+  (if (memq system-type '(hpux usg-unix-v irix gnu/linux linux lignux cygwin))
-       "chown"
-     (if (file-exists-p "/usr/sbin/chown")
- 	"/usr/sbin/chown"
--      "/etc/chown")))
--  "Name of chown command (usually `chown' or `/etc/chown').")
-+      "/bin/chown")))
-+  "Name of chown command (usually `chown' or `/bin/chown').")
- 
- (defvar dired-use-ls-dired (not (not (string-match "gnu" system-configuration)))
-   "Non-nil means Dired should use `ls --dired'.")
++++ lisp/dired.el	2012-06-27 10:43:26.472010441 +0000
+@@ -71,7 +71,8 @@ If nil, `dired-listing-switches' is used
+ (defcustom dired-chown-program
+   (purecopy (cond ((executable-find "chown") "chown")
+                   ((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown")
+-                  ((file-executable-p "/etc/chown") "/etc/chown")
++                  ((file-executable-p "/usr/bin/chown") "/usr/bin/chown")
++                  ((file-executable-p "/bin/chown") "/bin/chown")
+                   (t "chown")))
+   "Name of chown command (usually `chown')."
+   :group 'dired
 --- lisp/help.el
-+++ lisp/help.el	2007-05-15 16:57:09.000000000 +0000
-@@ -56,6 +56,9 @@
++++ lisp/help.el	2012-06-27 10:44:38.572010511 +0000
+@@ -45,6 +45,9 @@
  (defvar help-window-point-marker (make-marker)
-   "Marker to override default `window-point' of `help-window'.")
+   "Marker to override default `window-point' in help windows.")
  
 +(defvar help-mode-hook nil
 +    "Normal hook run when entering Help mode.")
@@ -428,19 +251,90 @@
  (defvar help-map
    (let ((map (make-sparse-keymap)))
      (define-key map (char-to-string help-char) 'help-for-help)
---- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el	2010-10-18 14:03:38.956426343 +0000
-@@ -6072,8 +6072,8 @@ some of the `ls' switches are not suppor
+--- lisp/international/mule-cmds.el
++++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.000000000 +0000
+@@ -41,6 +41,7 @@
  
- (custom-autoload 'dired-listing-switches "dired" t)
+ (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/mh-e/mh-e.el
++++ lisp/mh-e/mh-e.el	2007-05-21 12:27:40.000000000 +0000
+@@ -137,6 +137,9 @@
+     "/usr/local/mh/"
+     "/usr/bin/mh/"                      ; Ultrix 4.2, Linux
+     "/usr/new/mh/"                      ; Ultrix < 4.2
++    "/usr/bin/"				; SuSE Linux
++    "/etc/nmh/"				; SuSE Linux
++    "/usr/lib/nmh/"			; SuSE Linux
+     "/usr/contrib/mh/bin/"              ; BSDI
+     "/usr/pkg/bin/"                     ; NetBSD
+     "/usr/local/bin/"
+@@ -157,20 +160,20 @@ Use the function `mh-variants' instead."
+ This differs from `mh-variant' when the latter is set to
+ \"autodetect\".")
  
--(defvar dired-chown-program (purecopy (if (memq system-type '(hpux usg-unix-v irix linux gnu/linux cygwin)) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown"))) "\
--Name of chown command (usually `chown' or `/etc/chown').")
-+(defvar dired-chown-program (if (memq system-type '(hpux usg-unix-v irix gnu/linux linux lignux cygwin)) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/bin/chown")) "\
-+Name of chown command (usually `chown' or `/bin/chown').")
+-(defvar mh-progs nil
++(defvar mh-progs "/usr/bin/"
+   "Directory containing MH commands, such as inc, repl, and rmm.")
  
- (defvar dired-trivial-filenames (purecopy "^\\.\\.?$\\|^#") "\
- Regexp of files to skip when finding first file of a directory.
+ ;;;###autoload
+ (put 'mh-progs 'risky-local-variable t)
+ 
+-(defvar mh-lib nil
++(defvar mh-lib "/etc/nmh/"
+   "Directory containing the MH library.
+ This directory contains, among other things, the components file.")
+ 
+ ;;;###autoload
+ (put 'mh-lib 'risky-local-variable t)
+ 
+-(defvar mh-lib-progs nil
++(defvar mh-lib-progs "/usr/lib/nmh/"
+   "Directory containing MH helper programs.
+ This directory contains, among other things, the mhl program.")
+ 
+--- lisp/net/ange-ftp.el
++++ lisp/net/ange-ftp.el	2009-08-12 13:35:06.000000000 +0000
+@@ -4956,7 +4956,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))))
+ ;
+@@ -5071,7 +5071,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
+@@ -5579,7 +5579,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.
+@@ -5777,7 +5777,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	2009-08-12 17:19:34.000000000 +0000
 @@ -0,0 +1,61 @@
@@ -506,102 +400,18 @@
 +
 +;;; site-load.el ends here
 --- lisp/speedbar.el
-+++ lisp/speedbar.el	2003-07-23 16:08:56.000000000 +0000
-@@ -798,6 +798,7 @@ to toggle this value.")
++++ lisp/speedbar.el	2012-06-27 11:04:52.701369888 +0000
+@@ -802,6 +802,7 @@ If you want to change this while speedba
  
-   ;; navigation
-   (define-key speedbar-key-map "n" 'speedbar-next)
-+  (define-key speedbar-key-map [tab] 'speedbar-next)
-   (define-key speedbar-key-map "p" 'speedbar-prev)
-   (define-key speedbar-key-map "\M-n" 'speedbar-restricted-next)
-   (define-key speedbar-key-map "\M-p" 'speedbar-restricted-prev)
---- lisp/international/mule-cmds.el
-+++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.303926020 +0000
-@@ -42,6 +42,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/mh-e/mh-e.el
-+++ lisp/mh-e/mh-e.el	2007-05-21 12:27:40.000000000 +0000
-@@ -142,6 +142,9 @@
-     "/usr/local/mh/"
-     "/usr/bin/mh/"                      ; Ultrix 4.2, Linux
-     "/usr/new/mh/"                      ; Ultrix < 4.2
-+    "/usr/bin/"				; SuSE Linux
-+    "/etc/nmh/"				; SuSE Linux
-+    "/usr/lib/nmh/"			; SuSE Linux
-     "/usr/contrib/mh/bin/"              ; BSDI
-     "/usr/pkg/bin/"                     ; NetBSD
-     "/usr/local/bin/"
-@@ -162,20 +165,20 @@ Use the function `mh-variants' instead."
- This differs from `mh-variant' when the latter is set to
- \"autodetect\".")
- 
--(defvar mh-progs nil
-+(defvar mh-progs "/usr/bin/"
-   "Directory containing MH commands, such as inc, repl, and rmm.")
- 
- ;;;###autoload
- (put 'mh-progs 'risky-local-variable t)
- 
--(defvar mh-lib nil
-+(defvar mh-lib "/etc/nmh/"
-   "Directory containing the MH library.
- This directory contains, among other things, the components file.")
- 
- ;;;###autoload
- (put 'mh-lib 'risky-local-variable t)
- 
--(defvar mh-lib-progs nil
-+(defvar mh-lib-progs "/usr/lib/nmh/"
-   "Directory containing MH helper programs.
- This directory contains, among other things, the mhl program.")
- 
---- lisp/net/ange-ftp.el
-+++ lisp/net/ange-ftp.el	2009-08-12 13:35:06.000000000 +0000
-@@ -4957,7 +4957,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))))
- ;
-@@ -5068,7 +5068,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
-@@ -5576,7 +5576,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.
-@@ -5774,7 +5774,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)
+     ;; Navigation.
+     (define-key map "n" 'speedbar-next)
++    (define-key map [tab] 'speedbar-next)
+     (define-key map "p" 'speedbar-prev)
+     (define-key map "\M-n" 'speedbar-restricted-next)
+     (define-key map "\M-p" 'speedbar-restricted-prev)
 --- lisp/textmodes/ispell.el
 +++ lisp/textmodes/ispell.el	2009-08-12 13:49:26.000000000 +0000
-@@ -348,10 +348,13 @@ Must be greater than 1."
+@@ -349,10 +349,13 @@ Must be greater than 1."
    :group 'ispell)
  
  (defcustom ispell-program-name
@@ -619,7 +429,7 @@
    "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
    :type 'string
    :group 'ispell)
-@@ -1138,6 +1141,56 @@ The variable `ispell-library-directory'
+@@ -1156,6 +1159,56 @@ The variable `ispell-library-directory'
  (if ispell-menu-map-needed
      (progn
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
@@ -1013,223 +823,37 @@
 +;;
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von locale.el
---- src/Makefile.in
-+++ src/Makefile.in	2010-10-18 14:07:36.047926040 +0000
-@@ -449,7 +449,7 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
- /* Fix linking if compiled with GCC.  */
- #ifdef __GNUC__
- 
--#ifdef LINKER
-+#if 0 /* def LINKER */
- #define LINKER_WAS_SPECIFIED
- #endif
- 
-@@ -684,6 +684,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
- #define TOOLTIP_SUPPORT
- #endif
- 
-+#define MYSHORTLISP ../lisp/emacs-lisp/backquote.elc ../lisp/delsel.elc \
-+  ../lisp/disp-table.elc ../lisp/lpr.elc
-+
- #ifdef HAVE_NS
- #define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \
-   ${lispsource}term/ns-win.elc
-@@ -882,6 +885,7 @@ shortlisp= \
- 	../lisp/epa-hook.elc \
- 	../lisp/widget.elc \
- 	../lisp/window.elc \
-+	MYSHORTLISP \
- 	../lisp/version.el
- 
- /* Like $shortlisp, but includes only those files from $lisp that are loaded
 --- src/config.in
-+++ src/config.in	2007-05-15 17:25:18.000000000 +0000
-@@ -1014,6 +1014,8 @@ along with GNU Emacs.  If not, see <http
++++ src/config.in	2012-06-27 11:12:06.416510145 +0000
+@@ -1348,6 +1348,8 @@ along with GNU Emacs.  If not, see <http
     code using `volatile' can become incorrect without. Disable with care. */
  #undef volatile
  
 +/* tparam() masking because of common name in ncurses */
 +#define tparam emacs_tparam
  
- /* If we're using X11/Carbon/GNUstep, define some consequences.  */
- #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
---- src/fns.c
-+++ src/fns.c	2003-07-23 16:08:56.000000000 +0000
-@@ -72,6 +72,10 @@ Lisp_Object Qwidget_type;
- Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
- 
- extern Lisp_Object Qinput_method_function;
-+#ifdef HAVE_MOUSE
-+extern Lisp_Object do_mouse_tracking;
-+extern Lisp_Object tracking_off ();
-+#endif
- 
- static int internal_equal P_ ((Lisp_Object , Lisp_Object, int, int));
- 
-@@ -2591,6 +2595,10 @@ is nil and `use-dialog-box' is non-nil.
-   int count = SPECPDL_INDEX ();
- 
-   specbind (Qcursor_in_echo_area, Qt);
-+#ifdef HAVE_MOUSE
-+  record_unwind_protect (tracking_off, do_mouse_tracking);
-+  do_mouse_tracking = Qnil;
-+#endif
- 
-   map = Fsymbol_value (intern ("query-replace-map"));
- 
---- src/keyboard.c
-+++ src/keyboard.c	2003-07-23 16:08:56.000000000 +0000
-@@ -1427,7 +1427,7 @@ DEFUN ("abort-recursive-edit", Fabort_re
- /* Restore mouse tracking enablement.  See Ftrack_mouse for the only use
-    of this function.  */
- 
--static Lisp_Object
-+Lisp_Object
- tracking_off (old_value)
-      Lisp_Object old_value;
- {
---- src/lisp.h
-+++ src/lisp.h	2009-08-14 11:07:01.000000000 +0000
-@@ -2000,11 +2000,10 @@ extern Lisp_Object case_temp2;
- 
- /* Downcase a character, or make no change if that cannot be done.  */
- 
--#define DOWNCASE(CH)						\
--  ((case_temp1 = (CH),						\
--    case_temp2 = CHAR_TABLE_REF (DOWNCASE_TABLE, case_temp1),	\
--    NATNUMP (case_temp2))					\
--   ? XFASTINT (case_temp2) : case_temp1)
-+#define DOWNCASE(CH)	(__extension__				\
-+  ({case_temp1 = (CH);						\
-+    case_temp2 = CHAR_TABLE_REF (DOWNCASE_TABLE, case_temp1);	\
-+    (NATNUMP (case_temp2)) ? XFASTINT (case_temp2) : case_temp1; }))
- 
- /* 1 if CH is upper case.  */
- 
-@@ -2024,11 +2023,10 @@ extern Lisp_Object case_temp2;
- 
- /* Upcase a character known to be not upper case.  */
- 
--#define UPCASE1(CH)						\
--  ((case_temp1 = (CH),						\
--    case_temp2 = CHAR_TABLE_REF (UPCASE_TABLE, case_temp1),	\
--    NATNUMP (case_temp2))					\
--   ? XFASTINT (case_temp2) : case_temp1)
-+#define UPCASE1(CH)	(__extension__				\
-+  ({case_temp1 = (CH);						\
-+    case_temp2 = CHAR_TABLE_REF (UPCASE_TABLE, case_temp1);	\
-+    (NATNUMP (case_temp2)) ? XFASTINT (case_temp2) : case_temp1; }))
- 
- extern Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
- extern Lisp_Object Vascii_canon_table, Vascii_eqv_table;
---- src/prefix-args.c
-+++ src/prefix-args.c	2009-08-12 13:53:28.000000000 +0000
-@@ -52,6 +52,7 @@ along with GNU Emacs.  If not, see <http
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- int
- main (argc, argv)
-@@ -74,8 +75,15 @@ Echo each ARG preceded by PREFIX and a s
-   prefix = argv[0];
-   argc--, argv++;
- 
--  for (; argc > 0; argc--, argv++)
--    printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n');
-+  for (; argc > 0; argc--, argv++) {
-+    if (strcmp(argv[0], prefix) == 0 && argv[1]) {
-+      printf ("%s %s", argv[0], argv[1]);
-+      argv++;
-+      argc--;
-+      putc ((argc > 1) ? ' ' : '\n', stdout);
-+    } else
-+      printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n');
-+  }
- 
-   exit (0);
- }
---- src/m/hp800.h
-+++ src/m/hp800.h	2009-08-12 13:54:03.000000000 +0000
-@@ -43,7 +43,7 @@ along with GNU Emacs.  If not, see <http
- 
- /* Common definitions for HPUX and GNU/Linux.  */
- 
--#if defined (__hpux) || defined (GNU_LINUX)
-+#if defined (__hpux) || defined (__linux__)
- 
- /* Define NO_REMAP if memory segmentation makes it not work well
-    to change the boundary between the text section and data section
-@@ -52,11 +52,11 @@ along with GNU Emacs.  If not, see <http
- 
- #define NO_REMAP
- 
--#endif /* __hpux or GNU_LINUX */
-+#endif /* __hpux or __linux__ */
- 
- /* Stuff for just GNU/Linux.  */
- 
--#ifdef GNU_LINUX
-+#ifdef __linux__
- 
- /* Data type of load average, as read out of kmem.  */
- 
-@@ -65,6 +65,14 @@ along with GNU Emacs.  If not, see <http
- /* Convert that into an integer that is 100 for a load average of 1.0  */
- 
- #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+#else
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
- 
- #endif /* GNU_LINUX */
- 
-@@ -79,6 +87,7 @@ along with GNU Emacs.  If not, see <http
-    Otherwise Emacs assumes that text space precedes data space,
-    numerically.  */
- 
-+#ifdef __hpux
- #define VIRT_ADDR_VARIES
- 
- /* the data segment on this machine always starts at address 0x40000000. */
-@@ -87,6 +96,9 @@ along with GNU Emacs.  If not, see <http
- 
- #define DATA_START    0x40000000
- #define TEXT_START    0x00000000
-+#else
-+#define HAVE_ALLOCA
-+#endif
- 
- /* This machine requires completely different unexec code
-    which lives in a separate file.  Specify the file name.  */
+ /* On AIX 3 this must be included before any other include file.  */
+ #include <alloca.h>
+--- src/lisp.mk
++++ src/lisp.mk	2012-06-27 11:10:56.532510062 +0000
+@@ -142,6 +142,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)/dos-w32.elc \
+ 	$(lispsource)/w32-fns.elc \
 --- src/s/gnu-linux.h
-+++ src/s/gnu-linux.h	2009-08-12 13:59:18.000000000 +0000
-@@ -94,6 +94,7 @@ along with GNU Emacs.  If not, see <http
-     functions and macros for terminal control.  */
++++ src/s/gnu-linux.h	2012-06-27 11:35:27.128011252 +0000
+@@ -169,4 +169,15 @@ along with GNU Emacs.  If not, see <http
+ # define USE_MMAP_FOR_BUFFERS
+ #endif
  
- #define HAVE_TERMIOS
-+#define NCURSES_OSPEED_T
- 
- /* Define HAVE_PTYS if the system supports pty devices. */
- 
-@@ -173,7 +174,7 @@ along with GNU Emacs.  If not, see <http
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-    says where to find X windows at run time.  */
- 
--#ifdef __mips__
-+#if defined(__mips__) || defined(__powerpc__)
- #define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX
- #else
- #define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
-@@ -194,6 +195,15 @@ along with GNU Emacs.  If not, see <http
- #define POSIX                 /* affects getpagesize.h and systty.h */
- #define POSIX_SIGNALS
++#ifndef HAVE_TERMIOS
++# define HAVE_TERMIOS
++#endif
  
 +/* When _USE_BSD is defined, which it will be on glibc based
 + * systems, sigmask/sigpause will be defined in the system signal.h
@@ -1239,17 +863,13 @@
 + */
 +#undef sigmask
 +#undef sigpause
-+
- /* Best not to include -lg, unless it is last on the command line */
- #define LIBS_DEBUG
- #undef LIB_GCC
 --- src/sysdep.c
-+++ src/sysdep.c	2011-11-28 08:46:29.903146518 +0000
-@@ -131,6 +131,7 @@ extern int quit_char;
++++ src/sysdep.c	2012-06-27 11:36:07.464510261 +0000
+@@ -89,6 +89,7 @@ along with GNU Emacs.  If not, see <http
  #include "dispextern.h"
  #include "process.h"
  #include "cm.h"  /* for reset_sys_modes */
-+extern void tputs P_ ((const char *, int, int (*)(int)));
++extern void tputs (const char *, int, int (*)(int));
  
- /* For serial_configure and serial_open.  */
- extern Lisp_Object QCport, QCspeed, QCprocess;
+ #ifdef WINDOWSNT
+ #include <direct.h>
diff --git a/emacs-24.1.tar.bz2 b/emacs-24.1.tar.bz2
new file mode 100644
index 0000000..2150e87
--- /dev/null
+++ b/emacs-24.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c
+size 41722508
diff --git a/emacs-sparc.diff b/emacs-sparc.diff
deleted file mode 100644
index 426ba23..0000000
--- a/emacs-sparc.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- configure.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: emacs-23.1/configure.in
-===================================================================
---- emacs-23.1.orig/configure.in
-+++ emacs-23.1/configure.in
-@@ -443,7 +443,7 @@ dnl see the `changequote' comment above.
-   ;;
- 
-   ## Suns
--  sparc-*-linux* | sparc64-*-linux* )
-+  sparc*-*-linux* )
-     machine=sparc opsys=gnu-linux
-   ;;
- 
diff --git a/emacs.changes b/emacs.changes
index baa3ffc..2faf5fe 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jun 28 09:07:51 UTC 2012 - werner@suse.de
+
+- Update to to emacs version 23.3
+  * Support for Gtk+3.0, GnuTLS, ImageMagick, libxml2, and SELinux
+  * Support for wide integer (62 bits) in lisp even on 32-bit machines.
+  * The --unibyte, --multibyte, --no-multibyte, and --no-unibyte command
+    line arguments, and the EMACS_UNIBYTE environment variable, no longer
+    have any effect.
+  * And many more changes see /usr/share/emacs/24.1/etc/NEWS
+- Remove obsolete patches
+- Refresh some others patches
+
 -------------------------------------------------------------------
 Thu May 24 11:39:36 UTC 2012 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 709fbf2..84b3ebb 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -17,6 +17,8 @@
 
 
 Name:           emacs
+BuildRequires:  ImageMagick
+BuildRequires:  ImageMagick-devel
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  bind-devel
@@ -27,13 +29,17 @@ BuildRequires:  fonts-config
 BuildRequires:  freetype2-devel
 BuildRequires:  gconf2-devel
 BuildRequires:  giflib-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  krb5-devel
+BuildRequires:  libgnutls-devel
+BuildRequires:  libgnutls-openssl-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libotf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  librsvg-devel
+BuildRequires:  libselinux-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  m17n-lib-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  nmh
@@ -48,7 +54,7 @@ BuildRequires:  gpm-devel
 BuildRequires:  gpm
 %endif
 Url:            http://www.gnu.org/software/emacs/
-Version:        23.3
+Version:        24.1
 Release:        0
 Requires:       ctags
 Requires:       emacs-info = %{version}
@@ -57,33 +63,30 @@ Summary:        GNU Emacs Base Package
 License:        GPL-3.0+
 Group:          Productivity/Editors/Emacs
 Provides:       nxml-mode = 20041004
-Obsoletes:      nxml-mode <= 20041004
-Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-23.3b.tar.bz2
+Obsoletes:      nxml-mode < 20041004
+Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.1.tar.bz2
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
 Source4:        emacs-rpmlintrc
 Source5:        emacs.desktop
-Patch:          emacs-23.3.dif
-Patch1:         emacs-23.2-linkscr.patch
-Patch2:         emacs-23.1-glibc.patch
-Patch3:         emacs-23.2-decl.dif
+Patch:          emacs-24.1.dif
+Patch2:         emacs-24.1-glibc.patch
+Patch3:         emacs-24.1-decl.dif
 Patch4:         emacs-23.1-asian-print.patch
-Patch5:         emacs-23.3-ps-bdf.patch
-Patch6:         emacs-23.1-ppc64.patch
-Patch7:         emacs-23.1-ps-mule.patch
-Patch8:         emacs-22.0.99-nonvoid.patch
-Patch9:         emacs-22.0.99-sendmail-path.patch
+Patch5:         emacs-24.1-ps-bdf.patch
+Patch6:         emacs-24.1-ppc64.patch
+Patch7:         emacs-24.1-ps-mule.patch
+Patch8:         emacs-24.1-nonvoid.patch
+Patch9:         emacs-24.1-sendmail-path.patch
 Patch11:        emacs-22.0.99-xim.patch
 Patch12:        emacs-22.0.99-x11r7.patch
-Patch13:        emacs-23.3-s390x.dif
-Patch14:        emacs-23.3-tinfo.dif
+Patch13:        emacs-24.1-s390x.dif
+Patch14:        emacs-24.1-tinfo.dif
 Patch15:        emacs-22.2-iconic.patch
 Patch16:        emacs-23.1-flyspell.patch
-Patch18:        emacs-sparc.diff
-Patch22:        emacs-23.1-bnc628268.patch
-Patch23:        emacs-23.3-bnc740447.patch
-Patch24:        emacs-23.3-xgselect.patch
+Patch22:        emacs-24.1-bnc628268.patch
+Patch24:        emacs-24.1-xgselect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global bug_345669  0
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -102,7 +105,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define appDefaultsDir %{_x11data}/app-defaults
 %define appDefaultsFile %{appDefaultsDir}/Emacs
 %endif
-%define info_files  elisp emacs eintr ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-mime epa erc eshell eudc efaq flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman
+%define info_files  emacs eintr elisp ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-gnutls emacs-mime epa erc ert eshell eudc efaq flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman
 
 %description
 Basic package for the GNU Emacs editor. Requires emacs-x11 or
@@ -165,7 +168,6 @@ modes.
 
 %prep
 %setup -q -b 2
-%patch1  -p0 -b .axp
 %patch2  -p0 -b .glibc
 %patch3  -p0 -b .decl
 %patch4  -p0 -b .print
@@ -180,13 +182,11 @@ modes.
 %patch14 -p0 -b .tinfo
 %patch15 -p0 -b .iconic
 %patch16 -p0 -b .flyspell
-%patch
-%patch18 -p1 -b .sparc
+%patch   -p0
 if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
     install-mh -auto < /dev/null
 fi
 %patch22
-%patch23
 %patch24
 
 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
@@ -228,7 +228,7 @@ exit 1
       esac
   }
 
-  if test "elisp$(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@(\.\./info|\$[\(\{]infodir[\)\}])/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; H;};${g;s/[[:space:]]+/ /g;p;}' doc/*/Makefile.in)" != "%info_files"
+  if test "$(sed -rn '\@^\$[({]infodir[})]/@{ s@.*/([^:]*):.*@\1@p; }' doc/*/Makefile.in | xargs)" != "%info_files"
   then
       echo Please update info_files >&2
       exit 1
@@ -284,7 +284,7 @@ DESKTOP="--with-x \
 	 --without-gpm \
 "
     GTK="${DESKTOP} \
-	 --with-x-toolkit=gtk \
+	 --with-x-toolkit=gtk3 \
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib}:%{_x11data} \
 	 --with-xft \
@@ -319,6 +319,7 @@ DESKTOP="--with-x \
 	 --with-kerberos \
 	 --with-kerberos5 \
 	 --with-xim \
+	 --with-wide-int \
 	 --enable-autodepend \
 "
 make_mchkoff ()
@@ -537,22 +538,19 @@ done
 %files -f site-lisp.lst -n emacs
 %defattr(-, root, root)
 /etc/skel/.gnu-emacs
-%{_bindir}/b2m
 %{_bindir}/ebrowse
 %{_bindir}/emacs
 %{_bindir}/emacsclient
+%{_bindir}/gnuctags
 %{_bindir}/grep-changelog
 %{_bindir}/rcs-checkin
 %dir %{_prefix}/lib/emacs/
 %dir %{_prefix}/lib/emacs/%{version}/
 %dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
-%{_prefix}/lib/emacs/%{version}/*-suse-linux*/digest-doc
-%{_prefix}/lib/emacs/%{version}/*-suse-linux*/fakemail
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
-%{_prefix}/lib/emacs/%{version}/*-suse-linux*/sorted-doc
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/vcdiff
 %dir %{_docdir}/emacs/
@@ -561,7 +559,6 @@ done
 %dir %{_datadir}/emacs/%{version}/
 %dir %{_datadir}/emacs/%{version}/etc/
 %doc %{_datadir}/emacs/%{version}/etc/AUTHORS
-%doc %{_datadir}/emacs/%{version}/etc/BABYL
 %doc %{_datadir}/emacs/%{version}/etc/CENSORSHIP
 %doc %{_datadir}/emacs/%{version}/etc/CONTRIBUTE
 %doc %{_datadir}/emacs/%{version}/etc/COOKIES
@@ -592,8 +589,11 @@ done
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.20
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.21
 %doc %{_datadir}/emacs/%{version}/etc/NEWS.22
+%doc %{_datadir}/emacs/%{version}/etc/NEWS.23
+%doc %{_datadir}/emacs/%{version}/etc/NEXTSTEP
 %doc %{_datadir}/emacs/%{version}/etc/NXML-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/ORDERS
+%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
@@ -735,45 +735,31 @@ done
 %{_datadir}/emacs/%{version}/etc/charsets/VSCII.map
 %{_datadir}/emacs/%{version}/etc/charsets/stdenc.map
 %{_datadir}/emacs/%{version}/etc/charsets/symbol.map
-%doc %{_datadir}/emacs/%{version}/etc/compilation.txt
-%doc %{_datadir}/emacs/%{version}/etc/condom.1.gz
-%doc %{_datadir}/emacs/%{version}/etc/copying.paper
+%{_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/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
-%doc %{_datadir}/emacs/%{version}/etc/echo.msg
-%doc %{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb
-%doc %{_datadir}/emacs/%{version}/etc/emacs.bash
-%doc %{_datadir}/emacs/%{version}/etc/emacs.csh
-%doc %{_datadir}/emacs/%{version}/etc/emacs.desktop
-%doc %{_datadir}/emacs/%{version}/etc/emacs.icon
-%doc %{_datadir}/emacs/%{version}/etc/emacs.py
-%doc %{_datadir}/emacs/%{version}/etc/emacs2.py
-%doc %{_datadir}/emacs/%{version}/etc/emacs3.py
-%doc %{_datadir}/emacs/%{version}/etc/enriched.doc
-%doc %{_datadir}/emacs/%{version}/etc/forms-d2.dat
-%doc %{_datadir}/emacs/%{version}/etc/future-bug
-%doc %{_datadir}/emacs/%{version}/etc/gnus-tut.txt
+%{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb
+%{_datadir}/emacs/%{version}/etc/emacs.desktop
+%{_datadir}/emacs/%{version}/etc/emacs.icon
+%{_datadir}/emacs/%{version}/etc/emacs.py
+%{_datadir}/emacs/%{version}/etc/emacs2.py
+%{_datadir}/emacs/%{version}/etc/emacs3.py
+%{_datadir}/emacs/%{version}/etc/enriched.doc
+%{_datadir}/emacs/%{version}/etc/forms-d2.dat
+%{_datadir}/emacs/%{version}/etc/future-bug
+%{_datadir}/emacs/%{version}/etc/gnus-tut.txt
 %dir %{_datadir}/emacs/%{version}/etc/gnus/
-%doc %{_datadir}/emacs/%{version}/etc/gnus/gnus-setup.ast
-%doc %{_datadir}/emacs/%{version}/etc/gnus/news-server.ast
-%dir %{_datadir}/emacs/%{version}/etc/grammars/
-%doc %{_datadir}/emacs/%{version}/etc/grammars/README
-%{_datadir}/emacs/%{version}/etc/grammars/bovine-grammar.el
-%{_datadir}/emacs/%{version}/etc/grammars/c.by
-%{_datadir}/emacs/%{version}/etc/grammars/grammar.wy
-%{_datadir}/emacs/%{version}/etc/grammars/java-tags.wy
-%{_datadir}/emacs/%{version}/etc/grammars/js.wy
-%{_datadir}/emacs/%{version}/etc/grammars/make.by
-%{_datadir}/emacs/%{version}/etc/grammars/python.wy
-%{_datadir}/emacs/%{version}/etc/grammars/scheme.by
-%{_datadir}/emacs/%{version}/etc/grammars/srecode-template.wy
-%{_datadir}/emacs/%{version}/etc/grammars/wisent-grammar.el
-%doc %{_datadir}/emacs/%{version}/etc/grep.txt
+%{_datadir}/emacs/%{version}/etc/gnus/gnus-setup.ast
+%{_datadir}/emacs/%{version}/etc/gnus/news-server.ast
+%{_datadir}/emacs/%{version}/etc/grep.txt
 %dir %{_datadir}/emacs/%{version}/etc/images/
-%doc %{_datadir}/emacs/%{version}/etc/images/README
+%{_datadir}/emacs/%{version}/etc/images/README
 %{_datadir}/emacs/%{version}/etc/images/attach.pbm
 %{_datadir}/emacs/%{version}/etc/images/attach.xpm
 %{_datadir}/emacs/%{version}/etc/images/back-arrow.pbm
@@ -782,6 +768,7 @@ done
 %{_datadir}/emacs/%{version}/etc/images/bookmark_add.xpm
 %{_datadir}/emacs/%{version}/etc/images/cancel.pbm
 %{_datadir}/emacs/%{version}/etc/images/cancel.xpm
+%{_datadir}/emacs/%{version}/etc/images/checked.xpm
 %{_datadir}/emacs/%{version}/etc/images/close.pbm
 %{_datadir}/emacs/%{version}/etc/images/close.xpm
 %{_datadir}/emacs/%{version}/etc/images/connect.xpm
@@ -790,7 +777,7 @@ done
 %{_datadir}/emacs/%{version}/etc/images/copy.pbm
 %{_datadir}/emacs/%{version}/etc/images/copy.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/custom/
-%doc %{_datadir}/emacs/%{version}/etc/images/custom/README
+%{_datadir}/emacs/%{version}/etc/images/custom/README
 %{_datadir}/emacs/%{version}/etc/images/custom/down-pushed.xpm
 %{_datadir}/emacs/%{version}/etc/images/custom/down.xpm
 %{_datadir}/emacs/%{version}/etc/images/custom/right-pushed.xpm
@@ -808,7 +795,7 @@ done
 %{_datadir}/emacs/%{version}/etc/images/exit.pbm
 %{_datadir}/emacs/%{version}/etc/images/exit.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/ezimage/
-%doc %{_datadir}/emacs/%{version}/etc/images/ezimage/README
+%{_datadir}/emacs/%{version}/etc/images/ezimage/README
 %{_datadir}/emacs/%{version}/etc/images/ezimage/bits.xpm
 %{_datadir}/emacs/%{version}/etc/images/ezimage/bitsbang.xpm
 %{_datadir}/emacs/%{version}/etc/images/ezimage/box-minus.xpm
@@ -954,6 +941,53 @@ done
 %{_datadir}/emacs/%{version}/etc/images/home.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/icons/
 %doc %{_datadir}/emacs/%{version}/etc/images/icons/README
+%dir %{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/
+%dir %{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/closed.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/closed.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/empty.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/empty.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/end-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/leaf.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/opened.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/opened.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/through-descender.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
+%dir %{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/closed.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/closed.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/empty.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/empty.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/end-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/extender-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/leaf.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/leaf.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/mid-connector.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/opened.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/opened.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/skip-descender.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/through-descender.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
+%{_datadir}/emacs/%{version}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/icons/hicolor/
 %dir %{_datadir}/emacs/%{version}/etc/images/icons/hicolor/128x128/
 %dir %{_datadir}/emacs/%{version}/etc/images/icons/hicolor/128x128/apps/
@@ -1049,8 +1083,30 @@ done
 %{_datadir}/emacs/%{version}/etc/images/mail/send.xpm
 %{_datadir}/emacs/%{version}/etc/images/mail/spam.xpm
 %{_datadir}/emacs/%{version}/etc/images/mh-logo.xpm
+%dir %{_datadir}/emacs/%{version}/etc/images/mpc/
+%doc %{_datadir}/emacs/%{version}/etc/images/mpc/README
+%{_datadir}/emacs/%{version}/etc/images/mpc/add.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/ffwd.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/next.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/pause.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/play.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/prev.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/rewind.xpm
+%{_datadir}/emacs/%{version}/etc/images/mpc/stop.xpm
 %{_datadir}/emacs/%{version}/etc/images/new.pbm
 %{_datadir}/emacs/%{version}/etc/images/new.xpm
+%dir %{_datadir}/emacs/%{version}/etc/images/newsticker/
+%doc %{_datadir}/emacs/%{version}/etc/images/newsticker/README
+%{_datadir}/emacs/%{version}/etc/images/newsticker/browse-url.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/get-all.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/mark-immortal.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/mark-read.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/narrow.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/next-feed.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/next-item.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/prev-feed.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/prev-item.xpm
+%{_datadir}/emacs/%{version}/etc/images/newsticker/update.xpm
 %{_datadir}/emacs/%{version}/etc/images/next-node.pbm
 %{_datadir}/emacs/%{version}/etc/images/next-node.xpm
 %{_datadir}/emacs/%{version}/etc/images/next-page.pbm
@@ -1182,6 +1238,7 @@ done
 %{_datadir}/emacs/%{version}/etc/images/tree-widget/folder/no-handle.xpm
 %{_datadir}/emacs/%{version}/etc/images/tree-widget/folder/open.png
 %{_datadir}/emacs/%{version}/etc/images/tree-widget/folder/open.xpm
+%{_datadir}/emacs/%{version}/etc/images/unchecked.xpm
 %{_datadir}/emacs/%{version}/etc/images/undo.pbm
 %{_datadir}/emacs/%{version}/etc/images/undo.xpm
 %{_datadir}/emacs/%{version}/etc/images/up-arrow.pbm
@@ -1191,17 +1248,6 @@ done
 %{_datadir}/emacs/%{version}/etc/images/zoom-in.xpm
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.pbm
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.xpm
-%dir %{_datadir}/emacs/%{version}/etc/images/mpc/
-%{_datadir}/emacs/%{version}/etc/images/mpc/README
-%{_datadir}/emacs/%{version}/etc/images/mpc/add.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/ffwd.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/next.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/pause.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/play.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/prev.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/rewind.xpm
-%{_datadir}/emacs/%{version}/etc/images/mpc/stop.xpm
-%{_datadir}/emacs/%{version}/etc/ms-kermit
 %dir %{_datadir}/emacs/%{version}/etc/nxml/
 %{_datadir}/emacs/%{version}/etc/nxml/00000-0007F.el
 %{_datadir}/emacs/%{version}/etc/nxml/00080-000FF.el
@@ -1305,10 +1351,14 @@ done
 %doc %{_datadir}/emacs/%{version}/etc/nxml/README
 %{_datadir}/emacs/%{version}/etc/nxml/test-invalid.xml
 %{_datadir}/emacs/%{version}/etc/nxml/test-valid.xml
+%dir %{_datadir}/emacs/%{version}/etc/org/
+%{_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/ps-prin0.ps
 %{_datadir}/emacs/%{version}/etc/ps-prin1.ps
 %dir %{_datadir}/emacs/%{version}/etc/refcards/
-%doc %{_datadir}/emacs/%{version}/etc/refcards/Makefile
+%{_datadir}/emacs/%{version}/etc/refcards/Makefile
 %doc %{_datadir}/emacs/%{version}/etc/refcards/README
 %doc %{_datadir}/emacs/%{version}/etc/refcards/calccard.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/calccard.tex
@@ -1350,7 +1400,7 @@ done
 %doc %{_datadir}/emacs/%{version}/etc/refcards/survival.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/vipcard.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/viperCard.tex
-%doc %{_datadir}/emacs/%{version}/etc/rgb.txt
+%{_datadir}/emacs/%{version}/etc/rgb.txt
 %dir %{_datadir}/emacs/%{version}/etc/schema/
 %doc %{_datadir}/emacs/%{version}/etc/schema/README
 %{_datadir}/emacs/%{version}/etc/schema/calstbl.rnc
@@ -1399,8 +1449,37 @@ done
 %{_datadir}/emacs/%{version}/etc/schema/xhtml.rnc
 %{_datadir}/emacs/%{version}/etc/schema/xslt.rnc
 %{_datadir}/emacs/%{version}/etc/ses-example.ses
-%doc %{_datadir}/emacs/%{version}/etc/sex.6.gz
+%{_datadir}/emacs/%{version}/etc/sex.6.gz
 %{_datadir}/emacs/%{version}/etc/spook.lines
+%dir %{_datadir}/emacs/%{version}/etc/srecode/
+%{_datadir}/emacs/%{version}/etc/srecode/cpp.srt
+%{_datadir}/emacs/%{version}/etc/srecode/default.srt
+%{_datadir}/emacs/%{version}/etc/srecode/doc-cpp.srt
+%{_datadir}/emacs/%{version}/etc/srecode/doc-default.srt
+%{_datadir}/emacs/%{version}/etc/srecode/doc-java.srt
+%{_datadir}/emacs/%{version}/etc/srecode/ede-make.srt
+%{_datadir}/emacs/%{version}/etc/srecode/el.srt
+%{_datadir}/emacs/%{version}/etc/srecode/getset-cpp.srt
+%{_datadir}/emacs/%{version}/etc/srecode/java.srt
+%{_datadir}/emacs/%{version}/etc/srecode/make.srt
+%{_datadir}/emacs/%{version}/etc/srecode/template.srt
+%{_datadir}/emacs/%{version}/etc/srecode/test.srt
+%{_datadir}/emacs/%{version}/etc/srecode/texi.srt
+%{_datadir}/emacs/%{version}/etc/srecode/wisent.srt
+%dir %{_datadir}/emacs/%{version}/etc/themes/
+%{_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/light-blue-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/manoj-dark-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/misterioso-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/tango-dark-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/tango-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/tsdh-dark-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/tsdh-light-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/wheatgrass-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/whiteboard-theme.el
+%{_datadir}/emacs/%{version}/etc/themes/wombat-theme.el
 %dir %{_datadir}/emacs/%{version}/etc/tutorials/
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.bg
@@ -1410,6 +1489,7 @@ done
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.eo
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.es
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.fr
+%{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.he
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.it
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.ja
 %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.ko
@@ -1427,7 +1507,7 @@ done
 %{_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/ja-dic/ja-dic.el
 %{_datadir}/emacs/%{version}/leim/leim-list.el
 %dir %{_datadir}/emacs/%{version}/leim/quail/
 %{_datadir}/emacs/%{version}/leim/quail/4Corner.elc
@@ -1447,52 +1527,53 @@ done
 %{_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.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/py-punct.elc
-%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.elc
+%{_datadir}/emacs/%{version}/leim/quail/arabic.el
+%{_datadir}/emacs/%{version}/leim/quail/croatian.el
+%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.el
+%{_datadir}/emacs/%{version}/leim/quail/cyrillic.el
+%{_datadir}/emacs/%{version}/leim/quail/czech.el
+%{_datadir}/emacs/%{version}/leim/quail/ethiopic.el
+%{_datadir}/emacs/%{version}/leim/quail/georgian.el
+%{_datadir}/emacs/%{version}/leim/quail/greek.el
+%{_datadir}/emacs/%{version}/leim/quail/hangul.el
+%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.el
+%{_datadir}/emacs/%{version}/leim/quail/hanja.el
+%{_datadir}/emacs/%{version}/leim/quail/hanja3.el
+%{_datadir}/emacs/%{version}/leim/quail/hebrew.el
+%{_datadir}/emacs/%{version}/leim/quail/indian.el
+%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.el
+%{_datadir}/emacs/%{version}/leim/quail/ipa.el
+%{_datadir}/emacs/%{version}/leim/quail/japanese.el
+%{_datadir}/emacs/%{version}/leim/quail/lao.el
+%{_datadir}/emacs/%{version}/leim/quail/latin-alt.el
+%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.el
+%{_datadir}/emacs/%{version}/leim/quail/latin-post.el
+%{_datadir}/emacs/%{version}/leim/quail/latin-pre.el
+%{_datadir}/emacs/%{version}/leim/quail/lrt.el
+%{_datadir}/emacs/%{version}/leim/quail/persian.el
+%{_datadir}/emacs/%{version}/leim/quail/py-punct.el
+%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.el
 %{_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/rfc1345.el
+%{_datadir}/emacs/%{version}/leim/quail/sgml-input.el
+%{_datadir}/emacs/%{version}/leim/quail/sisheng.el
+%{_datadir}/emacs/%{version}/leim/quail/slovak.el
+%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.el
+%{_datadir}/emacs/%{version}/leim/quail/thai.el
+%{_datadir}/emacs/%{version}/leim/quail/tibetan.el
 %{_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/welsh.elc
+%{_datadir}/emacs/%{version}/leim/quail/uni-input.el
+%{_datadir}/emacs/%{version}/leim/quail/viqr.el
+%{_datadir}/emacs/%{version}/leim/quail/vntelex.el
+%{_datadir}/emacs/%{version}/leim/quail/welsh.el
 %dir %{_datadir}/emacs/%{version}/lisp/
-%doc %{_datadir}/emacs/%{version}/lisp/COPYING
+%{_datadir}/emacs/%{version}/lisp/COPYING
 %doc %{_datadir}/emacs/%{version}/lisp/README
 %{_datadir}/emacs/%{version}/lisp/abbrev.elc
-%{_datadir}/emacs/%{version}/lisp/abbrevlist.elc
-%{_datadir}/emacs/%{version}/lisp/add-log.elc
 %{_datadir}/emacs/%{version}/lisp/align.elc
+%{_datadir}/emacs/%{version}/lisp/allout-widgets.elc
 %{_datadir}/emacs/%{version}/lisp/allout.elc
 %{_datadir}/emacs/%{version}/lisp/ansi-color.elc
 %{_datadir}/emacs/%{version}/lisp/apropos.elc
@@ -1684,8 +1765,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar-wy.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/html.elc
-%{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia-sb.elc
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/idle.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/imenu.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/java.elc
@@ -1751,9 +1832,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/texi.elc
 %{_datadir}/emacs/%{version}/lisp/chistory.elc
 %{_datadir}/emacs/%{version}/lisp/cmuscheme.elc
+%{_datadir}/emacs/%{version}/lisp/color.elc
 %{_datadir}/emacs/%{version}/lisp/comint.elc
-%{_datadir}/emacs/%{version}/lisp/compare-w.elc
-%{_datadir}/emacs/%{version}/lisp/complete.elc
 %{_datadir}/emacs/%{version}/lisp/completion.elc
 %{_datadir}/emacs/%{version}/lisp/composite.elc
 %{_datadir}/emacs/%{version}/lisp/cus-dep.elc
@@ -1763,15 +1843,12 @@ done
 %{_datadir}/emacs/%{version}/lisp/cus-start.el
 %{_datadir}/emacs/%{version}/lisp/cus-theme.elc
 %{_datadir}/emacs/%{version}/lisp/custom.elc
-%{_datadir}/emacs/%{version}/lisp/cvs-status.elc
 %{_datadir}/emacs/%{version}/lisp/dabbrev.elc
 %{_datadir}/emacs/%{version}/lisp/delim-col.elc
 %{_datadir}/emacs/%{version}/lisp/delsel.elc
 %{_datadir}/emacs/%{version}/lisp/descr-text.elc
 %{_datadir}/emacs/%{version}/lisp/desktop.elc
 %{_datadir}/emacs/%{version}/lisp/dframe.elc
-%{_datadir}/emacs/%{version}/lisp/diff-mode.elc
-%{_datadir}/emacs/%{version}/lisp/diff.elc
 %{_datadir}/emacs/%{version}/lisp/dired-aux.elc
 %{_datadir}/emacs/%{version}/lisp/dired-x.elc
 %{_datadir}/emacs/%{version}/lisp/dired.elc
@@ -1783,19 +1860,9 @@ done
 %{_datadir}/emacs/%{version}/lisp/dos-vars.elc
 %{_datadir}/emacs/%{version}/lisp/dos-w32.elc
 %{_datadir}/emacs/%{version}/lisp/double.elc
+%{_datadir}/emacs/%{version}/lisp/dynamic-setting.elc
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.elc
 %{_datadir}/emacs/%{version}/lisp/echistory.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-diff.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-help.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-hook.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-init.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-merg.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-mult.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-ptch.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-util.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-vers.elc
-%{_datadir}/emacs/%{version}/lisp/ediff-wind.elc
-%{_datadir}/emacs/%{version}/lisp/ediff.elc
 %{_datadir}/emacs/%{version}/lisp/edmacro.elc
 %{_datadir}/emacs/%{version}/lisp/ehelp.elc
 %{_datadir}/emacs/%{version}/lisp/electric.elc
@@ -1812,6 +1879,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/byte-opt.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/byte-run.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/bytecomp.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cconv.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/chart.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/check-declare.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.elc
@@ -1832,15 +1900,16 @@ done
 %{_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-comp.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-speedbar.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-opt.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-speedbar.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eldoc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/elint.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/elp.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-x.elc
+%{_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
@@ -1853,6 +1922,9 @@ done
 %{_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/package-x.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/pcase.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pp.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/re-builder.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/regexp-opt.elc
@@ -1861,8 +1933,8 @@ done
 %{_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/sregex.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
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-unsafep.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.elc
@@ -1872,7 +1944,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/unsafep.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/warnings.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lock.elc
-%{_datadir}/emacs/%{version}/lisp/emerge.elc
 %dir %{_datadir}/emacs/%{version}/lisp/emulation/
 %{_datadir}/emacs/%{version}/lisp/emulation/crisp.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/cua-base.elc
@@ -1884,8 +1955,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/emulation/edt-vt100.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/edt.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/keypad.elc
-%{_datadir}/emacs/%{version}/lisp/emulation/pc-mode.elc
-%{_datadir}/emacs/%{version}/lisp/emulation/pc-select.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-edt.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-extras.elc
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-mapper.elc
@@ -1918,7 +1987,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/erc/erc-ezbounce.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-fill.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-goodies.elc
-%{_datadir}/emacs/%{version}/lisp/erc/erc-hecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-ibuffer.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-identd.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-imenu.elc
@@ -1970,7 +2038,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-module.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-opt.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-proc.elc
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-test.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-util.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-var.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/eshell.elc
@@ -1981,8 +2048,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/faces.elc
 %{_datadir}/emacs/%{version}/lisp/ffap.elc
 %{_datadir}/emacs/%{version}/lisp/filecache.elc
-%{_datadir}/emacs/%{version}/lisp/files.elc
 %{_datadir}/emacs/%{version}/lisp/files-x.elc
+%{_datadir}/emacs/%{version}/lisp/files.elc
 %{_datadir}/emacs/%{version}/lisp/filesets.elc
 %{_datadir}/emacs/%{version}/lisp/find-cmd.elc
 %{_datadir}/emacs/%{version}/lisp/find-dired.elc
@@ -1995,7 +2062,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/follow.elc
 %{_datadir}/emacs/%{version}/lisp/font-core.elc
 %{_datadir}/emacs/%{version}/lisp/font-lock.elc
-%{_datadir}/emacs/%{version}/lisp/font-setting.elc
 %{_datadir}/emacs/%{version}/lisp/format-spec.elc
 %{_datadir}/emacs/%{version}/lisp/format.elc
 %{_datadir}/emacs/%{version}/lisp/forms-d2.el
@@ -2005,18 +2071,17 @@ done
 %{_datadir}/emacs/%{version}/lisp/fringe.elc
 %{_datadir}/emacs/%{version}/lisp/generic-x.el
 %dir %{_datadir}/emacs/%{version}/lisp/gnus/
+%{_datadir}/emacs/%{version}/lisp/gnus/.dir-locals.el
 %{_datadir}/emacs/%{version}/lisp/gnus/auth-source.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/canlock.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/compface.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/earcon.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/ecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/flow-fill.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gmm-utils.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-agent.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-art.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-async.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-audio.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-bcklg.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-bookmark.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cache.elc
@@ -2031,16 +2096,16 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-eform.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ems.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-fun.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-html.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
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mh.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ml.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mlspl.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-move.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-msg.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-nocem.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-picon.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-range.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-registry.elc
@@ -2048,11 +2113,11 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-setup.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-soup.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-spec.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-srvr.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-start.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sum.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-sync.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-topic.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-undo.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-util.elc
@@ -2060,6 +2125,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-vm.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gravatar.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gssapi.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/html2text.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/ietf-drums.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.elc
@@ -2085,7 +2152,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/mml2015.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnagent.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnbabyl.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nndb.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nndiary.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nndir.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nndoc.elc
@@ -2096,8 +2162,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/nnheader.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnimap.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnir.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnkiboze.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnlistserv.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmail.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmaildir.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmairix.elc
@@ -2106,24 +2170,25 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/nnml.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnnil.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnoo.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/nnregistry.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnrss.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnslashdot.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnsoup.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnspool.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nntp.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnultimate.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnwarchive.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/nnweb.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnwfm.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/plstore.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/pop3.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/qp.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/registry.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc1843.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2045.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2047.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2104.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2231.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/rtree.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/score-mode.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/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
@@ -2135,7 +2200,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/spam.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/starttls.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/utf7.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/webmail.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/yenc.elc
 %{_datadir}/emacs/%{version}/lisp/gs.elc
 %{_datadir}/emacs/%{version}/lisp/help-at-pt.elc
@@ -2195,6 +2259,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/international/quail.elc
 %{_datadir}/emacs/%{version}/lisp/international/robin.elc
 %{_datadir}/emacs/%{version}/lisp/international/titdic-cnv.elc
+%{_datadir}/emacs/%{version}/lisp/international/ucs-normalize.elc
 %{_datadir}/emacs/%{version}/lisp/international/uni-bidi.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-category.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-combining.el
@@ -2209,7 +2274,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/international/uni-old-name.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-titlecase.el
 %{_datadir}/emacs/%{version}/lisp/international/uni-uppercase.el
-%{_datadir}/emacs/%{version}/lisp/international/ucs-normalize.elc
 %{_datadir}/emacs/%{version}/lisp/international/utf-7.elc
 %{_datadir}/emacs/%{version}/lisp/isearch.elc
 %{_datadir}/emacs/%{version}/lisp/isearchb.elc
@@ -2235,7 +2299,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/language/georgian.el
 %{_datadir}/emacs/%{version}/lisp/language/greek.el
 %{_datadir}/emacs/%{version}/lisp/language/hanja-util.elc
-%{_datadir}/emacs/%{version}/lisp/language/hebrew.el
+%{_datadir}/emacs/%{version}/lisp/language/hebrew.elc
 %{_datadir}/emacs/%{version}/lisp/language/ind-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/indian.elc
 %{_datadir}/emacs/%{version}/lisp/language/japan-util.elc
@@ -2266,8 +2330,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/loadhist.elc
 %{_datadir}/emacs/%{version}/lisp/loadup.el
 %{_datadir}/emacs/%{version}/lisp/locate.elc
-%{_datadir}/emacs/%{version}/lisp/log-edit.elc
-%{_datadir}/emacs/%{version}/lisp/log-view.elc
 %{_datadir}/emacs/%{version}/lisp/longlines.elc
 %{_datadir}/emacs/%{version}/lisp/lpr.elc
 %{_datadir}/emacs/%{version}/lisp/ls-lisp.elc
@@ -2368,15 +2430,16 @@ done
 %{_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/gnutls.elc
 %{_datadir}/emacs/%{version}/lisp/net/goto-addr.elc
 %{_datadir}/emacs/%{version}/lisp/net/hmac-def.elc
 %{_datadir}/emacs/%{version}/lisp/net/hmac-md5.elc
 %{_datadir}/emacs/%{version}/lisp/net/imap.elc
-%{_datadir}/emacs/%{version}/lisp/net/imap-hash.elc
 %{_datadir}/emacs/%{version}/lisp/net/ldap.elc
 %{_datadir}/emacs/%{version}/lisp/net/mairix.elc
 %{_datadir}/emacs/%{version}/lisp/net/net-utils.elc
 %{_datadir}/emacs/%{version}/lisp/net/netrc.elc
+%{_datadir}/emacs/%{version}/lisp/net/network-stream.elc
 %{_datadir}/emacs/%{version}/lisp/net/newst-backend.elc
 %{_datadir}/emacs/%{version}/lisp/net/newst-plainview.elc
 %{_datadir}/emacs/%{version}/lisp/net/newst-reader.elc
@@ -2392,18 +2455,21 @@ done
 %{_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/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-cache.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-fish.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-imap.elc
+%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.elc
+%{_datadir}/emacs/%{version}/lisp/net/tramp-loaddefs.el
+%{_datadir}/emacs/%{version}/lisp/net/tramp-sh.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-smb.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-uu.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp.elc
@@ -2412,9 +2478,9 @@ done
 %{_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
 %{_datadir}/emacs/%{version}/lisp/novice.elc
 %dir %{_datadir}/emacs/%{version}/lisp/nxml/
-%{_datadir}/emacs/%{version}/lisp/nxml/TODO
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-enc.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-glyph.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-maint.elc
@@ -2440,8 +2506,11 @@ done
 %{_datadir}/emacs/%{version}/lisp/nxml/xmltok.elc
 %{_datadir}/emacs/%{version}/lisp/nxml/xsd-regexp.elc
 %dir %{_datadir}/emacs/%{version}/lisp/obsolete/
+%{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/complete.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/erc-hecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.elc
@@ -2451,32 +2520,92 @@ done
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.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/pc-mode.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/pc-select.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-def.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-gpg.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-parse.elc
+%{_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/resume.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/rnews.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/rnewspost.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/sc.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/s-region.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/scribe.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/spell.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/sregex.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/swedish.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/vc-mcvs.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/x-menu.elc
 %dir %{_datadir}/emacs/%{version}/lisp/org/
+%{_datadir}/emacs/%{version}/lisp/org/ob-C.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-R.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-awk.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-calc.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-clojure.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-comint.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-css.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-dot.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-eval.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-exp.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-fortran.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-haskell.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-java.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-js.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-keys.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-latex.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ledger.elc
+%{_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-matlab.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-maxima.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ocaml.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-octave.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-org.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-perl.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-python.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ref.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-ruby.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-sass.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-scheme.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-screen.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-sh.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-shen.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-sql.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-table.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-tangle.elc
+%{_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
 %{_datadir}/emacs/%{version}/lisp/org/org-colview.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-compat.elc
 %{_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-exp.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-docview.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
@@ -2494,19 +2623,25 @@ done
 %{_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-lparse.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-mac-message.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-vm.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-w3m.elc
@@ -2524,17 +2659,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/pcmpl-rpm.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-unix.elc
 %{_datadir}/emacs/%{version}/lisp/pcomplete.elc
-%{_datadir}/emacs/%{version}/lisp/pcvs-defs.elc
-%{_datadir}/emacs/%{version}/lisp/pcvs-info.elc
-%{_datadir}/emacs/%{version}/lisp/pcvs-parse.elc
-%{_datadir}/emacs/%{version}/lisp/pcvs-util.elc
-%{_datadir}/emacs/%{version}/lisp/pcvs.elc
-%{_datadir}/emacs/%{version}/lisp/pgg-def.elc
-%{_datadir}/emacs/%{version}/lisp/pgg-gpg.elc
-%{_datadir}/emacs/%{version}/lisp/pgg-parse.elc
-%{_datadir}/emacs/%{version}/lisp/pgg-pgp.elc
-%{_datadir}/emacs/%{version}/lisp/pgg-pgp5.elc
-%{_datadir}/emacs/%{version}/lisp/pgg.elc
 %dir %{_datadir}/emacs/%{version}/lisp/play/
 %{_datadir}/emacs/%{version}/lisp/play/5x5.elc
 %{_datadir}/emacs/%{version}/lisp/play/animate.elc
@@ -2585,6 +2709,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-defs.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-engine.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-fonts.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/cc-guess.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-langs.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-menus.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-mode.elc
@@ -2612,7 +2737,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/progmodes/f90.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/flymake.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/fortran.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/gdb-ui.elc
+%{_datadir}/emacs/%{version}/lisp/progmodes/gdb-mi.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/glasses.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/grep.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/gud.elc
@@ -2667,7 +2792,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/rfn-eshadow.elc
 %{_datadir}/emacs/%{version}/lisp/rot13.elc
 %{_datadir}/emacs/%{version}/lisp/ruler-mode.elc
-%{_datadir}/emacs/%{version}/lisp/s-region.elc
 %{_datadir}/emacs/%{version}/lisp/savehist.elc
 %{_datadir}/emacs/%{version}/lisp/saveplace.elc
 %{_datadir}/emacs/%{version}/lisp/sb-image.elc
@@ -2677,13 +2801,11 @@ done
 %{_datadir}/emacs/%{version}/lisp/select.elc
 %{_datadir}/emacs/%{version}/lisp/server.elc
 %{_datadir}/emacs/%{version}/lisp/ses.elc
-%{_datadir}/emacs/%{version}/lisp/sha1.elc
 %{_datadir}/emacs/%{version}/lisp/shadowfile.elc
 %{_datadir}/emacs/%{version}/lisp/shell.elc
 %{_datadir}/emacs/%{version}/lisp/simple.elc
 %{_datadir}/emacs/%{version}/lisp/site-load.el
 %{_datadir}/emacs/%{version}/lisp/skeleton.el
-%{_datadir}/emacs/%{version}/lisp/smerge-mode.elc
 %{_datadir}/emacs/%{version}/lisp/sort.elc
 %{_datadir}/emacs/%{version}/lisp/soundex.elc
 %{_datadir}/emacs/%{version}/lisp/speedbar.elc
@@ -2697,8 +2819,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/tar-mode.elc
 %{_datadir}/emacs/%{version}/lisp/tempo.elc
 %{_datadir}/emacs/%{version}/lisp/term.elc
-%{_datadir}/emacs/%{version}/lisp/term/AT386.el
 %dir %{_datadir}/emacs/%{version}/lisp/term/
+%{_datadir}/emacs/%{version}/lisp/term/AT386.el
 %doc %{_datadir}/emacs/%{version}/lisp/term/README
 %{_datadir}/emacs/%{version}/lisp/term/apollo.el
 %{_datadir}/emacs/%{version}/lisp/term/bobcat.el
@@ -2712,6 +2834,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/term/ns-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/pc-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/rxvt.elc
+%{_datadir}/emacs/%{version}/lisp/term/screen.el
 %{_datadir}/emacs/%{version}/lisp/term/sun.elc
 %{_datadir}/emacs/%{version}/lisp/term/sup-mouse.elc
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.elc
@@ -2769,7 +2892,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/textmodes/remember.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/rst.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/sgml-mode.elc
-%{_datadir}/emacs/%{version}/lisp/textmodes/spell.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/table.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/tex-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/texinfmt.elc
@@ -2802,6 +2924,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/url/url-expand.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-file.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-ftp.elc
+%{_datadir}/emacs/%{version}/lisp/url/url-future.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-gw.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-handlers.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-history.elc
@@ -2818,25 +2941,52 @@ done
 %{_datadir}/emacs/%{version}/lisp/url/url-parse.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-privacy.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-proxy.elc
+%{_datadir}/emacs/%{version}/lisp/url/url-queue.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-util.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-vars.elc
 %{_datadir}/emacs/%{version}/lisp/url/url.elc
 %{_datadir}/emacs/%{version}/lisp/userlock.elc
-%{_datadir}/emacs/%{version}/lisp/vc-annotate.elc
-%{_datadir}/emacs/%{version}/lisp/vc-arch.elc
-%{_datadir}/emacs/%{version}/lisp/vc-bzr.elc
-%{_datadir}/emacs/%{version}/lisp/vc-cvs.elc
-%{_datadir}/emacs/%{version}/lisp/vc-dav.elc
-%{_datadir}/emacs/%{version}/lisp/vc-dir.elc
-%{_datadir}/emacs/%{version}/lisp/vc-dispatcher.elc
-%{_datadir}/emacs/%{version}/lisp/vc-git.elc
-%{_datadir}/emacs/%{version}/lisp/vc-hg.elc
-%{_datadir}/emacs/%{version}/lisp/vc-hooks.elc
-%{_datadir}/emacs/%{version}/lisp/vc-mtn.elc
-%{_datadir}/emacs/%{version}/lisp/vc-rcs.elc
-%{_datadir}/emacs/%{version}/lisp/vc-sccs.elc
-%{_datadir}/emacs/%{version}/lisp/vc-svn.elc
-%{_datadir}/emacs/%{version}/lisp/vc.elc
+%dir %{_datadir}/emacs/%{version}/lisp/vc/
+%{_datadir}/emacs/%{version}/lisp/vc/add-log.elc
+%{_datadir}/emacs/%{version}/lisp/vc/compare-w.elc
+%{_datadir}/emacs/%{version}/lisp/vc/cvs-status.elc
+%{_datadir}/emacs/%{version}/lisp/vc/diff-mode.elc
+%{_datadir}/emacs/%{version}/lisp/vc/diff.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-diff.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-help.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-hook.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-init.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-merg.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-mult.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-ptch.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-util.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-vers.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-wind.elc
+%{_datadir}/emacs/%{version}/lisp/vc/ediff.elc
+%{_datadir}/emacs/%{version}/lisp/vc/emerge.elc
+%{_datadir}/emacs/%{version}/lisp/vc/log-edit.elc
+%{_datadir}/emacs/%{version}/lisp/vc/log-view.elc
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-defs.elc
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-info.elc
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-parse.elc
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-util.elc
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs.elc
+%{_datadir}/emacs/%{version}/lisp/vc/smerge-mode.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-annotate.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-arch.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-bzr.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-cvs.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dav.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dir.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dispatcher.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-git.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-hg.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-hooks.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-mtn.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-rcs.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-sccs.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc-svn.elc
+%{_datadir}/emacs/%{version}/lisp/vc/vc.elc
 %{_datadir}/emacs/%{version}/lisp/vcursor.elc
 %{_datadir}/emacs/%{version}/lisp/version.el
 %{_datadir}/emacs/%{version}/lisp/view.elc
@@ -2899,7 +3049,6 @@ done
 
 %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
@@ -2917,49 +3066,13 @@ done
 %{_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.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/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/welsh.el.gz
 %{_datadir}/emacs/%{version}/lisp/abbrev.el.gz
-%{_datadir}/emacs/%{version}/lisp/abbrevlist.el.gz
-%{_datadir}/emacs/%{version}/lisp/add-log.el.gz
 %{_datadir}/emacs/%{version}/lisp/align.el.gz
+%{_datadir}/emacs/%{version}/lisp/allout-widgets.el.gz
 %{_datadir}/emacs/%{version}/lisp/allout.el.gz
 %{_datadir}/emacs/%{version}/lisp/ansi-color.el.gz
 %{_datadir}/emacs/%{version}/lisp/apropos.el.gz
@@ -3046,6 +3159,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/calendar/timeclock.el.gz
 %{_datadir}/emacs/%{version}/lisp/calendar/todo-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/case-table.el.gz
+%{_datadir}/emacs/%{version}/lisp/cdl.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/cedet-cscope.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/cedet-files.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/cedet-global.el.gz
@@ -3134,8 +3248,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar-wy.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/html.el.gz
-%{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia-sb.el.gz
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/idle.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/imenu.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/java.el.gz
@@ -3194,12 +3308,10 @@ done
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/table.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/template.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/texi.el.gz
-%{_datadir}/emacs/%{version}/lisp/cdl.el.gz
 %{_datadir}/emacs/%{version}/lisp/chistory.el.gz
 %{_datadir}/emacs/%{version}/lisp/cmuscheme.el.gz
+%{_datadir}/emacs/%{version}/lisp/color.el.gz
 %{_datadir}/emacs/%{version}/lisp/comint.el.gz
-%{_datadir}/emacs/%{version}/lisp/compare-w.el.gz
-%{_datadir}/emacs/%{version}/lisp/complete.el.gz
 %{_datadir}/emacs/%{version}/lisp/completion.el.gz
 %{_datadir}/emacs/%{version}/lisp/composite.el.gz
 %{_datadir}/emacs/%{version}/lisp/cus-dep.el.gz
@@ -3207,15 +3319,12 @@ done
 %{_datadir}/emacs/%{version}/lisp/cus-face.el.gz
 %{_datadir}/emacs/%{version}/lisp/cus-theme.el.gz
 %{_datadir}/emacs/%{version}/lisp/custom.el.gz
-%{_datadir}/emacs/%{version}/lisp/cvs-status.el.gz
 %{_datadir}/emacs/%{version}/lisp/dabbrev.el.gz
 %{_datadir}/emacs/%{version}/lisp/delim-col.el.gz
 %{_datadir}/emacs/%{version}/lisp/delsel.el.gz
 %{_datadir}/emacs/%{version}/lisp/descr-text.el.gz
 %{_datadir}/emacs/%{version}/lisp/desktop.el.gz
 %{_datadir}/emacs/%{version}/lisp/dframe.el.gz
-%{_datadir}/emacs/%{version}/lisp/diff-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/diff.el.gz
 %{_datadir}/emacs/%{version}/lisp/dired-aux.el.gz
 %{_datadir}/emacs/%{version}/lisp/dired-x.el.gz
 %{_datadir}/emacs/%{version}/lisp/dired.el.gz
@@ -3227,19 +3336,9 @@ done
 %{_datadir}/emacs/%{version}/lisp/dos-vars.el.gz
 %{_datadir}/emacs/%{version}/lisp/dos-w32.el.gz
 %{_datadir}/emacs/%{version}/lisp/double.el.gz
+%{_datadir}/emacs/%{version}/lisp/dynamic-setting.el.gz
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.el.gz
 %{_datadir}/emacs/%{version}/lisp/echistory.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-diff.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-help.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-hook.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-init.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-merg.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-mult.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-ptch.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-util.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-vers.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff-wind.el.gz
-%{_datadir}/emacs/%{version}/lisp/ediff.el.gz
 %{_datadir}/emacs/%{version}/lisp/edmacro.el.gz
 %{_datadir}/emacs/%{version}/lisp/ehelp.el.gz
 %{_datadir}/emacs/%{version}/lisp/electric.el.gz
@@ -3255,6 +3354,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/byte-opt.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/byte-run.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/bytecomp.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cconv.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/chart.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/check-declare.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.el.gz
@@ -3273,15 +3373,16 @@ done
 %{_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-comp.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-speedbar.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-opt.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio-speedbar.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eieio.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/eldoc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/elint.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/elp.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-x.el.gz
+%{_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
@@ -3294,6 +3395,9 @@ done
 %{_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/package-x.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/pcase.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pp.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/re-builder.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/regexp-opt.el.gz
@@ -3302,8 +3406,8 @@ done
 %{_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/sregex.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
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-unsafep.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.el.gz
@@ -3313,7 +3417,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/unsafep.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/warnings.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lock.el.gz
-%{_datadir}/emacs/%{version}/lisp/emerge.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/crisp.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/cua-base.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/cua-gmrk.el.gz
@@ -3324,8 +3427,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/emulation/edt-vt100.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/edt.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/keypad.el.gz
-%{_datadir}/emacs/%{version}/lisp/emulation/pc-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/emulation/pc-select.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-edt.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-extras.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/tpu-mapper.el.gz
@@ -3357,7 +3458,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/erc/erc-ezbounce.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-fill.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-goodies.el.gz
-%{_datadir}/emacs/%{version}/lisp/erc/erc-hecomplete.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-ibuffer.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-identd.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-imenu.el.gz
@@ -3407,7 +3507,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-module.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-opt.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-proc.el.gz
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-test.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-var.el.gz
 %{_datadir}/emacs/%{version}/lisp/eshell/eshell.el.gz
@@ -3418,8 +3517,8 @@ done
 %{_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/files.el.gz
 %{_datadir}/emacs/%{version}/lisp/files-x.el.gz
+%{_datadir}/emacs/%{version}/lisp/files.el.gz
 %{_datadir}/emacs/%{version}/lisp/filesets.el.gz
 %{_datadir}/emacs/%{version}/lisp/find-cmd.el.gz
 %{_datadir}/emacs/%{version}/lisp/find-dired.el.gz
@@ -3431,7 +3530,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/follow.el.gz
 %{_datadir}/emacs/%{version}/lisp/font-core.el.gz
 %{_datadir}/emacs/%{version}/lisp/font-lock.el.gz
-%{_datadir}/emacs/%{version}/lisp/font-setting.el.gz
 %{_datadir}/emacs/%{version}/lisp/format-spec.el.gz
 %{_datadir}/emacs/%{version}/lisp/format.el.gz
 %{_datadir}/emacs/%{version}/lisp/forms.el.gz
@@ -3441,14 +3539,12 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/canlock.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/compface.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/earcon.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/ecomplete.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/flow-fill.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gmm-utils.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-agent.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-art.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-async.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-audio.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-bcklg.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-bookmark.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cache.el.gz
@@ -3463,16 +3559,16 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-eform.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ems.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-fun.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-gravatar.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-group.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-html.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
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mh.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ml.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mlspl.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-move.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-msg.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-nocem.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-picon.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-range.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-registry.el.gz
@@ -3480,11 +3576,11 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-setup.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/gnus-soup.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-spec.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-srvr.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-start.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sum.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-sync.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-topic.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-undo.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-util.el.gz
@@ -3492,6 +3588,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-vm.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gravatar.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gssapi.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/html2text.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/ietf-drums.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.el.gz
@@ -3517,7 +3615,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/mml2015.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnagent.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnbabyl.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nndb.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nndiary.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nndir.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nndoc.el.gz
@@ -3528,8 +3625,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/nnheader.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnimap.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnir.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnkiboze.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnlistserv.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmail.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmaildir.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnmairix.el.gz
@@ -3538,24 +3633,25 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/nnml.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnnil.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnoo.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/nnregistry.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnrss.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnslashdot.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnsoup.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnspool.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nntp.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnultimate.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnwarchive.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/nnweb.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/nnwfm.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/plstore.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/pop3.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/qp.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/registry.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc1843.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2045.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2047.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2104.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/rfc2231.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/rtree.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/score-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/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
@@ -3567,7 +3663,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/gnus/spam.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/starttls.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/utf7.el.gz
-%{_datadir}/emacs/%{version}/lisp/gnus/webmail.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/yenc.el.gz
 %{_datadir}/emacs/%{version}/lisp/gs.el.gz
 %{_datadir}/emacs/%{version}/lisp/help-at-pt.el.gz
@@ -3613,8 +3708,8 @@ done
 %{_datadir}/emacs/%{version}/lisp/international/kkc.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/latexenc.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/latin1-disp.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/mule-conf.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/mule-cmds.el.gz
+%{_datadir}/emacs/%{version}/lisp/international/mule-conf.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/mule-diag.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/mule-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/mule.el.gz
@@ -3641,6 +3736,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/language/ethiopic.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/european.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/hanja-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/hebrew.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/ind-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/indian.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/japan-util.el.gz
@@ -3657,8 +3753,6 @@ done
 %{_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/log-edit.el.gz
-%{_datadir}/emacs/%{version}/lisp/log-view.el.gz
 %{_datadir}/emacs/%{version}/lisp/longlines.el.gz
 %{_datadir}/emacs/%{version}/lisp/lpr.el.gz
 %{_datadir}/emacs/%{version}/lisp/ls-lisp.el.gz
@@ -3751,15 +3845,16 @@ done
 %{_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/gnutls.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/goto-addr.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/hmac-def.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/hmac-md5.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/imap.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/imap-hash.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/ldap.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/mairix.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/net-utils.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/netrc.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/network-stream.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/newst-backend.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/newst-plainview.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/newst-reader.el.gz
@@ -3775,18 +3870,20 @@ done
 %{_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/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-cache.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-compat.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/tramp-fish.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/tramp-imap.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/tramp-gw.el.gz
+%{_datadir}/emacs/%{version}/lisp/net/tramp-sh.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-smb.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp-uu.el.gz
 %{_datadir}/emacs/%{version}/lisp/net/tramp.el.gz
@@ -3795,6 +3892,7 @@ done
 %{_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
 %{_datadir}/emacs/%{version}/lisp/novice.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-enc.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/nxml-glyph.el.gz
@@ -3820,8 +3918,11 @@ done
 %{_datadir}/emacs/%{version}/lisp/nxml/rng-xsd.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/xmltok.el.gz
 %{_datadir}/emacs/%{version}/lisp/nxml/xsd-regexp.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/complete.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/erc-hecomplete.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.el.gz
@@ -3830,31 +3931,91 @@ done
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.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/pc-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/pc-select.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-def.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-gpg.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/pgg-parse.el.gz
+%{_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/resume.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/rnews.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/rnewspost.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/sc.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/swedish.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/vc-mcvs.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/x-menu.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
+%{_datadir}/emacs/%{version}/lisp/org/ob-awk.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-calc.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-clojure.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-comint.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-css.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-dot.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-eval.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-exp.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-fortran.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-haskell.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-java.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-js.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-keys.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-latex.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ledger.el.gz
+%{_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-matlab.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-maxima.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ocaml.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-octave.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-org.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-perl.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-python.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ref.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-ruby.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-sass.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-scheme.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-screen.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-sh.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-shen.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-sql.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-table.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-tangle.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-agenda.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-ascii.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
 %{_datadir}/emacs/%{version}/lisp/org/org-colview.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-compat.el.gz
 %{_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-exp.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-docview.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
@@ -3872,19 +4033,25 @@ done
 %{_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-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
@@ -3900,17 +4067,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/pcmpl-rpm.el.gz
 %{_datadir}/emacs/%{version}/lisp/pcmpl-unix.el.gz
 %{_datadir}/emacs/%{version}/lisp/pcomplete.el.gz
-%{_datadir}/emacs/%{version}/lisp/pcvs-defs.el.gz
-%{_datadir}/emacs/%{version}/lisp/pcvs-info.el.gz
-%{_datadir}/emacs/%{version}/lisp/pcvs-parse.el.gz
-%{_datadir}/emacs/%{version}/lisp/pcvs-util.el.gz
-%{_datadir}/emacs/%{version}/lisp/pcvs.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg-def.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg-gpg.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg-parse.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg-pgp.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg-pgp5.el.gz
-%{_datadir}/emacs/%{version}/lisp/pgg.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/5x5.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/animate.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/blackbox.el.gz
@@ -3958,6 +4114,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-defs.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-engine.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-fonts.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/cc-guess.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-langs.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-menus.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/cc-mode.el.gz
@@ -3985,7 +4142,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/progmodes/f90.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/flymake.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/fortran.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/gdb-ui.el.gz
+%{_datadir}/emacs/%{version}/lisp/progmodes/gdb-mi.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/glasses.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/grep.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/gud.el.gz
@@ -4040,7 +4197,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/rfn-eshadow.el.gz
 %{_datadir}/emacs/%{version}/lisp/rot13.el.gz
 %{_datadir}/emacs/%{version}/lisp/ruler-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/s-region.el.gz
 %{_datadir}/emacs/%{version}/lisp/savehist.el.gz
 %{_datadir}/emacs/%{version}/lisp/saveplace.el.gz
 %{_datadir}/emacs/%{version}/lisp/sb-image.el.gz
@@ -4050,11 +4206,9 @@ done
 %{_datadir}/emacs/%{version}/lisp/select.el.gz
 %{_datadir}/emacs/%{version}/lisp/server.el.gz
 %{_datadir}/emacs/%{version}/lisp/ses.el.gz
-%{_datadir}/emacs/%{version}/lisp/sha1.el.gz
 %{_datadir}/emacs/%{version}/lisp/shadowfile.el.gz
 %{_datadir}/emacs/%{version}/lisp/shell.el.gz
 %{_datadir}/emacs/%{version}/lisp/simple.el.gz
-%{_datadir}/emacs/%{version}/lisp/smerge-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/sort.el.gz
 %{_datadir}/emacs/%{version}/lisp/soundex.el.gz
 %{_datadir}/emacs/%{version}/lisp/speedbar.el.gz
@@ -4116,7 +4270,6 @@ done
 %{_datadir}/emacs/%{version}/lisp/textmodes/remember.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/rst.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/sgml-mode.el.gz
-%{_datadir}/emacs/%{version}/lisp/textmodes/spell.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/table.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/tex-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/texinfmt.el.gz
@@ -4148,6 +4301,7 @@ done
 %{_datadir}/emacs/%{version}/lisp/url/url-expand.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-file.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-ftp.el.gz
+%{_datadir}/emacs/%{version}/lisp/url/url-future.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-gw.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-handlers.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-history.el.gz
@@ -4164,25 +4318,51 @@ done
 %{_datadir}/emacs/%{version}/lisp/url/url-parse.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-privacy.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-proxy.el.gz
+%{_datadir}/emacs/%{version}/lisp/url/url-queue.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-vars.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url.el.gz
 %{_datadir}/emacs/%{version}/lisp/userlock.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-annotate.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-arch.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-bzr.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-cvs.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-dav.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-dir.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-dispatcher.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-git.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-hg.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-hooks.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-mtn.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-rcs.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-sccs.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc-svn.el.gz
-%{_datadir}/emacs/%{version}/lisp/vc.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/add-log.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/compare-w.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/cvs-status.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/diff-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/diff.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-diff.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-help.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-hook.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-init.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-merg.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-mult.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-ptch.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-vers.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff-wind.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/ediff.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/emerge.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/log-edit.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/log-view.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-defs.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-info.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-parse.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/pcvs.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/smerge-mode.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-annotate.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-arch.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-bzr.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-cvs.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dav.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dir.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-dispatcher.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-git.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-hg.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-hooks.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-mtn.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-rcs.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-sccs.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc-svn.el.gz
+%{_datadir}/emacs/%{version}/lisp/vc/vc.el.gz
 %{_datadir}/emacs/%{version}/lisp/vcursor.el.gz
 %{_datadir}/emacs/%{version}/lisp/view.el.gz
 %{_datadir}/emacs/%{version}/lisp/vt-control.el.gz