Attachment 169695 Details for Bug 209054 – svn diff to upgrade to 25.0.93 and modernize option handling

[patch] svn diff to upgrade to 25.0.93 and modernize option handling

emacs-devel-25.0.93,2.diff (text/plain), 15.78 KB, created by Joseph Mingrone on 2016-04-25 19:31:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2016-04-25 19:31:41 UTC

Size: 15.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 414026)
>+++ Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	emacs
> PORTVERSION=	${EMACS_VER}
>-PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	editors ipv6
> MASTER_SITES=	GNU_ALPHA/emacs/pretest
>@@ -15,15 +14,12 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_sparc64=	fails to compile at bootstrap phase
>-BROKEN_ia64=	Emacs 24.X does not currently build on ia64
>+BROKEN_sparc64=	Emacs does not currently build on sparc64
>+BROKEN_ia64=	Emacs does not currently build on ia64
> 
>-CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]*              \
>-		emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]*           \
>-		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
>-		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
>+CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
> 
>-EMACS_VER=	25.0.92
>+EMACS_VER=	25.0.93
> GNU_CONFIGURE=	yes
> USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
> INFO_PATH=	${DATADIR_REL}/info
>@@ -32,76 +28,90 @@
> SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
> 		${CONFIGURE_TARGET}
> 
>-CONFIGURE_ARGS=	--localstatedir=/var --with-gameuser=games:games
>+CONFIGURE_ARGS=	--localstatedir=/var \
>+		--with-gameuser=games:games \
> 
> PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
> 
> MAKE_ENV=	LC_ALL=C
> 
>-INFO=		ada-mode auth autotype bovine calc ccmode cl dbus     \
>-		dired-x ebrowse ede ediff edt efaq eieio eintr elisp  \
>-		emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \
>-		eww flymake forms gnus htmlfontify idlwave ido info   \
>-		mairix-el message mh-e newsticker nxml-mode           \
>-		octave-mode org pcl-cvs pgg rcirc reftex remember     \
>-		sasl sc semantic ses sieve smtpmail speedbar srecode  \
>-		todo-mode tramp url vhdl-mode vip viper widget wisent \
>-		woman
>+INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede	\
>+	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc	\
>+	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info	\
>+	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg	\
>+	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
>+	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
> 
>-OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
>-		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
>-		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS
>+OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB LTO MODULES SOURCES X11
> 
>-OPTIONS_SINGLE=	X11 SOUND
>+OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
>+OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
>+OPTIONS_RADIO_SOUND=		ALSA OSS
>+OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
> 
>-ACL_DESC=	ACL support
>-GSETTINGS_DESC= GSettings support
>+OPTIONS_GROUP=			GRAPHICS NEEDX11
>+OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
>+OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM XWIDGETS
>+
>+ACL_DESC=	Access control list support
>+CAIRO_DESC=	Cairo library support         (experimental)
>+FILENOTIFY_DESC=File notification support
>+GCONF_DESC=	GConf configuration support
>+GFILE_DESC=	File notification via gfile
>+GRAPHICS_DESC=	Graphics support (each implies X11)
>+GSETTINGS_DESC=	GSettings support             (implies DBUS)
>+KQUEUE_DESC=	File notification via kqueue
>+LLDB_DESC=	Enable LLDB support for GUD
>+LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
>+MAGICK_DESC=	ImageMagick support
>+M17N_DESC=	M17N support for text-shaping
>+MODULES_DESC=	Dynamic modules support
>+NEEDX11_DESC=	Other X11-dependent (each implies X11)
>+OTF_DESC=	Opentype fonts support
> SCROLLBARS_DESC=Toolkit scroll-bars
>-SOUND_DESC=	Sound support
> SOURCES_DESC=	Install sources
>+X11_DESC=	X11 support                   (choose toolkit below)
>+X11TOOLKIT_DESC=X11 toolkit (each implies X11)
>+XAW3D_DESC=	Athena3D widgets
> XAW_DESC=	Athena widgets
>-XAW3D_DESC=	Athena3D widgets
> XIM_DESC=	X Input Method Support
>-M17N_DESC=	M17N support for text-shaping
>-OTF_DESC=	Opentype fonts suport
>-FILENOTIFY_DESC=File notification support
>-LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
>-LLDB_DESC=	Enable lldb support for GUD (from llvm.org)
>-MODULES_DESC=	Dynamic modules support
>-XWIDGETS_DESC=  Enable use of some GTK widgets in Emacs buffers
>+XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
> 
>-OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
>-OPTIONS_SINGLE_SOUND=	ALSA OSS
>+OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG	\
>+		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
>+		TIFF X11 XFT XIM XML XPM
> 
>-OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2   \
>-		JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \
>-		SOURCES SVG TIFF X11 XFT XIM XML XPM
>+OPTIONS_SUB=		YES
> 
>-OPTIONS_SUB=	YES
>+ACL_CONFIGURE_ENABLE=	acl
> 
>-LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
>-
>-SOUND_CONFIGURE_OFF=	--with-sound=no
> ALSA_CONFIGURE_ON=	--with-sound=alsa
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>-OSS_CONFIGURE_ON=	--with-sound=oss
> 
>+CAIRO_USE=		GNOME=cairo
>+CAIRO_CONFIGURE_WITH=	cairo
>+CAIRO_IMPLIES=		X11
>+
> DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
> DBUS_CONFIGURE_WITH=	dbus
> 
>+GCONF_USE=		gnome=gconf2
>+GCONF_CONFIGURE_WITH=	gconf
>+GCONF_IMPLIES=		X11
>+
>+GFILE_CONFIGURE_ON=	--with-file-notification=gfile
>+
>+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
>+GIF_CONFIGURE_WITH=	gif
>+GIF_IMPLIES=		X11
>+
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> GNUTLS_CONFIGURE_WITH=	gnutls
> 
>-XML_USE=		GNOME=libxml2
>-XML_CONFIGURE_WITH=	xml2
>+GSETTINGS_USE=		gnome=glib20
>+GSETTINGS_CONFIGURE_WITH=gsettings
>+GSETTINGS_IMPLIES=	DBUS X11
> 
>-SVG_USE=		GNOME=librsvg2
>-SVG_CONFIGURE_WITH=	rsvg
>-
>-X11_CONFIGURE_WITH=	x
>-X11_USE=		XORG=x11
>-X11_USES=		desktop-file-utils
>-
> GTK2_USE=		GNOME=gtk20
> GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
> 
>@@ -108,71 +118,82 @@
> GTK3_USE=		GNOME=gtk30
> GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
> 
>-XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
>-XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
>+JPEG_USES=		jpeg
>+JPEG_CONFIGURE_WITH=	jpeg
>+JPEG_IMPLIES=		X11
> 
>-XAW_USE=		XORG=xaw
>-XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
>+KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
> 
>+LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
>+
>+LTO_CONFIGURE_ON=	--enable-link-time-optimization
>+LTO_USE=		GCC=4.6+
>+
>+M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
>+M17N_CONFIGURE_WITH=	m17n-flt
>+M17N_IMPLIES=		XFT X11
>+
>+MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
>+MAGICK_CONFIGURE_WITH=	imagemagick
>+MAGICK_IMPLIES=		X11
>+
>+MODULES_CONFIGURE_WITH=	modules
>+
> MOTIF_USES=		motif
>-MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
>+MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
> 
>+OSS_CONFIGURE_ON=	--with-sound=oss
>+
>+OTF_LIB_DEPENDS=	libotf.so:print/libotf
>+OTF_CONFIGURE_WITH=	libotf
>+OTF_IMPLIES=		XFT
>+
>+PNG_LIB_DEPENDS=	libpng.so:graphics/png
>+PNG_CONFIGURE_WITH=	png
>+PNG_IMPLIES=		X11
>+
> SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
>+SCROLLBARS_IMPLIES=	X11
> 
>-SYNC_INPUT_CONFIGURE_WITH=sync-input
>+SVG_USE=		GNOME=librsvg2
>+SVG_CONFIGURE_WITH=	rsvg
>+SVG_IMPLIES=		X11
> 
>-JPEG_USES=		jpeg
>-JPEG_CONFIGURE_WITH=	jpeg
>-
> TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
> TIFF_CONFIGURE_WITH=	tiff
>+TIFF_IMPLIES=		X11
> 
>-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
>-GIF_CONFIGURE_WITH=	gif
>+X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
>+X11_CONFIGURE_ON=	--with-x
>+X11_USE=		XORG=x11
>+X11_USES=		desktop-file-utils
>+X11_VARS=		installs_icons=yes
>+X11_VARS_OFF=		without_x11=yes
> 
>-PNG_LIB_DEPENDS+=	libpng.so:graphics/png
>-PNG_CONFIGURE_WITH=	png
>+XAW_USE=		XORG=xaw
>+XAW_CONFIGURE_ON=	--with-x-toolkit=athena --without-xaw3d
> 
>-XPM_USE=		XORG=xpm
>-XPM_CONFIGURE_WITH=	xpm
>+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
>+XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
> 
> XFT_USE=		XORG=xft
> XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
> XFT_CONFIGURE_WITH=	xft
>+XFT_IMPLIES=		X11
> 
>-M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
>-M17N_CONFIGURE_WITH=	m17n-flt
>-
>-OTF_LIB_DEPENDS=	libotf.so:print/libotf
>-OTF_CONFIGURE_WITH=	libotf
>-
>-MAGICK_LIB_DEPENDS=libMagickCore-6.so:graphics/ImageMagick
>-MAGICK_CONFIGURE_WITH=	imagemagick
>-
>-GSETTINGS_USE=		gnome=glib20
>-GSETTINGS_CONFIGURE_WITH=gsettings
>-
>-GCONF_USE=		gnome=gconf2
>-GCONF_CONFIGURE_WITH=	gconf
>-
> XIM_CONFIGURE_WITH=	xim
>+XIM_IMPLIES=		X11
> 
>-LTO_CONFIGURE_ON=	--enable-link-time-optimization
>-LTO_USE=		GCC=4.6+
>+XML_USE=		GNOME=libxml2
>+XML_CONFIGURE_WITH=	xml2
> 
>-ACL_CONFIGURE_OFF=	--disable-acl
>+XPM_USE=		XORG=xpm
>+XPM_CONFIGURE_WITH=	xpm
>+XPM_IMPLIES=		X11
> 
>-FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
>-FILENOTIFY_CONFIGURE_OFF=--without-file-notification
>-FILENOTIFY_USE=		GNOME=glib20
>-
>-CAIRO_USE=		GNOME=cairo
>-CAIRO_CONFIGURE_ON=	--with-cairo
>-
>-MODULES_CONFIGURE_ON=	--with-modules
>-
> XWIDGETS_CONFIGURE_ON=	--with-xwidgets
> XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
>+XWIDGETS_IMPLIES=	X11
> 
> .include <bsd.port.options.mk>
> 
>@@ -181,55 +202,34 @@
> # http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
> # (11-CURRENT), and fixed in r263765 (10-STABLE)
> .if ${ARCH} == "i386"
>-.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 &&           \
>-${OSVERSION} < 1100015)
>-USE_GCC=	any
>+.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)
>+USE_GCC=any
> .endif
> .endif
> 
> .if ${PORT_OPTIONS:MX11}
>-INSTALLS_ICONS=	yes
>-.if !${PORT_OPTIONS:MXFT}
>-.if ${PORT_OPTIONS:MM17N}
>-IGNORE=		m17n requires Xft. Please run 'make config'
>-.elif ${PORT_OPTIONS:MOTF}
>-IGNORE=		support for Opentype fonts require Xft. Please run 'make config'
>+.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \
>+! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D}
>+IGNORE=option X11 requires an X11 toolkit
> .endif
> .endif
>-.else
>-.for OPT in 	GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF  \
>-		PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
>-.if ${PORT_OPTIONS:M${OPT}}
>-IGNORE=		option ${OPT} requires X11 option
>-.endif
>-.endfor
>-.endif
> 
>-.if !${PORT_OPTIONS:MDBUS}
>-.if ${PORT_OPTIONS:MGSETTINGS}
>-IGNORE=		support for GSettings requires DBUS. Please run 'make config'
>-.endif
>-.endif
>-
>-.if !${PORT_OPTIONS:MGTK3}
>-.if ${PORT_OPTIONS:MXWIDGETS}
>-IGNORE=		support for XWidgets requires GTK3. Please run 'make config'
>-.endif
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> # Building with GCC 4.6+ requires it
> .if ${ncurses_ARGS} == "port"
>-LDFLAGS+=	-ltinfo
>+LDFLAGS+=-ltinfo
> .endif
> 
> post-patch:
> 	@${RM} -f ${WRKSRC}/info/*
>-	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e      \
>+	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
> 		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
>-.if empty(PORT_OPTIONS:MX11)
>-	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/'        \
>+## stage-qa will give a warning, but don't pull in desktop-file-utils
>+## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
>+## dependencies
>+.if ! ${PORT_OPTIONS:MX11}
>+	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
> 		${WRKSRC}/etc/emacs.desktop
> .endif
> 
>@@ -236,19 +236,9 @@
> post-install:
> .if ${PORT_OPTIONS:MSOURCES}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>-	${INSTALL_DATA} ${WRKSRC}/src/*.[ch]                          \
>-		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>-	${INSTALL_DATA} ${WRKSRC}/sources.el                          \
>-		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
>+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>+	${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
> .endif
>-	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name      \
>-		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
>+	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
> 
>-.if !defined(WITHOUT_X11)
>-pre-everything::
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
>-	@${ECHO_MSG}
>-.endif
>-
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 414026)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (emacs-25.0.92.tar.xz) = c29733959ae2c6a7c1d5f9465b4d06c93977cc1f3905313d992051a16590568e
>-SIZE (emacs-25.0.92.tar.xz) = 42264752
>+SHA256 (emacs-25.0.93.tar.xz) = b39199a491ce53f8b8a5b74fe6f1f191257e424f3ba047b3098ff9218e1579f1
>+SIZE (emacs-25.0.93.tar.xz) = 42515636
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 414026)
>+++ pkg-plist	(working copy)
>@@ -1548,7 +1548,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
>@@ -1658,7 +1657,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
>@@ -2278,7 +2276,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
>@@ -2285,7 +2282,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
>@@ -2294,6 +2290,7 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/ielm.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/iimage.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/iimage.elc
>+@dir %%DATADIR%%/%%EMACS_VER%%/lisp/image
> %%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/image-file.el.gz
>@@ -2652,7 +2649,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
>@@ -3064,8 +3060,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
>@@ -3543,7 +3537,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
>@@ -3716,7 +3709,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz

Actions: View | Diff

Attachments on bug 209054: 169695 | 169766