Accepting request 176480 from editors

- Make emacs launch script smart, that is search for a valid dbus
  on the current system if if not found launch a own dbus session
- With emacs version 24.3 the package epg becoes obsolate

- Update to to emacs version 24.3
  * Emacs no longer searches for `leim-list.el' files beneath the standard
    lisp/ directory.  There should not be any there anyway.  If you have
    been adding them there, put them somewhere else; e.g., site-lisp.
  * `C-h f' (`describe-function') can now perform autoloading.
    When this command is called for an autoloaded function whose docstring
    contains a key substitution construct, that function's library is
    automatically loaded, so that the documentation can be shown
    correctly.  To disable this, set `help-enable-auto-load' to nil.
  * `C-h f' now reports previously-autoloaded functions as "autoloaded",
    even after their associated libraries have been loaded (and the
    autoloads have been redefined as functions).
  * Images displayed via ImageMagick now support transparency and the
    :background image specification property.
  * When available, ImageMagick support is automatically enabled.
    It is no longer necessary to call `imagemagick-register-types'
    explicitly to install ImageMagick image types; that function is called
    automatically at startup, or when customizing an imagemagick- option.
  * Setting `imagemagick-types-inhibit' to t now disables the use of
    ImageMagick to view images.  (You must call `imagemagick-register-types'
    afterwards if you do not use customize to change this.)
  * The new variable `imagemagick-enabled-types' also affects which
    ImageMagick types are treated as images.  The function
    `imagemagick-filter-types' returns the list of types that will be
    treated as images.
  * In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the

OBS-URL: https://build.opensuse.org/request/show/176480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=93

emacs-24.1-decl.dif

@@ -1,12 +0,0 @@
---- src/frame.c
-+++ 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>
- #include <ctype.h>
-+#ifdef STDC_HEADERS
-+#include <stdlib.h>
-+#endif
- #include <errno.h>
- #include <limits.h>
- #include <setjmp.h>

emacs-24.1-s390x.dif

@@ -1,12 +0,0 @@
---- 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

emacs-24.1-tinfo.dif

@@ -1,114 +0,0 @@
---- configure
-+++ configure
-@@ -14296,7 +14296,7 @@ $as_echo_n "checking for library contain
- 
- # 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 terminfo termcap curses; do
-   OLIBS=$LIBS
-   if test -z "$tputs_library"; then
-     LIBS_TERMCAP=
-@@ -14374,22 +14374,15 @@ HAVE_LIBNCURSES=yes
- ## Note only system files NOT using terminfo are:
- ## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
- ## darwin|gnu without ncurses.
--TERMINFO=no
-+TERMINFO=yes
- case "$opsys" in
--  ## cygwin: Fewer environment variables to go wrong, more terminal types.
--  ## hpux10-20: Use the system provided termcap(3) library.
--  ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
--  ##  is necessary.  Otherwise Emacs dumps core when run -nw.
--  aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;;
--
-   ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2.
-   ##  The ncurses library has been moved out of the System framework in
-   ##  Mac OS X 10.2.  So if configure detects it, set the command-line
-   ##  option to use it.
-   darwin|gnu*)
-     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
--    if test "x$HAVE_LIBNCURSES" = "xyes"; then
--      TERMINFO=yes
-+    if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
-       LIBS_TERMCAP="-lncurses"
-     fi
-     ;;
-@@ -14428,17 +14421,16 @@ fi
- $as_echo "$emacs_cv_freebsd_terminfo" >&6; }
- 
-     if test $emacs_cv_freebsd_terminfo = yes; then
--      TERMINFO=yes
-       LIBS_TERMCAP="-lncurses"
-     else
-+      TERMINFO=no
-       LIBS_TERMCAP="-ltermcap"
-     fi
-     ;;
- 
-   netbsd)
--    if test "x$LIBS_TERMCAP" = "x-lterminfo"; then
--      TERMINFO=yes
--    else
-+    if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
-+      TERMINFO=no
-       LIBS_TERMCAP="-ltermcap"
-     fi
-     ;;
---- configure.in
-+++ configure.in
-@@ -2805,7 +2805,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 terminfo termcap curses; do
-   OLIBS=$LIBS
-   if test -z "$tputs_library"; then
-     LIBS_TERMCAP=
-@@ -2841,22 +2841,15 @@ HAVE_LIBNCURSES=yes
- ## Note only system files NOT using terminfo are:
- ## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
- ## darwin|gnu without ncurses.
--TERMINFO=no
-+TERMINFO=yes
- case "$opsys" in
--  ## cygwin: Fewer environment variables to go wrong, more terminal types.
--  ## hpux10-20: Use the system provided termcap(3) library.
--  ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
--  ##  is necessary.  Otherwise Emacs dumps core when run -nw.
--  aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;;
--
-   ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2.
-   ##  The ncurses library has been moved out of the System framework in
-   ##  Mac OS X 10.2.  So if configure detects it, set the command-line
-   ##  option to use it.
-   darwin|gnu*)
-     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
--    if test "x$HAVE_LIBNCURSES" = "xyes"; then
--      TERMINFO=yes
-+    if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
-       LIBS_TERMCAP="-lncurses"
-     fi
-     ;;
-@@ -2873,17 +2866,16 @@ fail;
-     AC_MSG_RESULT($emacs_cv_freebsd_terminfo)
- 
-     if test $emacs_cv_freebsd_terminfo = yes; then
--      TERMINFO=yes
-       LIBS_TERMCAP="-lncurses"
-     else
-+      TERMINFO=no
-       LIBS_TERMCAP="-ltermcap"
-     fi
-     ;;
- 
-   netbsd)
--    if test "x$LIBS_TERMCAP" = "x-lterminfo"; then
--      TERMINFO=yes
--    else
-+    if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
-+      TERMINFO=no
-       LIBS_TERMCAP="-ltermcap"
-     fi
-     ;;

emacs-24.1-xgselect.patch

@@ -1,16 +0,0 @@
---- 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,

emacs-24.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73d8831c135599ea70065ecb3767a594822104b78478adb9bc78845fa5938b8f
-size 41724869

emacs-24.3-asian-print.patch

@@ -1,6 +1,6 @@
 --- lisp/ps-mule.el
-+++ lisp/ps-mule.el	2009-08-10 18:18:24.585901695 +0200
-@@ -240,7 +240,7 @@ Currently, data for Japanese and Korean
++++ lisp/ps-mule.el	2009-08-10 16:18:24.585901695 +0000
+@@ -239,7 +239,7 @@ Currently, data for Japanese and Korean
      (japanese-jisx0208
       (normal bdf "jiskan24.bdf"))
      (korean-ksc5601

emacs-24.3-decl.dif

@@ -0,0 +1,12 @@
+--- src/frame.c
++++ src/frame.c	2013-05-21 15:13:32.849939500 +0000
+@@ -22,6 +22,9 @@ along with GNU Emacs.  If not, see <http
+ #define FRAME_INLINE EXTERN_INLINE
+ 
+ #include <stdio.h>
++#ifdef STDC_HEADERS
++#include <stdlib.h>
++#endif
+ #include <errno.h>
+ #include <limits.h>
+ 

emacs-24.3-flyspell.patch

@@ -1,6 +1,6 @@
 --- lisp/textmodes/flyspell.el
-+++ lisp/textmodes/flyspell.el	2009-08-11 14:54:35.749901460 +0200
-@@ -279,6 +279,12 @@ If `flyspell-large-region' is nil, all r
++++ lisp/textmodes/flyspell.el	2009-08-11 12:54:35.749901460 +0000
+@@ -284,6 +284,12 @@ If this variable is nil, all regions are
    "The key binding for flyspell auto correction."
    :group 'flyspell)
  
@@ -13,7 +13,7 @@
  ;;*---------------------------------------------------------------------*/
  ;;*    Mode specific options                                            */
  ;;*    -------------------------------------------------------------    */
-@@ -302,7 +308,6 @@ property of the major mode name.")
+@@ -307,7 +313,6 @@ property of the major mode name.")
  ;;*--- mail mode -------------------------------------------------------*/
  (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
  (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -21,7 +21,7 @@
  (defun mail-mode-flyspell-verify ()
    "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
    (let ((header-end (save-excursion
-@@ -314,11 +319,11 @@ property of the major mode name.")
+@@ -319,11 +324,11 @@ property of the major mode name.")
  		       nil t)
  		      (point)))
  	(signature-begin

emacs-24.3-giflib5.patch

@@ -1,8 +1,6 @@
-diff --git a/src/image.c b/src/image.c
-index 73490fe..7acd5a3 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -7176,7 +7176,11 @@ gif_load (struct frame *f, struct image *img)
+--- src/image.c
++++ src/image.c	2013-05-21 15:49:41.945819346 +0000
+@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
  	}
  
        /* Open the GIF file.  */
@@ -14,7 +12,7 @@ index 73490fe..7acd5a3 100644
        if (gif == NULL)
  	{
  	  image_error ("Cannot open `%s'", file, Qnil);
-@@ -7197,7 +7201,11 @@ gif_load (struct frame *f, struct image *img)
+@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
        memsrc.len = SBYTES (specified_data);
        memsrc.index = 0;
  

emacs-24.3-glibc.patch

@@ -1,6 +1,6 @@
---- configure
-+++ configure
-@@ -10020,6 +10020,7 @@ system_malloc=no
+--- configure.ac
++++ configure.ac	2013-05-21 14:16:11.589439382 +0000
+@@ -1692,6 +1692,7 @@ system_malloc=no
  case "$opsys" in
    ## darwin ld insists on the use of malloc routines in the System framework.
    darwin|sol2-10) system_malloc=yes ;;
@@ -8,25 +8,7 @@
  esac
  
  if test "${system_malloc}" = "yes"; then
-@@ -10063,6 +10064,7 @@ fi
- use_mmap_for_buffers=no
- case "$opsys" in
-   cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
-+  gnu-linux) use_mmap_for_buffers=yes ;;
- esac
- 
- 
---- configure.in
-+++ configure.in
-@@ -1661,6 +1661,7 @@ system_malloc=no
- case "$opsys" in
-   ## darwin ld insists on the use of malloc routines in the System framework.
-   darwin|sol2-10) system_malloc=yes ;;
-+  gnu-linux) system_malloc=yes ;;
- esac
- 
- if test "${system_malloc}" = "yes"; then
-@@ -1701,6 +1702,7 @@ fi
+@@ -1732,6 +1733,7 @@ fi
  use_mmap_for_buffers=no
  case "$opsys" in
    cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
@@ -34,53 +16,62 @@
  esac
  
  AC_FUNC_MMAP
+--- configure
++++ configure	2013-05-21 13:59:14.357439665 +0000
+@@ -9828,6 +9828,7 @@ system_malloc=no
+ case "$opsys" in
+   ## darwin ld insists on the use of malloc routines in the System framework.
+   darwin|sol2-10) system_malloc=yes ;;
++  gnu-linux) system_malloc=yes ;;
+ esac
+ 
+ if test "${system_malloc}" = "yes"; then
+@@ -9871,6 +9872,7 @@ fi
+ use_mmap_for_buffers=no
+ case "$opsys" in
+   cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
++  gnu-linux) use_mmap_for_buffers=yes ;;
+ esac
+ 
+ 
 --- 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
++++ lib-src/Makefile.in	2013-05-21 14:51:33.357939393 +0000
+@@ -296,14 +296,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
+ ../lib/libgnu.a: $(config_h)
  	cd ../lib && $(MAKE) libgnu.a
  
 +REGEXPOBJ =
 +#REGEXPOBJ = regex.o
- regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
+ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
  	${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
  	  ${srcdir}/../src/regex.c
  
--etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
-+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) ../src/config.h
+-etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
++etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) $(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
+ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
  	$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
-@@ -325,7 +330,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
+@@ -314,7 +316,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
+ profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+ 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
 --- 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
++++ lib-src/etags.c	2013-05-21 14:52:23.881939078 +0000
+@@ -91,7 +91,7 @@ char pot_etags_version[] = "@(#) pot rev
+ #  define NDEBUG		/* disable assert */
  #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,6 @@ along with GNU Emacs.  If not, see <http
-   } while (0)
- #endif
- #endif
-+
-+/* we have regex in the GNU C-library. */
-+#define REGEXP_IN_LIBC
+-#include <config.h>
++#include <../src/config.h>
+ 
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE 1		/* enables some compiler checks on GNU */

emacs-24.3-iconic.patch

@@ -1,6 +1,6 @@
 --- lisp/startup.el
-+++ lisp/startup.el	2008-03-31 12:23:04.503065574 +0200
-@@ -1996,6 +1996,9 @@ A fancy display is used on graphic displ
++++ lisp/startup.el	2008-03-31 10:23:04.503065574 +0000
+@@ -2171,6 +2171,9 @@ A fancy display is used on graphic displ
  		  ((equal argi "-no-splash")
  		   (setq inhibit-startup-screen t))
  

emacs-24.3-nonvoid.patch

@@ -1,6 +1,6 @@
 --- src/xmenu.c
-+++ src/xmenu.c	2012-06-26 17:12:22.856009442 +0000
-@@ -316,8 +316,8 @@ for instance using the window manager, t
++++ src/xmenu.c	2013-05-21 15:21:41.301439390 +0000
+@@ -310,8 +310,8 @@ for instance using the window manager, t
  #else
    {
      Lisp_Object title;
@@ -8,6 +8,6 @@
 -    Lisp_Object selection;
 +    const char *error_name = NULL;
 +    Lisp_Object selection = Qnil;
-     int specpdl_count = SPECPDL_INDEX ();
+     ptrdiff_t specpdl_count = SPECPDL_INDEX ();
  
      /* Decode the dialog items from what was specified.  */

emacs-24.3-ps-bdf.patch

@@ -1,7 +1,7 @@
 --- lisp/ldefs-boot.el
 +++ lisp/ldefs-boot.el	2012-06-26 16:26:01.900010474 +0000
-@@ -23074,9 +23074,9 @@ With prefix argument ARG, restart the Pr
- ;;;;;;  65510))
+@@ -21658,9 +21658,9 @@ With prefix argument ARG, restart the Pr
+ ;;;;;;  18685 911514 0))
  ;;; Generated autoloads from ps-bdf.el
  
 -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\

emacs-24.3-x11r7.patch

@@ -1,6 +1,6 @@
 --- src/xrdb.c
-+++ src/xrdb.c	2007-05-15 18:01:41.439517668 +0200
-@@ -54,6 +54,9 @@ Boston, MA 02110-1301, USA.  */
++++ src/xrdb.c	2007-05-15 16:01:41.439517668 +0000
+@@ -39,6 +39,9 @@ along with GNU Emacs.  If not, see <http
  #include <X11/X.h>
  #include <X11/Xutil.h>
  #include <X11/Xresource.h>
@@ -10,7 +10,7 @@
  #ifdef HAVE_PWD_H
  #include <pwd.h>
  #endif
-@@ -609,6 +612,15 @@ x_load_resources (display, xrm_string, m
+@@ -539,6 +542,15 @@ x_load_resources (Display *display, cons
    XrmPutLineResource (&rdb, line);
  
  #endif /* not USE_MOTIF */
@@ -26,7 +26,7 @@
  
    user_database = get_user_db (display);
  
-@@ -651,6 +663,10 @@ x_load_resources (display, xrm_string, m
+@@ -580,6 +592,10 @@ x_load_resources (Display *display, cons
  	XrmMergeDatabases (db, &rdb);
      }
  

emacs-24.3-xevent.patch

@@ -1,9 +1,9 @@
 --- src/xmenu.c
-+++ src/xmenu.c	2012-07-03 11:51:37.448009822 +0000
-@@ -964,7 +964,7 @@ set_frame_menubar (FRAME_PTR f, int firs
++++ src/xmenu.c	2013-05-21 15:42:44.917439139 +0000
+@@ -953,7 +953,7 @@ set_frame_menubar (FRAME_PTR f, bool fir
      {
        deep_p = 1;
-       f->output_data.x->saved_menu_event = (XEvent*)xmalloc (sizeof (XEvent));
+       f->output_data.x->saved_menu_event = xmalloc (sizeof (XEvent));
 -      f->output_data.x->saved_menu_event->type = 0;
 +      memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));
      }
@@ -11,7 +11,7 @@
  #ifdef USE_GTK
 --- src/xselect.c
 +++ src/xselect.c	2012-07-03 11:08:10.732010284 +0000
-@@ -2344,7 +2344,14 @@ x_fill_property_data (Display *dpy, Lisp
+@@ -2350,7 +2350,14 @@ x_fill_property_data (Display *dpy, Lisp
        Lisp_Object o = XCAR (iter);
  
        if (INTEGERP (o) || FLOATP (o) || CONSP (o))
@@ -26,18 +26,19 @@
 +	}
        else if (STRINGP (o))
          {
-           BLOCK_INPUT;
+           block_input ();
 --- src/xterm.c
-+++ src/xterm.c	2012-07-03 11:47:12.060510503 +0000
-@@ -5753,9 +5753,10 @@ static struct x_display_info *next_noop_
++++ src/xterm.c	2013-05-21 15:44:18.617938988 +0000
+@@ -5764,9 +5764,11 @@ static struct x_display_info *next_noop_
  #define SET_SAVED_BUTTON_EVENT                                          \
       do									\
         {								\
 -	 if (f->output_data.x->saved_menu_event == 0)			\
 +	 if (f->output_data.x->saved_menu_event == 0) {			\
-            f->output_data.x->saved_menu_event				\
- 	     = (XEvent *) xmalloc (sizeof (XEvent));			\
-+	   memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));}\
-          *f->output_data.x->saved_menu_event = event;                   \
+            f->output_data.x->saved_menu_event =				\
+ 	     xmalloc (sizeof (XEvent));					\
++	   memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));	\
++	 }								\
+          *f->output_data.x->saved_menu_event = event;			\
  	 inev.ie.kind = MENU_BAR_ACTIVATE_EVENT;			\
  	 XSETFRAME (inev.ie.frame_or_window, f);			\

emacs-24.3-xim.patch

@@ -1,6 +1,6 @@
 --- src/xfns.c
-+++ src/xfns.c	2007-05-15 18:37:13.282161551 +0200
-@@ -1959,8 +1959,8 @@ static XIMStyle best_xim_style P_ ((XIMS
++++ src/xfns.c	2007-05-15 16:37:13.282161551 +0000
+@@ -1845,8 +1845,8 @@ static XIMStyle best_xim_style (XIMStyle
  
  static XIMStyle supported_xim_styles[] =
  {

emacs-24.3.dif

@@ -1,71 +1,60 @@
 --- Makefile.in
-+++ 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=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-+MAN_PAGES=gnuctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-           grep-changelog.1 rcs-checkin.1
- 
- # Where to install and expect the info files describing Emacs.	In the
-@@ -472,10 +472,8 @@ install-arch-dep: mkdir
- 	    exec_prefix=${exec_prefix} bindir=${bindir} \
++++ Makefile.in	2013-05-21 15:58:29.533438706 +0000
+@@ -444,12 +444,8 @@ install-arch-dep: src install-arch-indep
  	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
- 	    INSTALL_STRIP=${INSTALL_STRIP})
--	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
--	-chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
--	rm -f $(DESTDIR)${bindir}/$(EMACS)
--	-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
-+	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS)
-+	-chmod 1755 $(DESTDIR)${bindir}/$(EMACS)
- 	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}
+ 	    INSTALL_STRIP=${INSTALL_STRIP}
+ 	if test "${ns_self_contained}" = "no"; then \
+-	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
+-	  chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
+-	  if test "x${NO_BIN_LINK}" = x; then \
+-	    rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
+-	    cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+-	  fi; \
++	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS) || exit 1 ; \
++	  chmod 1755 $(DESTDIR)${bindir}/$(EMACS) || true; \
+ 	else \
+ 	  subdir=${ns_appresdir}/site-lisp; \
+ 	  ${write_subdir} || exit 1; \
+@@ -631,6 +627,7 @@ install-man:
+ 	umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
  	thisdir=`/bin/pwd`; \
  	cd ${mansrcdir}; \
 +	cp ctags.1 gnuctags.1; \
- 	for page in ${MAN_PAGES}; do \
+ 	for page in *.1; do \
+ 	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
  	  (cd $${thisdir}; \
- 	   ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
-@@ -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 \
+@@ -710,7 +707,7 @@ uninstall:
+ 	   for page in *.1; do \
+ 	     rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
+ 	 fi)
+-	(cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
++	(cd $(DESTDIR)${bindir} && rm -f $(EMACS) || true)
+ 	(if cd $(DESTDIR)${icondir}; then \
+ 	   rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
+ 	     hicolor/scalable/apps/${EMACS_NAME}.svg \
 --- configure
-+++ configure
-@@ -9701,9 +9701,9 @@ LD_SWITCH_X_SITE_AUX=
- LD_SWITCH_X_SITE_AUX_RPATH=
++++ configure	2013-05-21 16:02:53.797440383 +0000
+@@ -9438,8 +9438,8 @@ fi
+ LD_SWITCH_X_SITE_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_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"`
 +    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_AUX_RPATH="-Wl,-rpath-link ${x_libraries%%:*}"
++    LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}"
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
---- configure.in
-+++ 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=
+--- configure.ac
++++ configure.ac	2013-05-21 16:02:44.821439363 +0000
+@@ -1405,8 +1405,8 @@
+ LD_SWITCH_X_SITE_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_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"`
 +    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_AUX_RPATH="-Wl,-rpath-link ${x_libraries%%:*}"
++    LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}"
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
@@ -155,7 +144,7 @@
  Print usage information.  Followed by one or more \-\-language=LANG
 --- lib-src/Makefile.in
 +++ lib-src/Makefile.in	2012-06-27 10:41:38.716510300 +0000
-@@ -109,7 +109,7 @@ INSTALL_STRIP =
+@@ -114,7 +114,7 @@ MKDIR_P = @MKDIR_P@
  # ========================== Lists of Files ===========================
  
  # Things that a user might actually run, which should be installed in bindir.
@@ -163,8 +152,8 @@
 +INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} \
                 ebrowse${EXEEXT}
  
- INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
-@@ -324,10 +324,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
+ INSTALLABLE_SCRIPTS = grep-changelog
+@@ -313,10 +313,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
  
  ## We depend on etags to assure that parallel makes do not write two
  ## etags.o files on top of each other.
@@ -175,11 +164,11 @@
 -	  $(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
+ profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+ 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
 --- lib-src/pop.c
 +++ lib-src/pop.c	2011-11-28 08:38:56.000000000 +0000
-@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http
+@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http
  #ifdef MAIL_USE_POP
  
  #include <sys/types.h>
@@ -189,7 +178,7 @@
  #include <winsock.h>
 --- lisp/cmuscheme.el
 +++ lisp/cmuscheme.el	2009-08-12 13:29:47.000000000 +0000
-@@ -240,7 +240,8 @@ is run).
+@@ -241,7 +241,8 @@ is run).
  			 (read-string "Run Scheme: " scheme-program-name)
  			 scheme-program-name)))
    (if (not (comint-check-proc "*scheme*"))
@@ -199,92 +188,8 @@
  	(set-buffer (apply 'make-comint "scheme" (car cmdlist)
  			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
  	(inferior-scheme-mode)))
---- lisp/international/mule-cmds.el
-+++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.000000000 +0000
-@@ -41,6 +41,7 @@
- 
- (defvar mule-keymap
-   (let ((map (make-sparse-keymap)))
-+    (define-key map "m" 'toggle-enable-multibyte-characters)
-     (define-key map "f" 'set-buffer-file-coding-system)
-     (define-key map "r" 'revert-buffer-with-coding-system)
-     (define-key map "F" 'set-file-name-coding-system)
---- lisp/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 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
-@@ -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
++++ lisp/site-load.el	2013-05-21 15:51:51.649940239 +0000
 @@ -0,0 +1,61 @@
 +;;;;
 +;;; emacs20.xx/lisp/site-load.el
@@ -357,19 +262,103 @@
      (define-key map "p" 'speedbar-prev)
      (define-key map "\M-n" 'speedbar-restricted-next)
      (define-key map "\M-p" 'speedbar-restricted-prev)
+--- lisp/international/mule-cmds.el
++++ lisp/international/mule-cmds.el	2010-10-18 14:06:48.000000000 +0000
+@@ -39,6 +39,7 @@
+ 
+ (defvar mule-keymap
+   (let ((map (make-sparse-keymap)))
++    (define-key map "m" 'toggle-enable-multibyte-characters)
+     (define-key map "f" 'set-buffer-file-coding-system)
+     (define-key map "r" 'revert-buffer-with-coding-system)
+     (define-key map "F" 'set-file-name-coding-system)
+--- lisp/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 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
+@@ -4976,7 +4976,7 @@ NEWNAME should be the name to give the n
+ ;  "If a host matches this regexp then it is assumed to be running VOS.")
+ ;
+ ;(defun ange-ftp-vos-host (host)
+-;  (and ange-ftp-vos-host-regexp
++;  (and host ange-ftp-vos-host-regexp
+ ;       (save-match-data
+ ;	 (string-match ange-ftp-vos-host-regexp host))))
+ ;
+@@ -5091,7 +5091,7 @@ NEWNAME should be the name to give the n
+ 
+ ;; Return non-nil if HOST is running VMS.
+ (defun ange-ftp-vms-host (host)
+-  (and ange-ftp-vms-host-regexp
++  (and host ange-ftp-vms-host-regexp
+        (string-match-p ange-ftp-vms-host-regexp host)))
+ 
+ ;; Because some VMS ftp servers convert filenames to lower case
+@@ -5599,7 +5599,7 @@ Other orders of $ and _ seem to all work
+ 
+ ;; Return non-nil if HOST is running MTS.
+ (defun ange-ftp-mts-host (host)
+-  (and ange-ftp-mts-host-regexp
++  (and host ange-ftp-mts-host-regexp
+        (string-match-p ange-ftp-mts-host-regexp host)))
+ 
+ ;; Parse the current buffer which is assumed to be in mts ftp dir format.
+@@ -5797,7 +5797,7 @@ Other orders of $ and _ seem to all work
+ 
+ ;; Return non-nil if HOST is running CMS.
+ (defun ange-ftp-cms-host (host)
+-  (and ange-ftp-cms-host-regexp
++  (and host ange-ftp-cms-host-regexp
+        (string-match-p ange-ftp-cms-host-regexp host)))
+ 
+ (defun ange-ftp-add-cms-host (host)
 --- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el	2009-08-12 13:49:26.000000000 +0000
-@@ -349,10 +349,13 @@ Must be greater than 1."
++++ lisp/textmodes/ispell.el	2013-05-21 16:06:31.241439612 +0000
+@@ -351,10 +351,13 @@ Must be greater than 1."
    :group 'ispell)
  
  (defcustom ispell-program-name
--  (or (locate-file "aspell"   exec-path exec-suffixes 'file-executable-p)
--      (locate-file "ispell"   exec-path exec-suffixes 'file-executable-p)
--      (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
+-  (or (executable-find "aspell")
+-      (executable-find "ispell")
+-      (executable-find "hunspell")
 -      "ispell")
 +  (progn
 +    (if (and (functionp 'append-ispell-dict-alist))
-+        "ispell"
++	"ispell"
 +	(or (locate-file "aspell"   exec-path exec-suffixes 'file-executable-p)
 +	    (locate-file "ispell"   exec-path exec-suffixes 'file-executable-p)
 +	    (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
@@ -377,7 +366,7 @@
    "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
    :type 'string
    :group 'ispell)
-@@ -1156,6 +1159,56 @@ The variable `ispell-library-directory'
+@@ -1182,6 +1185,56 @@ The variable `ispell-library-directory'
  (if ispell-menu-map-needed
      (progn
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
@@ -435,7 +424,7 @@
  	`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
  		    :help ,(purecopy "Supply explicit dictionary file name")))
 --- site-lisp/term/func-keys.el
-+++ site-lisp/term/func-keys.el	2003-07-23 16:08:56.000000000 +0000
++++ site-lisp/term/func-keys.el	2013-05-21 15:51:52.049939078 +0000
 @@ -0,0 +1,33 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path
@@ -471,7 +460,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von func-keys.el
 --- site-lisp/term/gnome.el
-+++ site-lisp/term/gnome.el	2003-07-23 16:08:56.000000000 +0000
++++ site-lisp/term/gnome.el	2013-05-21 15:51:52.125559846 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/gnomw.el for site-lisp path
@@ -571,7 +560,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von gnomw.el
 --- site-lisp/term/kvt.el
-+++ site-lisp/term/kvt.el	2003-07-23 16:08:56.000000000 +0000
++++ site-lisp/term/kvt.el	2013-05-21 15:51:52.197439092 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/kvt.el for site-lisp path
@@ -671,7 +660,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von kvt.el
 --- site-lisp/term/linux.el
-+++ site-lisp/term/linux.el	2003-07-23 16:08:56.000000000 +0000
++++ site-lisp/term/linux.el	2013-05-21 15:51:52.273939005 +0000
 @@ -0,0 +1,79 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/linux.el for site-lisp path
@@ -753,7 +742,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von linux.el
 --- site-lisp/term/locale.el
-+++ site-lisp/term/locale.el	2007-06-04 13:26:39.000000000 +0000
++++ site-lisp/term/locale.el	2013-05-21 15:51:52.349939373 +0000
 @@ -0,0 +1,16 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/locale.el for site-lisp path
@@ -773,7 +762,7 @@
 +;; Ende von locale.el
 --- src/lisp.mk
 +++ src/lisp.mk	2012-06-27 11:10:56.532510062 +0000
-@@ -142,6 +142,8 @@ lisp = \
+@@ -149,6 +149,8 @@ lisp = \
  	$(lispsource)/w32-vars.elc \
  	$(lispsource)/term/w32-win.elc \
  	$(lispsource)/ls-lisp.elc \

emacs-24.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d
+size 35565352

emacs-rpmlintrc

@@ -2,3 +2,7 @@ addFilter(".*no-documentation.*")
 addFilter(".*zero-length.*/var/games/emacs/.*-scores.*")
 addFilter(".*hidden-file-or-dir.*/etc/skel/.gnu-emacs.*")
 addFilter(".*file-in-usr-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*")
+addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*")
+addFilter(".*no-manual-page-for-binary.*emacs-*")
+addFilter(".*name-repeated-in-summar.*")
+addFilter(".*idden-file-or-dir.*\.dir-locals.el.*")

emacs.changes

@@ -1,3 +1,124 @@
+-------------------------------------------------------------------
+Fri May 24 10:30:24 UTC 2013 - werner@suse.de
+
+- Make emacs launch script smart, that is search for a valid dbus
+  on the current system if if not found launch a own dbus session
+- With emacs version 24.3 the package epg becoes obsolate
+
+-------------------------------------------------------------------
+Wed May 22 10:13:13 UTC 2013 - werner@suse.de
+
+- Update to to emacs version 24.3
+  * Emacs no longer searches for `leim-list.el' files beneath the standard
+    lisp/ directory.  There should not be any there anyway.  If you have
+    been adding them there, put them somewhere else; e.g., site-lisp.
+  * `C-h f' (`describe-function') can now perform autoloading.
+    When this command is called for an autoloaded function whose docstring
+    contains a key substitution construct, that function's library is
+    automatically loaded, so that the documentation can be shown
+    correctly.  To disable this, set `help-enable-auto-load' to nil.
+  * `C-h f' now reports previously-autoloaded functions as "autoloaded",
+    even after their associated libraries have been loaded (and the
+    autoloads have been redefined as functions).
+  * Images displayed via ImageMagick now support transparency and the
+    :background image specification property.
+  * When available, ImageMagick support is automatically enabled.
+    It is no longer necessary to call `imagemagick-register-types'
+    explicitly to install ImageMagick image types; that function is called
+    automatically at startup, or when customizing an imagemagick- option.
+  * Setting `imagemagick-types-inhibit' to t now disables the use of
+    ImageMagick to view images.  (You must call `imagemagick-register-types'
+    afterwards if you do not use customize to change this.)
+  * The new variable `imagemagick-enabled-types' also affects which
+    ImageMagick types are treated as images.  The function
+    `imagemagick-filter-types' returns the list of types that will be
+    treated as images.
+  * In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
+    next and previous path separator, respectively.
+  * `minibuffer-electric-default-mode' can shorten "(default ...)" to "[...]"
+    in minibuffer prompts.  Just set `minibuffer-eldef-shorten-default'
+    non-nil before enabling the mode.
+  * New option `mode-line-default-help-echo' specifies the help text
+    (shown in a tooltip or in the echo area) for any part of the mode line
+    that does not have its own specialized help text.
+  * You can now click mouse-3 in the coding system indicator to invoke
+    `set-buffer-file-coding-system'.
+  * emacsclient now obeys string values for `initial-buffer-choice',
+    if it is told to open a new frame without specifying any file to visit
+    or expression to evaluate.
+  * New option `server-auth-key' specifies a shared server key.
+  * Emacs now generates backtraces on fatal errors.
+    On encountering a fatal error, Emacs now outputs a textual description
+    of the fatal signal, and a short backtrace on platforms like glibc
+    that support backtraces.
+  * `C-x C-q' is now bound to the new minor mode `read-only-mode'.
+    This minor mode replaces `toggle-read-only', which is now obsolete.
+  * Most `y-or-n' prompts now allow you to scroll the selected window.
+    Typing `C-v' or `M-v' at a y-or-n prompt scrolls forward or backward
+    respectively, without exiting from the prompt.
+  * In the Package Menu, newly-available packages are listed as "new",
+    and sorted above the other "available" packages by default.
+  * If your Emacs was built from a bzr checkout, the new variable
+    `emacs-bzr-version' contains information about the bzr revision used.
+  * New option `create-lockfiles' specifies usage of lockfiles.
+    It defaults to t.  Changing it to nil inhibits the creation of lock
+    files (use this with caution).
+  * New option `enable-remote-dir-locals', if non-nil, allows directory-local
+    variables on remote hosts.
+  * The entry for PCL-CVS has been removed from the Tools menu.
+    The PCL-CVS commands are still available via the keyboard.
+  * Using "unibyte: t" in Lisp source files is obsolete.
+    Use "coding: raw-text" instead.
+  * In the buffer made by `M-x report-emacs-bug', the `C-c m' binding
+    has been changed to `C-c M-i' (`report-emacs-bug-insert-to-mailer').
+    The previous binding, introduced in Emacs 24.1, was a mistake, because
+    `C-c LETTER' bindings are reserved for user customizations.
+  * Non-regexp Isearch now performs "lax" space matching.
+    Each sequence of spaces in the supplied search string may match any
+    sequence of one or more whitespace characters, as specified by the
+    variable `search-whitespace-regexp'.  (This variable is also used by a
+    similar existing feature for regexp Isearch.)
+  * New Isearch command `M-s SPC' toggles lax space matching.
+    This applies to both ordinary and regexp Isearch.
+  * New option `replace-lax-whitespace'.
+    If non-nil, `query-replace' uses flexible whitespace matching too.
+    The default is nil.
+  * Global `M-s _' starts a symbol (identifier) incremental search,
+    and `M-s _' in Isearch toggles symbol search mode.
+    `M-s c' in Isearch toggles search case-sensitivity.
+  * New binding `M-g c' for `goto-char'.
+  * New binding `M-g TAB' for `move-to-column'.
+  * `M-g TAB' (`move-to-column') prompts for a column number if called
+    interactively with no prefix arg.  Previously, it moved to column 1.
+  * New option `yank-handled-properties' allows processing of text
+    properties on yanked text, in ways that are more general than just
+    removing them (as is done by `yank-excluded-properties').
+  * New option `delete-trailing-lines' specifies whether
+    M-x delete-trailing-whitespace should delete trailing lines at the end
+    of the buffer.  It defaults to t.
+  * `C-u M-=' now counts lines/words/characters in the entire buffer.
+  * `C-x 8 RET' is now bound to `insert-char', which is now a command.
+    `ucs-insert' is now an obsolete alias for `insert-char'.
+  * The `z' key no longer has a binding in most special modes.
+    It used to be bound to `kill-this-buffer', but `z' is too easy to
+    accidentally type.
+  * New command `C-x r M-w' (`copy-rectangle-as-kill').
+    It copies the region-rectangle as the last rectangle kill.
+  * `C-x r +' is now overloaded to invoke `append-to-register'.
+  * New option `register-separator' specifies the register containing
+    the text to put between collected texts for use with
+    M-x append-to-register and M-x prepend-to-register.
+- Update file lists
+- Remove patches done upstream
+- Port remaining patches
+- Exclude info.info page as this is part of package info
+
+-------------------------------------------------------------------
+Tue May 21 14:38:23 UTC 2013 - werner@suse.de
+
+- Do not install etags below OS 13.0 (bnc#820567)
+- Use UTF-8 even in changelog for old entries
+
 -------------------------------------------------------------------
 Sat Apr 27 10:18:18 UTC 2013 - schwab@linux-m68k.org
 
@@ -1684,11 +1805,11 @@ Sat May 24 22:21:00 MET DST 1997 - werner@suse.de
 ----------------------------------------------------------------------------
 Tue Feb  4 16:20:39 MET 1997 - werner@suse.de
 	- Update auf gefixte Version 19.34b
-	- Drucken sollte jetzt möglich sein
-	- Aufräumen von term/linux.el und term/xterm.el
+	- Drucken sollte jetzt möglich sein
+	- Aufräumen von term/linux.el und term/xterm.el
 ----------------------------------------------------------------------------
 Thu Aug 29 00:00:00 MET 1996 - werner@suse.de
         - Neue Version von GNU Emacs: 19.34
         - Anpassungen  an TERM=linux, TERM=xterm
-        - Delete löscht Zeichen unter dem Cursor
+        - Delete löscht Zeichen unter dem Cursor
 

emacs.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Emacs
-GenericName=Text Editor
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs %f
-Icon=emacs
-Path=
-Type=Application
-Terminal=false
-X-KDE-StartupNotify=false

emacs.sh

@@ -0,0 +1,99 @@
+#!/bin/bash
+#
+# Launch a GNU Emacs
+#
+# The environment variable EMACS_TOOLKIT is used to determine
+# the prefered GUI. Possible values/types of EMACS_TOOLKIT are
+#
+#   nox -- for pure console based GNU Emacs 
+#   gtk -- for full GTK2/3  based GNU Emacs
+#   x11 -- for full LUCID   based GNU Emacs (used Xaw3d)
+#
+# Should work but remember history
+#   bnc#345669 -- Emacs doesn't un-maximize in KDE/KWin
+#   bnc#342385 -- Emacs doesn't keep the iconic information in KDE/KWin
+#
+# if test -z "$EMACS_TOOLKIT" ; then
+#     EMACS_TOOLKIT=gtk
+#     KDE_FULL_SESSION=$(xprop -root KDE_FULL_SESSION 2>/dev/null)
+#     case "$KDE_FULL_SESSION" in
+#     *true*) EMACS_TOOLKIT=x11
+#     esac
+# fi
+#
+: ${EMACS_TOOLKIT:=gtk}
+if test "$EMACS_TOOLKIT" = gtk; then
+    # Currently (2013/05/24) the parser of the GNOME libs
+    # are broken that is it is not independent from locale
+    LC_NUMERIC=POSIX
+    export LC_NUMERIC
+fi
+arg0=$0
+argv=("$@")
+if   test -e ${arg0}-${EMACS_TOOLKIT}
+then
+    set --   ${arg0}-${EMACS_TOOLKIT}
+elif test -e ${arg0}-x11
+then
+    set --   ${arg0}-x11
+elif test -e ${arg0}-nox
+then
+    set --   ${arg0}-nox
+else
+    echo "no emacs binary found"
+    exit 1
+fi
+#
+# Now check for valid dbus, e.g. after su/sudo/slogin
+#
+if dbusdaemon=$(type -p dbus-daemon) && dbuslaunch=$(type -p dbus-launch) ; then
+    #
+    # Currently (2013/05/24) the option --autolaunch for scanning for an
+    # already existing session is an internal option of dbus-launch(1).
+    #
+    if test -s /var/lib/dbus/machine-id ; then
+	read -t1 mid < /var/lib/dbus/machine-id
+    elif test -s /etc/machine-id ; then
+	read -t1 mid < /etc/machine-id
+    else
+	mid=
+    fi
+    if test -n "$DBUS_SESSION_BUS_ADDRESS" ; then
+	# Determine dbus identifier
+	for guid in ${DBUS_SESSION_BUS_ADDRESS//,/ } ; do
+	    case "$guid" in
+	    guid=*) break
+	    esac
+	done
+	# Check if dbus-daemon is active
+	dpid=
+	for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do
+	    test -e "$suid" || break
+	    grep -q $guid "$suid" || continue
+	    dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid")
+	    test /proc/${dpid#*=}/exe -ef $dbusdaemon && continue
+	    unset DBUS_SESSION_BUS_ADDRESS
+	    break
+	done
+	test -n "$dpid" || unset DBUS_SESSION_BUS_ADDRESS
+    fi
+    # Find a valid dbus-daemon if active
+    if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+	for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do
+	    test -e "$suid" || break
+	    dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid")
+	    test /proc/${dpid#*=}/exe -ef $dbusdaemon || continue
+	    dadd=$(grep -E '^DBUS_SESSION_BUS_ADDRESS=' "$suid")
+	    DBUS_SESSION_BUS_ADDRESS=${dadd#*=}
+	    export DBUS_SESSION_BUS_ADDRESS
+	done
+    fi
+    unset mid guid suid dadd
+    # Oops ... no dbus-daemon then launch a new session
+    if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+	set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session ${1+"$@"}
+	arg0=$dbuslaunch
+    fi
+    unset dbuslaunch dbusdaemon
+fi
+exec -a $arg0 ${1+"$@"} "${argv[@]}"

emacs.spec

@@ -19,6 +19,10 @@
 Name:           emacs
 BuildRequires:  ImageMagick
 BuildRequires:  ImageMagick-devel
+%if %{with autoconf}
+BuildRequires:  autoconf
+BuildRequires:  automake
+%endif
 BuildRequires:  alsa-devel
 BuildRequires:  bind-devel
 BuildRequires:  dbus-1-devel
@@ -28,6 +32,11 @@ BuildRequires:  freetype2-devel
 BuildRequires:  gconf2-devel
 BuildRequires:  giflib-devel
 %if 0%{?suse_version} > 1130
+BuildRequires:  gpm-devel
+%else
+BuildRequires:  gpm
+%endif
+%if 0%{?suse_version} > 1130
 BuildRequires:  gtk3-devel
 %else
 BuildRequires:  gtk2-devel
@@ -55,13 +64,9 @@ BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  xaw3d-devel
 BuildRequires:  xorg-x11-devel
-%if 0%{?suse_version} > 1130
-BuildRequires:  gpm-devel
-%else
-BuildRequires:  gpm
-%endif
+BuildRequires:  xz
 Url:            http://www.gnu.org/software/emacs/
-Version:        24.2
+Version:        24.3
 Release:        0
 %if 0%{suse_version} >= 1300
 Requires:       etags
@@ -75,31 +80,29 @@ License:        GPL-3.0+
 Group:          Productivity/Editors/Emacs
 Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004
-Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.2.tar.bz2
+Provides:       epg = 1.0.0
+Obsoletes:      epg < 1.0.0
+Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.3.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
 Source4:        emacs-rpmlintrc
-Source5:        emacs.desktop
-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-24.1-ps-bdf.patch
+Source5:        emacs.sh
+Patch:          emacs-24.3.dif
+Patch2:         emacs-24.3-glibc.patch
+Patch3:         emacs-24.3-decl.dif
+Patch4:         emacs-24.3-asian-print.patch
+Patch5:         emacs-24.3-ps-bdf.patch
 Patch7:         emacs-24.1-ps-mule.patch
-Patch8:         emacs-24.1-nonvoid.patch
-Patch11:        emacs-22.0.99-xim.patch
-Patch12:        emacs-22.0.99-x11r7.patch
-Patch13:        emacs-24.1-s390x.dif
-Patch14:        emacs-24.1-tinfo.dif
-Patch15:        emacs-22.2-iconic.patch
-Patch16:        emacs-23.1-flyspell.patch
+Patch8:         emacs-24.3-nonvoid.patch
+Patch11:        emacs-24.3-xim.patch
+Patch12:        emacs-24.3-x11r7.patch
+Patch15:        emacs-24.3-iconic.patch
+Patch16:        emacs-24.3-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
-Patch23:        emacs-24.1-xevent.patch
-Patch24:        emacs-24.1-xgselect.patch
-Patch25:        emacs-24.2-giflib5.patch
+Patch23:        emacs-24.3-xevent.patch
+Patch25:        emacs-24.3-giflib5.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)}
 %if "%_exec_prefix" == "/usr/X11R6"
 %define _x11lib     %{_exec_prefix}/%{_lib}
@@ -116,7 +119,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define appDefaultsDir %{_x11data}/app-defaults
 %define appDefaultsFile %{appDefaultsDir}/Emacs
 %endif
-%define info_files  emacs eintr elisp ada-mode auth autotype 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
+%define info_files  emacs eintr elisp ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-gnutls emacs-mime epa erc ert eshell eudc efaq flymake forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode tramp url vip viper widget wisent woman
 
 %description
 Basic package for the GNU Emacs editor. Requires emacs-x11 or
@@ -181,6 +184,7 @@ This package contains all the Info files for GNU Emacs. These files can
 be read online with GNU Emacs. They describe Emacs and some of its
 modes.
 
+%if 0%{suse_version} >= 1300
 %package     -n etags
 Summary:        Generate Tag Files for Use with Emacs
 Group:          Development/Tools/Navigators
@@ -192,6 +196,7 @@ Provides:       ctags:/usr/bin/etags
 ETags generates tag files from source code in Pascal, Cobol, Ada, Perl,
 LaTeX, Scheme, Emacs Lisp/Common Lisp, Postscript, Erlang, Python, Prolog,
 and most assembler-like syntaxes.
+%endif
 
 %prep
 %setup -q -b 2
@@ -203,20 +208,21 @@ and most assembler-like syntaxes.
 %patch8  -p0 -b .nvoid
 %patch11 -p0 -b .xim
 %patch12 -p0 -b .x11r7
-%patch13 -p0 -b .s390x
-%if 0%{?suse_version} > 1210
-%patch14 -p0 -b .tinfo
-%endif
 %patch15 -p0 -b .iconic
 %patch16 -p0 -b .flyspell
 %patch   -p0
-%patch22
-%patch23
-%patch24
-%patch25 -p1
+%patch22 -p0
+%patch23 -p0
+%patch25 -p0
 
+%if %{without autoconf}
 # We don't want to run autoconf
 touch configure src/stamp-h.in
+if test -s autogen.sh ; then
+  mv autogen.sh autogen.sh.no
+  ln -sf /bin/true autogen.sh
+fi
+%endif
 
 %build
 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
@@ -257,7 +263,8 @@ exit 1
       esac
   }
 
-  if test "$(sed -rn '\@^\$[({](build)?infodir[})]/@{ s@.*/([^:]*):.*@\1@p; }' doc/*/Makefile.in | xargs)" != "%info_files"
+  info_found="$(sed -rn '\@^\$[({](build)?infodir[})]/@{ s@\$\([A-Z_]*\)@@;s@.*/([^:]*):.*@\1@p; }' doc/*/Makefile.in|grep -v ^info|xargs)"
+  if test "$info_found" != "%info_files"
   then
       echo Please update info_files >&2
       exit 1
@@ -316,10 +323,10 @@ DESKTOP="--with-x \
 %if 0%{?suse_version} > 1130
 	 --with-x-toolkit=gtk3 \
 %else
-	 --with-x-toolkit=gtk \
+	 --with-x-toolkit=gtk2 \
 %endif
 	 --x-includes=%{_x11inc} \
-	 --x-libraries=%{_x11lib}:%{_x11data} \
+	 --x-libraries=%{_x11lib} \
 	 --with-xft \
 	 --with-libotf \
 	 --with-m17n-flt \
@@ -355,6 +362,12 @@ DESKTOP="--with-x \
 	 --with-wide-int \
 	 --enable-autodepend \
 "
+
+##OIFS="$IFS"; IFS=.
+##set -- $(gcc -dumpversion 2>/dev/null)
+##(($1 > 4 || ($1 == 4 && $2 > 4))) && COMP="$COMP --enable-link-time-optimization"
+##IFS="$OIFS"
+
 make_mchkoff ()
 {
     local OMC=$MALLOC_CHECK_
@@ -412,49 +425,8 @@ install -m 0755 emacs-gtk %{buildroot}/usr/bin/
 install -m 0755 emacs-x11 %{buildroot}/usr/bin/
 make install DESTDIR=%{buildroot}
 rm -vf %{buildroot}/usr/bin/emacs
-%if %bug_345669
-cat >  %{buildroot}/usr/bin/emacs <<-"EOF"
-	#!/bin/bash
-	# Avoid trouble with maximize/minimize within KDE (bug #345669)
-	#  -> under KWin emacs does not maximize in the correct way if
-	#     GTK/GDK is used as toolkit.  After click on the maximize
-	#     button emacs shrinks to fit to the current font which
-	#     destroys the maximize state in KWin.
-	# Avoid trouble with "iconic" state information (bug #342385)
-	#  ->  under KWin emacs with GTK/GDK toolkit does not hold its
-	#      "iconic" state if a desktop state is saved before logout
-	#      and restored after login.
-	if test -z "$EMACS_TOOLKIT" ; then
-	    EMACS_TOOLKIT=gtk
-	    KDE_FULL_SESSION=$(xprop -root KDE_FULL_SESSION 2>/dev/null)
-	    case "$KDE_FULL_SESSION" in
-	    *true*) EMACS_TOOLKIT=x11
-	    esac
-	fi
-	exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"}
-EOF
-%else
-cat >  %{buildroot}/usr/bin/emacs <<-"EOF"
-	#!/bin/bash
-	# Possible values are nox, gtk, or x11
-	: ${EMACS_TOOLKIT:=gtk}
-	if test "$EMACS_TOOLKIT" = gtk; then
-	    LC_NUMERIC=POSIX
-	    export LC_NUMERIC
-	fi
-	if test -e ${0}-${EMACS_TOOLKIT} ; then
-	 exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"}
-	elif test -e ${0}-x11 ; then
-	 exec -a ${0} ${0}-x11 ${1+"$@"}
-	elif test -e ${0}-nox ; then
-	 exec -a ${0} ${0}-nox ${1+"$@"}
-	else
-	    echo "no emacs binary found"
-	    exit 1
-	fi
-EOF
-%endif
-chmod 0755 %{buildroot}/usr/bin/emacs
+install -p %{S:5} %{buildroot}/usr/bin/emacs
+chmod 0755        %{buildroot}/usr/bin/emacs
 tar cf - `find site-lisp/ -name '*.el'  -o -name '*.elc'` | \
 tar -x -f - -C %{buildroot}%{_datadir}/emacs/%{version}/
 mkdir -p %{buildroot}%{_docdir}/emacs
@@ -505,6 +477,9 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term
 %if 0%{suse_version} < 1300
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ctags.1
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/etags.1
+%else
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.README
 %endif
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd
@@ -550,11 +525,15 @@ xargs -n 2 | while read first second; do
     ln -sf ${file#%{buildroot}} ${target}
 done
 # install desktop file
+test -e etc/emacs.desktop || exit 1
+echo 'X-KDE-StartupNotify=false' >> etc/emacs.desktop
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs.desktop
 cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png
-%suse_update_desktop_file -i emacs TextEditor
+%suse_update_desktop_file -r -i emacs TextEditor
 %if 0%{suse_version} >= 1300
 touch %{buildroot}%{_bindir}/ctags %{buildroot}%{_mandir}/man1/ctags.1.gz
 %else
+rm -vf %{buildroot}%{_bindir}/etags
 rm -vf %{buildroot}%{_bindir}/gnuctags
 rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1*
 %endif
@@ -570,14 +549,17 @@ test -e usr/bin/emacs-nox -a ! -e usr/bin/emacs && ln -sf emacs-nox usr/bin/emac
 
 %post info
 for f in %info_files; do
-  %install_info --info-dir=%{_infodir} %{_infodir}/$f.gz
+  test -e "$f" || f="${f}.info"
+  %install_info --info-dir=%{_infodir} "%{_infodir}/$f.gz"
 done
 
 %postun info
 for f in %info_files; do
-  %install_info_delete --info-dir=%{_infodir} %{_infodir}/$f.gz
+  test -e "$f" || f="${f}.info"
+  %install_info_delete --info-dir=%{_infodir} "%{_infodir}/$f.gz"
 done
 
+%if 0%{suse_version} >= 1300
 %post -n etags
 test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags
 update-alternatives --install  %{_bindir}/ctags ctags %{_bindir}/gnuctags 10 \
@@ -588,15 +570,15 @@ update-alternatives --auto ctags
 if [ $1 -eq 0 ]; then
   update-alternatives --remove ctags %{_bindir}/gnuctags
 fi
+%endif
 
 %files -f site-lisp.lst -n emacs
 %defattr(-, root, root)
-/etc/skel/.gnu-emacs
+%config /etc/skel/.gnu-emacs
 %{_bindir}/ebrowse
 %{_bindir}/emacs
 %{_bindir}/emacsclient
 %{_bindir}/grep-changelog
-%{_bindir}/rcs-checkin
 %dir %{_prefix}/lib/emacs/
 %dir %{_prefix}/lib/emacs/%{version}/
 %dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
@@ -605,7 +587,6 @@ fi
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
-%{_prefix}/lib/emacs/%{version}/*-suse-linux*/vcdiff
 %dir %{_docdir}/emacs/
 %{_docdir}/emacs/doc
 %dir %{_datadir}/emacs/
@@ -621,8 +602,10 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/DISTRIB
 %{_datadir}/emacs/%{version}/etc/DOC-%{version}.1
 %doc %{_datadir}/emacs/%{version}/etc/ERC-NEWS
+%if 0%{suse_version} < 1300
 %doc %{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
 %doc %{_datadir}/emacs/%{version}/etc/ETAGS.README
+%endif
 %doc %{_datadir}/emacs/%{version}/etc/FTP
 %doc %{_datadir}/emacs/%{version}/etc/GNU
 %doc %{_datadir}/emacs/%{version}/etc/GNUS-NEWS
@@ -792,19 +775,19 @@ fi
 %{_datadir}/emacs/%{version}/etc/condom.1.gz
 %{_datadir}/emacs/%{version}/etc/copying.paper
 %dir %{_datadir}/emacs/%{version}/etc/e/
-%{_datadir}/emacs/%{version}/etc/e/README
+%doc %{_datadir}/emacs/%{version}/etc/e/README
 %{_datadir}/emacs/%{version}/etc/e/eterm-color
 %{_datadir}/emacs/%{version}/etc/e/eterm-color.ti
 %{_datadir}/emacs/%{version}/etc/echo.msg
 %{_datadir}/emacs/%{version}/etc/edt-user.el
 %{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb
-%{_datadir}/emacs/%{version}/etc/emacs.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
+%dir %{_datadir}/emacs/%{version}/etc/forms/
+%doc %{_datadir}/emacs/%{version}/etc/forms/README
+%{_datadir}/emacs/%{version}/etc/forms/forms-d2.dat
+%{_datadir}/emacs/%{version}/etc/forms/forms-d2.el
+%{_datadir}/emacs/%{version}/etc/forms/forms-pass.el
 %{_datadir}/emacs/%{version}/etc/future-bug
 %{_datadir}/emacs/%{version}/etc/gnus-tut.txt
 %dir %{_datadir}/emacs/%{version}/etc/gnus/
@@ -812,7 +795,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/gnus/news-server.ast
 %{_datadir}/emacs/%{version}/etc/grep.txt
 %dir %{_datadir}/emacs/%{version}/etc/images/
-%{_datadir}/emacs/%{version}/etc/images/README
+%doc %{_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
@@ -830,7 +813,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/images/copy.pbm
 %{_datadir}/emacs/%{version}/etc/images/copy.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/custom/
-%{_datadir}/emacs/%{version}/etc/images/custom/README
+%doc %{_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
@@ -848,7 +831,7 @@ fi
 %{_datadir}/emacs/%{version}/etc/images/exit.pbm
 %{_datadir}/emacs/%{version}/etc/images/exit.xpm
 %dir %{_datadir}/emacs/%{version}/etc/images/ezimage/
-%{_datadir}/emacs/%{version}/etc/images/ezimage/README
+%doc %{_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
@@ -1410,6 +1393,7 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/org/README
 %{_datadir}/emacs/%{version}/etc/ps-prin0.ps
 %{_datadir}/emacs/%{version}/etc/ps-prin1.ps
+%{_datadir}/emacs/%{version}/etc/publicsuffix.txt
 %dir %{_datadir}/emacs/%{version}/etc/refcards/
 %{_datadir}/emacs/%{version}/etc/refcards/Makefile
 %doc %{_datadir}/emacs/%{version}/etc/refcards/README
@@ -1424,6 +1408,7 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/refcards/de-refcard.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/dired-ref.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/dired-ref.tex
+%doc %{_datadir}/emacs/%{version}/etc/refcards/emacsver.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-dired-ref.pdf
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-dired-ref.tex
 %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-refcard.pdf
@@ -1505,11 +1490,13 @@ fi
 %{_datadir}/emacs/%{version}/etc/sex.6.gz
 %{_datadir}/emacs/%{version}/etc/spook.lines
 %dir %{_datadir}/emacs/%{version}/etc/srecode/
+%{_datadir}/emacs/%{version}/etc/srecode/c.srt
 %{_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-autoconf.srt
 %{_datadir}/emacs/%{version}/etc/srecode/ede-make.srt
 %{_datadir}/emacs/%{version}/etc/srecode/el.srt
 %{_datadir}/emacs/%{version}/etc/srecode/getset-cpp.srt
@@ -1620,6 +1607,7 @@ fi
 %{_datadir}/emacs/%{version}/leim/quail/uni-input.elc
 %{_datadir}/emacs/%{version}/leim/quail/viqr.elc
 %{_datadir}/emacs/%{version}/leim/quail/vntelex.elc
+%{_datadir}/emacs/%{version}/leim/quail/vnvni.elc
 %{_datadir}/emacs/%{version}/leim/quail/welsh.elc
 %dir %{_datadir}/emacs/%{version}/lisp/
 %{_datadir}/emacs/%{version}/lisp/COPYING
@@ -1785,6 +1773,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/debug.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/el.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/gcc.elc
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/grammar.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/make-by.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/make.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/scm-by.elc
@@ -1849,6 +1838,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent.elc
 %dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/comp.elc
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/grammar.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/java-tags.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/javascript.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/javat-wy.elc
@@ -1922,7 +1912,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/elide-head.elc
 %dir %{_datadir}/emacs/%{version}/lisp/emacs-lisp/
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/advice.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/assoc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/authors.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/autoload.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/avl-tree.elc
@@ -1938,14 +1927,13 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-lib.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-specs.el
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/crm.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cust-print.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/debug.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/derived.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/disass.elc
@@ -1969,6 +1957,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gulp.elc
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/gv.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/helper.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mode.elc
@@ -2037,6 +2026,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/erc/erc-capab.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-compat.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-dcc.elc
+%{_datadir}/emacs/%{version}/lisp/erc/erc-desktop-notifications.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-ezbounce.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-fill.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-goodies.elc
@@ -2117,8 +2107,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/font-lock.elc
 %{_datadir}/emacs/%{version}/lisp/format-spec.elc
 %{_datadir}/emacs/%{version}/lisp/format.elc
-%{_datadir}/emacs/%{version}/lisp/forms-d2.el
-%{_datadir}/emacs/%{version}/lisp/forms-pass.el
 %{_datadir}/emacs/%{version}/lisp/forms.elc
 %{_datadir}/emacs/%{version}/lisp/frame.elc
 %{_datadir}/emacs/%{version}/lisp/fringe.elc
@@ -2159,6 +2147,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ml.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mlspl.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-msg.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-notifications.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
@@ -2189,6 +2178,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/mailcap.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/message.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/messcompat.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-bodies.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-decode.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-encode.elc
@@ -2338,46 +2328,45 @@ fi
 %{_datadir}/emacs/%{version}/lisp/kermit.elc
 %{_datadir}/emacs/%{version}/lisp/kmacro.elc
 %dir %{_datadir}/emacs/%{version}/lisp/language/
-%{_datadir}/emacs/%{version}/lisp/language/burmese.el
-%{_datadir}/emacs/%{version}/lisp/language/cham.el
+%{_datadir}/emacs/%{version}/lisp/language/burmese.elc
+%{_datadir}/emacs/%{version}/lisp/language/cham.elc
 %{_datadir}/emacs/%{version}/lisp/language/china-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/chinese.elc
 %{_datadir}/emacs/%{version}/lisp/language/cyril-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/cyrillic.elc
-%{_datadir}/emacs/%{version}/lisp/language/czech.el
-%{_datadir}/emacs/%{version}/lisp/language/english.el
+%{_datadir}/emacs/%{version}/lisp/language/czech.elc
+%{_datadir}/emacs/%{version}/lisp/language/english.elc
 %{_datadir}/emacs/%{version}/lisp/language/ethio-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/ethiopic.elc
 %{_datadir}/emacs/%{version}/lisp/language/european.elc
-%{_datadir}/emacs/%{version}/lisp/language/georgian.el
-%{_datadir}/emacs/%{version}/lisp/language/greek.el
+%{_datadir}/emacs/%{version}/lisp/language/georgian.elc
+%{_datadir}/emacs/%{version}/lisp/language/greek.elc
 %{_datadir}/emacs/%{version}/lisp/language/hanja-util.elc
 %{_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
-%{_datadir}/emacs/%{version}/lisp/language/japanese.el
-%{_datadir}/emacs/%{version}/lisp/language/khmer.el
+%{_datadir}/emacs/%{version}/lisp/language/japanese.elc
+%{_datadir}/emacs/%{version}/lisp/language/khmer.elc
 %{_datadir}/emacs/%{version}/lisp/language/korea-util.elc
-%{_datadir}/emacs/%{version}/lisp/language/korean.el
+%{_datadir}/emacs/%{version}/lisp/language/korean.elc
 %{_datadir}/emacs/%{version}/lisp/language/lao-util.elc
-%{_datadir}/emacs/%{version}/lisp/language/lao.el
-%{_datadir}/emacs/%{version}/lisp/language/misc-lang.el
-%{_datadir}/emacs/%{version}/lisp/language/romanian.el
-%{_datadir}/emacs/%{version}/lisp/language/sinhala.el
-%{_datadir}/emacs/%{version}/lisp/language/slovak.el
-%{_datadir}/emacs/%{version}/lisp/language/tai-viet.el
+%{_datadir}/emacs/%{version}/lisp/language/lao.elc
+%{_datadir}/emacs/%{version}/lisp/language/misc-lang.elc
+%{_datadir}/emacs/%{version}/lisp/language/romanian.elc
+%{_datadir}/emacs/%{version}/lisp/language/sinhala.elc
+%{_datadir}/emacs/%{version}/lisp/language/slovak.elc
+%{_datadir}/emacs/%{version}/lisp/language/tai-viet.elc
 %{_datadir}/emacs/%{version}/lisp/language/thai-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/thai-word.elc
-%{_datadir}/emacs/%{version}/lisp/language/thai.el
+%{_datadir}/emacs/%{version}/lisp/language/thai.elc
 %{_datadir}/emacs/%{version}/lisp/language/tibet-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/tibetan.elc
 %{_datadir}/emacs/%{version}/lisp/language/tv-util.elc
-%{_datadir}/emacs/%{version}/lisp/language/utf-8-lang.el
+%{_datadir}/emacs/%{version}/lisp/language/utf-8-lang.elc
 %{_datadir}/emacs/%{version}/lisp/language/viet-util.elc
 %{_datadir}/emacs/%{version}/lisp/language/vietnamese.elc
 %{_datadir}/emacs/%{version}/lisp/ldefs-boot.el
-%{_datadir}/emacs/%{version}/lisp/ledit.elc
 %{_datadir}/emacs/%{version}/lisp/linum.elc
 %{_datadir}/emacs/%{version}/lisp/loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/loadhist.elc
@@ -2401,7 +2390,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/mailalias.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mailclient.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mailheader.elc
-%{_datadir}/emacs/%{version}/lisp/mail/mailpost.elc
 %{_datadir}/emacs/%{version}/lisp/mail/metamail.elc
 %{_datadir}/emacs/%{version}/lisp/mail/mspools.elc
 %{_datadir}/emacs/%{version}/lisp/mail/reporter.elc
@@ -2463,7 +2451,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/misearch.elc
 %{_datadir}/emacs/%{version}/lisp/mouse-copy.elc
 %{_datadir}/emacs/%{version}/lisp/mouse-drag.elc
-%{_datadir}/emacs/%{version}/lisp/mouse-sel.elc
 %{_datadir}/emacs/%{version}/lisp/mouse.elc
 %{_datadir}/emacs/%{version}/lisp/mpc.elc
 %{_datadir}/emacs/%{version}/lisp/msb.elc
@@ -2560,9 +2547,12 @@ fi
 %{_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/assoc.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/bruce.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/complete.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/cust-print.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
@@ -2570,12 +2560,16 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-swed.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/keyswap.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/ledit.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/options.elc
+%{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.el
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/pc-select.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-def.elc
@@ -2609,6 +2603,7 @@ fi
 %{_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-io.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
@@ -2630,6 +2625,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-ref.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-ruby.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-sass.elc
+%{_datadir}/emacs/%{version}/lisp/org/ob-scala.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-scheme.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-screen.elc
 %{_datadir}/emacs/%{version}/lisp/org/ob-sh.elc
@@ -2655,6 +2651,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-docbook.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-element.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-entities.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-eshell.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-exp-blocks.elc
@@ -2671,11 +2668,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-indent.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-info.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-install.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-install.el
 %{_datadir}/emacs/%{version}/lisp/org/org-irc.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-jsinfo.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-latex.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-list.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/org/org-lparse.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-mac-message.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-macs.elc
@@ -2696,6 +2694,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-table.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-taskjuggler.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-timer.elc
+%{_datadir}/emacs/%{version}/lisp/org/org-version.el
 %{_datadir}/emacs/%{version}/lisp/org/org-vm.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-w3m.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-wl.elc
@@ -2704,8 +2703,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/outline.elc
 %{_datadir}/emacs/%{version}/lisp/paren.elc
 %{_datadir}/emacs/%{version}/lisp/password-cache.elc
-%{_datadir}/emacs/%{version}/lisp/patcomp.el
-%{_datadir}/emacs/%{version}/lisp/paths.el
 %{_datadir}/emacs/%{version}/lisp/pcmpl-cvs.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-gnu.elc
 %{_datadir}/emacs/%{version}/lisp/pcmpl-linux.elc
@@ -2716,7 +2713,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/5x5.elc
 %{_datadir}/emacs/%{version}/lisp/play/animate.elc
 %{_datadir}/emacs/%{version}/lisp/play/blackbox.elc
-%{_datadir}/emacs/%{version}/lisp/play/bruce.el
 %{_datadir}/emacs/%{version}/lisp/play/bubbles.elc
 %{_datadir}/emacs/%{version}/lisp/play/cookie1.elc
 %{_datadir}/emacs/%{version}/lisp/play/decipher.elc
@@ -2744,6 +2740,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/zone.elc
 %{_datadir}/emacs/%{version}/lisp/printing.elc
 %{_datadir}/emacs/%{version}/lisp/proced.elc
+%{_datadir}/emacs/%{version}/lisp/profiler.elc
 %dir %{_datadir}/emacs/%{version}/lisp/progmodes/
 %{_datadir}/emacs/%{version}/lisp/progmodes/ada-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/ada-prj.elc
@@ -2873,39 +2870,39 @@ fi
 %{_datadir}/emacs/%{version}/lisp/tempo.elc
 %{_datadir}/emacs/%{version}/lisp/term.elc
 %dir %{_datadir}/emacs/%{version}/lisp/term/
-%{_datadir}/emacs/%{version}/lisp/term/AT386.el
+%{_datadir}/emacs/%{version}/lisp/term/AT386.elc
 %doc %{_datadir}/emacs/%{version}/lisp/term/README
-%{_datadir}/emacs/%{version}/lisp/term/apollo.el
-%{_datadir}/emacs/%{version}/lisp/term/bobcat.el
+%{_datadir}/emacs/%{version}/lisp/term/apollo.elc
+%{_datadir}/emacs/%{version}/lisp/term/bobcat.elc
 %{_datadir}/emacs/%{version}/lisp/term/common-win.elc
-%{_datadir}/emacs/%{version}/lisp/term/cygwin.el
+%{_datadir}/emacs/%{version}/lisp/term/cygwin.elc
 %{_datadir}/emacs/%{version}/lisp/term/internal.elc
-%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el
-%{_datadir}/emacs/%{version}/lisp/term/linux.el
-%{_datadir}/emacs/%{version}/lisp/term/lk201.el
-%{_datadir}/emacs/%{version}/lisp/term/news.el
+%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.elc
+%{_datadir}/emacs/%{version}/lisp/term/linux.elc
+%{_datadir}/emacs/%{version}/lisp/term/lk201.elc
+%{_datadir}/emacs/%{version}/lisp/term/news.elc
 %{_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/screen.elc
 %{_datadir}/emacs/%{version}/lisp/term/sun.elc
 %{_datadir}/emacs/%{version}/lisp/term/sup-mouse.elc
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.elc
 %{_datadir}/emacs/%{version}/lisp/term/tvi970.elc
 %{_datadir}/emacs/%{version}/lisp/term/vt100.elc
-%{_datadir}/emacs/%{version}/lisp/term/vt102.el
-%{_datadir}/emacs/%{version}/lisp/term/vt125.el
-%{_datadir}/emacs/%{version}/lisp/term/vt200.el
-%{_datadir}/emacs/%{version}/lisp/term/vt201.el
-%{_datadir}/emacs/%{version}/lisp/term/vt220.el
-%{_datadir}/emacs/%{version}/lisp/term/vt240.el
-%{_datadir}/emacs/%{version}/lisp/term/vt300.el
-%{_datadir}/emacs/%{version}/lisp/term/vt320.el
-%{_datadir}/emacs/%{version}/lisp/term/vt400.el
-%{_datadir}/emacs/%{version}/lisp/term/vt420.el
+%{_datadir}/emacs/%{version}/lisp/term/vt102.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt125.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt200.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt201.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt220.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt240.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt300.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt320.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt400.elc
+%{_datadir}/emacs/%{version}/lisp/term/vt420.elc
 %{_datadir}/emacs/%{version}/lisp/term/w32-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/w32console.elc
-%{_datadir}/emacs/%{version}/lisp/term/wyse50.el
+%{_datadir}/emacs/%{version}/lisp/term/wyse50.elc
 %{_datadir}/emacs/%{version}/lisp/term/x-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/xterm.el
 %{_datadir}/emacs/%{version}/lisp/terminal.elc
@@ -2974,6 +2971,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/url/url-cookie.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-dav.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-dired.elc
+%{_datadir}/emacs/%{version}/lisp/url/url-domsuf.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-expand.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-file.elc
 %{_datadir}/emacs/%{version}/lisp/url/url-ftp.elc
@@ -3041,10 +3039,11 @@ fi
 %{_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/version.elc
 %{_datadir}/emacs/%{version}/lisp/view.elc
 %{_datadir}/emacs/%{version}/lisp/vt-control.elc
 %{_datadir}/emacs/%{version}/lisp/vt100-led.elc
+%{_datadir}/emacs/%{version}/lisp/w32-common-fns.elc
 %{_datadir}/emacs/%{version}/lisp/w32-fns.elc
 %{_datadir}/emacs/%{version}/lisp/w32-vars.elc
 %{_datadir}/emacs/%{version}/lisp/wdired.elc
@@ -3070,9 +3069,9 @@ fi
 %dir %{_datadir}/emacs/site-lisp/
 %{_mandir}/man1/*.1.gz
 %exclude %{_mandir}/man1/*tags.1.gz
-%dir /var/games/emacs/
-/var/games/emacs/snake-scores
-/var/games/emacs/tetris-scores
+%dir %{_localstatedir}/games/emacs/
+%{_localstatedir}/games/emacs/snake-scores
+%{_localstatedir}/games/emacs/tetris-scores
 
 %files       -n emacs-nox
 %defattr(-, root, root)
@@ -3091,6 +3090,7 @@ fi
 %files       -n emacs-info
 %defattr(-, root, root)
 %doc %{_infodir}/*.gz
+%exclude %{_infodir}/info.info.gz
 
 %files       -n emacs-el
 %defattr(-, root, root)
@@ -3152,6 +3152,7 @@ fi
 %{_datadir}/emacs/%{version}/leim/quail/uni-input.el.gz
 %{_datadir}/emacs/%{version}/leim/quail/viqr.el.gz
 %{_datadir}/emacs/%{version}/leim/quail/vntelex.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/vnvni.el.gz
 %{_datadir}/emacs/%{version}/leim/quail/welsh.el.gz
 %{_datadir}/emacs/%{version}/lisp/abbrev.el.gz
 %{_datadir}/emacs/%{version}/lisp/align.el.gz
@@ -3299,6 +3300,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/debug.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/el.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/gcc.el.gz
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/grammar.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/make-by.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/make.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/bovine/scm-by.el.gz
@@ -3359,6 +3361,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/util.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/comp.el.gz
+%{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/grammar.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/java-tags.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/javascript.el.gz
 %{_datadir}/emacs/%{version}/lisp/cedet/semantic/wisent/javat-wy.el.gz
@@ -3427,7 +3430,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/electric.el.gz
 %{_datadir}/emacs/%{version}/lisp/elide-head.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/advice.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/assoc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/authors.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/autoload.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/avl-tree.el.gz
@@ -3443,12 +3445,12 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-lib.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/crm.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cust-print.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/debug.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/derived.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/disass.el.gz
@@ -3472,6 +3474,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gulp.el.gz
+%{_datadir}/emacs/%{version}/lisp/emacs-lisp/gv.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/helper.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.el.gz
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mode.el.gz
@@ -3538,6 +3541,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/erc/erc-capab.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-compat.el.gz
 %{_datadir}/emacs/%{version}/lisp/erc/erc-dcc.el.gz
+%{_datadir}/emacs/%{version}/lisp/erc/erc-desktop-notifications.el.gz
 %{_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
@@ -3652,6 +3656,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-ml.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-mlspl.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-msg.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/gnus-notifications.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
@@ -3682,6 +3687,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/mailcap.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/message.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/messcompat.el.gz
+%{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-bodies.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-decode.el.gz
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-encode.el.gz
@@ -3811,28 +3817,44 @@ fi
 %{_datadir}/emacs/%{version}/lisp/json.el.gz
 %{_datadir}/emacs/%{version}/lisp/kermit.el.gz
 %{_datadir}/emacs/%{version}/lisp/kmacro.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/burmese.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/cham.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/china-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/chinese.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/cyril-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/cyrillic.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/czech.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/english.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/ethio-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/ethiopic.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/european.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/georgian.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/greek.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
+%{_datadir}/emacs/%{version}/lisp/language/japanese.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/khmer.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/korea-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/korean.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/lao-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/lao.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/misc-lang.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/romanian.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/sinhala.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/slovak.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/tai-viet.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/thai-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/thai-word.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/thai.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/tibet-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/tibetan.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/tv-util.el.gz
+%{_datadir}/emacs/%{version}/lisp/language/utf-8-lang.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/viet-util.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/vietnamese.el.gz
-%{_datadir}/emacs/%{version}/lisp/ledit.el.gz
 %{_datadir}/emacs/%{version}/lisp/linum.el.gz
 %{_datadir}/emacs/%{version}/lisp/loadhist.el.gz
 %{_datadir}/emacs/%{version}/lisp/locate.el.gz
@@ -3852,7 +3874,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/mail/mailalias.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mailclient.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mailheader.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/mailpost.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/metamail.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/mspools.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/reporter.el.gz
@@ -3909,7 +3930,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/misearch.el.gz
 %{_datadir}/emacs/%{version}/lisp/mouse-copy.el.gz
 %{_datadir}/emacs/%{version}/lisp/mouse-drag.el.gz
-%{_datadir}/emacs/%{version}/lisp/mouse-sel.el.gz
 %{_datadir}/emacs/%{version}/lisp/mouse.el.gz
 %{_datadir}/emacs/%{version}/lisp/mpc.el.gz
 %{_datadir}/emacs/%{version}/lisp/msb.el.gz
@@ -4002,18 +4022,23 @@ fi
 %{_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/assoc.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/cust-print.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
 %{_datadir}/emacs/%{version}/lisp/obsolete/iso-swed.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/ledit.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/levents.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.el.gz
+%{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.el.gz
 %{_datadir}/emacs/%{version}/lisp/obsolete/options.el.gz
@@ -4049,6 +4074,7 @@ fi
 %{_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-io.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
@@ -4070,6 +4096,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/ob-ref.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-ruby.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-sass.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/ob-scala.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-scheme.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-screen.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/ob-sh.el.gz
@@ -4095,6 +4122,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-datetree.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-docbook.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-docview.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/org-element.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-entities.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-eshell.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-exp-blocks.el.gz
@@ -4111,7 +4139,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-indent.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-info.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/org-install.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-irc.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-jsinfo.el.gz
 %{_datadir}/emacs/%{version}/lisp/org/org-latex.el.gz
@@ -4180,6 +4207,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/play/zone.el.gz
 %{_datadir}/emacs/%{version}/lisp/printing.el.gz
 %{_datadir}/emacs/%{version}/lisp/proced.el.gz
+%{_datadir}/emacs/%{version}/lisp/profiler.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ada-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ada-prj.el.gz
 %{_datadir}/emacs/%{version}/lisp/progmodes/ada-stmt.el.gz
@@ -4304,18 +4332,38 @@ fi
 %{_datadir}/emacs/%{version}/lisp/tar-mode.el.gz
 %{_datadir}/emacs/%{version}/lisp/tempo.el.gz
 %{_datadir}/emacs/%{version}/lisp/term.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/AT386.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/apollo.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/bobcat.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/common-win.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/cygwin.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/internal.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/linux.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/lk201.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/news.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/ns-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/pc-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/rxvt.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/screen.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/sun.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/sup-mouse.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/tvi970.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/vt100.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt102.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt125.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt200.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt201.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt220.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt240.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt300.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt320.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt400.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/vt420.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/w32-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/w32console.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/wyse50.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/x-win.el.gz
 %{_datadir}/emacs/%{version}/lisp/terminal.el.gz
 %{_datadir}/emacs/%{version}/lisp/textmodes/artist.el.gz
@@ -4381,6 +4429,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/url/url-cookie.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-dav.el.gz
 %{_datadir}/emacs/%{version}/lisp/url/url-dired.el.gz
+%{_datadir}/emacs/%{version}/lisp/url/url-domsuf.el.gz
 %{_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
@@ -4447,9 +4496,11 @@ fi
 %{_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/version.el.gz
 %{_datadir}/emacs/%{version}/lisp/view.el.gz
 %{_datadir}/emacs/%{version}/lisp/vt-control.el.gz
 %{_datadir}/emacs/%{version}/lisp/vt100-led.el.gz
+%{_datadir}/emacs/%{version}/lisp/w32-common-fns.el.gz
 %{_datadir}/emacs/%{version}/lisp/w32-fns.el.gz
 %{_datadir}/emacs/%{version}/lisp/w32-vars.el.gz
 %{_datadir}/emacs/%{version}/lisp/wdired.el.gz
@@ -4468,6 +4519,7 @@ fi
 %if 0%{suse_version} >= 1300
 %files -n etags
 %defattr(-,root,root)
+%doc etc/ETAGS.EBNF
 %doc etc/ETAGS.README
 %{_bindir}/etags
 %{_bindir}/gnuctags