SHA256
1
0
forked from pool/emacs

Update to GNU Emacs 27.1

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=280
This commit is contained in:
Dr. Werner Fink 2020-08-13 10:38:32 +00:00 committed by Git OBS Bridge
parent 4a39e29b0e
commit 50e3f99392
23 changed files with 449 additions and 410 deletions

View File

@ -5,7 +5,7 @@
--- lisp/ps-mule.el
+++ lisp/ps-mule.el 2016-09-19 09:01:56.930605125 +0000
@@ -182,6 +182,8 @@ See also the variable `ps-font-info-data
@@ -180,6 +180,8 @@ See also the variable `ps-font-info-data
(defconst ps-mule-font-info-database-latin
'((iso-8859-1
@ -16,7 +16,7 @@
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000
@@ -1540,10 +1540,18 @@ Protects against bogus binding of `enabl
@@ -1544,10 +1544,18 @@ Protects against bogus binding of `enabl
nil ;; in pipe mode. Disable extended-char-mode
(nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
(assoc ispell-current-dictionary ispell-dictionary-alist)))))

View File

@ -4,7 +4,7 @@
--- lisp/ps-mule.el
+++ lisp/ps-mule.el 2016-09-19 08:57:28.807664990 +0000
@@ -264,7 +264,7 @@ Currently, data for Japanese and Korean
@@ -262,7 +262,7 @@ Currently, data for Japanese and Korean
(japanese-jisx0208
(normal bdf "jiskan24.bdf"))
(korean-ksc5601

View File

@ -4,7 +4,7 @@
--- lisp/startup.el
+++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000
@@ -2361,6 +2361,9 @@ nil default-directory" name)
@@ -2453,6 +2453,9 @@ nil default-directory" name)
((equal argi "-no-splash")
(setq inhibit-startup-screen t))

View File

@ -14,7 +14,7 @@
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
@@ -502,6 +505,15 @@ x_load_resources (Display *display, cons
@@ -470,6 +473,15 @@ x_load_resources (Display *display, cons
XrmPutLineResource (&rdb, line);
#endif /* not USE_MOTIF */
@ -30,7 +30,7 @@
user_database = get_user_db (display);
@@ -543,6 +555,10 @@ x_load_resources (Display *display, cons
@@ -511,6 +523,10 @@ x_load_resources (Display *display, cons
XrmMergeDatabases (db, &rdb);
}

View File

@ -4,7 +4,7 @@
--- lisp/textmodes/flyspell.el
+++ lisp/textmodes/flyspell.el 2016-09-19 09:22:48.535025631 +0000
@@ -313,6 +313,12 @@ If this variable is nil, all regions are
@@ -319,6 +319,12 @@ If this variable is nil, all regions are
:type 'key-sequence
:group 'flyspell)
@ -17,7 +17,7 @@
;;*---------------------------------------------------------------------*/
;;* Mode specific options */
;;* ------------------------------------------------------------- */
@@ -336,7 +342,6 @@ property of the major mode name.")
@@ -344,7 +350,6 @@ property of the major mode name.")
;;*--- mail mode -------------------------------------------------------*/
(put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
(put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@ -25,7 +25,7 @@
(defun mail-mode-flyspell-verify ()
"Function used for `flyspell-generic-check-word-predicate' in Mail mode."
(let* ((header-end (save-excursion
@@ -348,11 +353,11 @@ property of the major mode name.")
@@ -356,11 +361,11 @@ property of the major mode name.")
nil t)
(point)))
(signature-begin

View File

@ -5,7 +5,7 @@
--- configure.ac
+++ configure.ac 2018-05-29 12:18:31.133648098 +0000
@@ -2296,6 +2296,7 @@ fi
@@ -2380,6 +2380,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
mingw32) use_mmap_for_buffers=yes ;;
@ -15,7 +15,7 @@
AC_FUNC_MMAP
--- configure
+++ configure 2018-05-29 12:20:07.583908486 +0000
@@ -11460,6 +11460,7 @@ fi
@@ -11754,6 +11754,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
mingw32) use_mmap_for_buffers=yes ;;

View File

@ -4,7 +4,7 @@
--- src/xmenu.c
+++ src/xmenu.c 2016-09-19 09:01:56.930605125 +0000
@@ -1982,8 +1982,8 @@ Lisp_Object
@@ -1979,8 +1979,8 @@ Lisp_Object
xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
{
Lisp_Object title;

View File

@ -5,7 +5,7 @@
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2018-05-29 12:23:32.824206557 +0000
@@ -26392,9 +26392,9 @@ With prefix argument ARG, restart the Pr
@@ -26235,9 +26235,9 @@ With prefix argument ARG, restart the Pr
;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (0 0 0 0))
;;; Generated autoloads from ps-bdf.el

View File

@ -4,7 +4,7 @@
--- src/xfns.c
+++ src/xfns.c 2016-09-19 09:10:35.504833294 +0000
@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyle
@@ -2332,8 +2332,8 @@ static XIMStyle best_xim_style (XIMStyle
static const XIMStyle supported_xim_styles[] =
{

View File

@ -17,8 +17,8 @@ Work around openSUSE bug #1016172
@@ -42,28 +43,28 @@ If DISPLAY-OR-FRAME is a frame, the disp
If SET-FONT is non-nil, change the font for frames. Otherwise re-apply the
current form for the frame (i.e. hinting or somesuch changed)."
If SET-FONT is non-nil, change the font for frames. Otherwise re-apply
the current form for the frame (i.e. hinting or somesuch changed)."
- (let ((new-font (and (fboundp 'font-get-system-font)
- (font-get-system-font)))
- (frame-list (frames-on-display-list display-or-frame)))
@ -60,15 +60,15 @@ Work around openSUSE bug #1016172
"Handle config-changed-event on the display in EVENT.
--- src/xsettings.c
+++ src/xsettings.c 2016-12-21 07:25:17.605036477 +0000
@@ -45,6 +45,7 @@ along with GNU Emacs. If not, see <http
#endif
#ifdef HAVE_XFT
@@ -49,6 +49,7 @@ along with GNU Emacs. If not, see <http
#ifdef USE_CAIRO
#include <fontconfig/fontconfig.h>
#else /* HAVE_XFT */
+#include <math.h>
#include <X11/Xft/Xft.h>
#endif
@@ -620,7 +621,11 @@ apply_xft_settings (struct x_display_inf
#endif
@@ -625,7 +626,11 @@ apply_xft_settings (struct x_display_inf
#endif
FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter);
FcPatternGetInteger (pat, FC_RGBA, 0, &oldsettings.rgba);

View File

@ -5,20 +5,20 @@ Index: emacs-25.2/configure.ac
emacs-26.1/src/image.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
--- emacs-26.1/configure.ac
+++ emacs-26.1/configure.ac 2018-05-29 12:46:11.911662417 +0000
@@ -2525,7 +2525,7 @@ if test "${HAVE_X11}" = "yes" || test "$
## 6.3.5 is the earliest version known to work; see Bug#17339.
## 6.8.2 makes Emacs crash; see Bug#13867.
## 7 and later have not been ported to; See Bug#25967.
- IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
+ IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2"
EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
--- emacs-27.1/configure.ac
+++ emacs-27.1/configure.ac 2020-08-11 09:59:04.349950601 +0000
@@ -2618,7 +2618,7 @@ if test "${HAVE_X11}" = "yes" || test "$
else
## 6.3.5 is the earliest version known to work; see Bug#17339.
## 6.8.2 makes Emacs crash; see Bug#13867.
- EMACS_CHECK_MODULES([IMAGEMAGICK], [Wand >= 6.3.5 Wand != 6.8.2])
+ EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 6.3.5 MagickWand != 6.8.2])
fi
if test $HAVE_IMAGEMAGICK = yes; then
--- emacs-26.1/src/image.c
+++ emacs-26.1/src/image.c 2018-05-29 12:43:23.178732705 +0000
@@ -8434,7 +8434,11 @@ imagemagick_compute_animated_image (Magi
--- emacs-27.1/src/image.c
+++ emacs-27.1/src/image.c 2020-08-11 09:49:35.500181432 +0000
@@ -8770,7 +8770,11 @@ imagemagick_compute_animated_image (Magi
PixelWand **source, **dest;
size_t source_width, source_height;
ssize_t source_left, source_top;
@ -30,7 +30,7 @@ Index: emacs-25.2/configure.ac
DisposeType dispose;
ptrdiff_t lines = 0;
@@ -8499,7 +8503,11 @@ imagemagick_compute_animated_image (Magi
@@ -8835,7 +8839,11 @@ imagemagick_compute_animated_image (Magi
if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
{
PixelGetMagickColor (source[x], &pixel);
@ -42,7 +42,7 @@ Index: emacs-25.2/configure.ac
}
}
PixelSyncIterator (dest_iterator);
@@ -8546,7 +8554,11 @@ imagemagick_load_image (struct frame *f,
@@ -8880,7 +8888,11 @@ imagemagick_load_image (struct frame *f,
MagickWand *image_wand;
PixelIterator *iterator;
PixelWand **pixels, *bg_wand = NULL;

View File

@ -4,12 +4,12 @@
--- lwlib/xlwmenu.c
+++ lwlib/xlwmenu.c 2018-06-15 05:50:45.749287186 +0000
@@ -1887,21 +1887,18 @@ XlwMenuInitialize (Widget request, Widge
@@ -1894,21 +1894,18 @@ XlwMenuInitialize (Widget request, Widge
gray_width, gray_height,
(unsigned long)1, (unsigned long)0, 1);
+ mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
#ifdef HAVE_XFT
#if defined USE_CAIRO || defined HAVE_XFT
- if (openXftFont (mw))
+ if (mw->menu.font || openXftFont (mw))
;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
size 44415140

3
emacs-27.1-pdf.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:721e27d002533b9190282b4c6b169970a3c17dd4a648f04083e895a4a2561afc
size 2015612

108
emacs-27.1-pdftex.patch Normal file
View File

@ -0,0 +1,108 @@
---
etc/refcards/Makefile | 4 ++--
etc/refcards/cs-dired-ref.tex | 3 ++-
etc/refcards/cs-survival.tex | 3 ++-
etc/refcards/fr-survival.tex | 1 -
etc/refcards/pl-refcard.tex | 1 -
etc/refcards/ru-refcard.tex | 1 +
etc/refcards/sk-dired-ref.tex | 3 ++-
etc/refcards/sk-survival.tex | 3 ++-
etc/refcards/survival.tex | 1 -
9 files changed, 11 insertions(+), 9 deletions(-)
--- etc/refcards/Makefile
+++ etc/refcards/Makefile 2020-08-12 06:51:26.826803167 +0000
@@ -231,12 +231,12 @@ pl-refcard.pdf: $(pl_refcard_deps)
! pdfmex --version > /dev/null 2> /dev/null; then \
echo "No mex format found."; false; \
fi
- $(ENVADD) pdftex -output-format=pdf pl-refcard.tex
+ $(ENVADD) pdfmex -output-format=pdf pl-refcard.tex
pl-refcard.dvi: $(pl_refcard_deps)
if ! kpsewhich -format=fmt mex > /dev/null; then \
echo "No mex format found."; false; \
fi
- $(ENVADD) tex pl-refcard.tex
+ $(ENVADD) mex pl-refcard.tex
pl-refcard.ps: pl-refcard.dvi
dvips -t a4 -o $@ pl-refcard.dvi
--- etc/refcards/cs-dired-ref.tex
+++ etc/refcards/cs-dired-ref.tex 2020-08-11 13:31:00.597050301 +0000
@@ -108,7 +108,8 @@ see the Emacs distribution, or {\tt http
\font\eightbf=csbx8
\font\eightit=csti8
\font\eighttt=cstt8
- \font\eightmi=csmi8
+% \font\eightmi=csmi8
+ \font\eightmi=cmmi8
\font\eightsy=cmsy8
\textfont0=\eightrm
\textfont1=\eightmi
--- etc/refcards/cs-survival.tex
+++ etc/refcards/cs-survival.tex 2020-08-11 13:31:36.644404071 +0000
@@ -84,7 +84,8 @@
\font\eightbf=csbx8
\font\eightit=csti8
\font\eighttt=cstt8
-\font\eightmi=csmi8
+%\font\eightmi=csmi8
+\font\eightmi=cmmi8
\font\eightsy=cmsy8
\font\eightss=cmss8
\textfont0=\eightrm
--- etc/refcards/fr-survival.tex
+++ etc/refcards/fr-survival.tex 2020-08-11 12:38:55.765034599 +0000
@@ -1,4 +1,3 @@
-%&tex
% Title: GNU Emacs Survival Card
% Copyright (C) 2000--2020 Free Software Foundation, Inc.
--- etc/refcards/pl-refcard.tex
+++ etc/refcards/pl-refcard.tex 2020-08-11 12:46:13.525205665 +0000
@@ -1,4 +1,3 @@
-%&mex
% Reference Card for GNU Emacs
% Copyright (C) 1999, 2001--2020 Free Software Foundation, Inc.
--- etc/refcards/ru-refcard.tex
+++ etc/refcards/ru-refcard.tex 2020-08-12 07:46:56.239620140 +0000
@@ -25,6 +25,7 @@
\documentclass[10pt]{article}
\usepackage{multicol,tabularx}
\usepackage[a4paper,hmargin={2cm,2cm},vmargin={2cm,2cm},nohead,twoside]{geometry}
+\usepackage{type1ec}
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
--- etc/refcards/sk-dired-ref.tex
+++ etc/refcards/sk-dired-ref.tex 2020-08-11 13:31:20.796688178 +0000
@@ -109,7 +109,8 @@ see the Emacs distribution, or {\tt http
\font\eightbf=csbx8
\font\eightit=csti8
\font\eighttt=cstt8
- \font\eightmi=csmi8
+% \font\eightmi=csmi8
+ \font\eightmi=cmmi8
\font\eightsy=cmsy8
\textfont0=\eightrm
\textfont1=\eightmi
--- etc/refcards/sk-survival.tex
+++ etc/refcards/sk-survival.tex 2020-08-11 13:31:53.896093577 +0000
@@ -86,7 +86,8 @@
\font\eightbf=csbx8
\font\eightit=csti8
\font\eighttt=cstt8
-\font\eightmi=csmi8
+%\font\eightmi=csmi8
+\font\eightmi=cmmi8
\font\eightsy=cmsy8
\font\eightss=cmss8
\textfont0=\eightrm
--- etc/refcards/survival.tex
+++ etc/refcards/survival.tex 2020-08-11 12:38:52.405094664 +0000
@@ -1,4 +1,3 @@
-%&tex
% Title: GNU Emacs Survival Card
% Copyright (C) 2000--2020 Free Software Foundation, Inc.

View File

@ -11,28 +11,31 @@
lisp/net/ange-ftp.el | 8 +--
lisp/site-load.el | 41 ++++++++++++++++
lisp/speedbar.el | 1
lisp/textmodes/ispell.el | 85 ++++++++++++++++++++++++++++++++---
lisp/textmodes/ispell.el | 82 ++++++++++++++++++++++++++++++++-
site-lisp/term/func-keys.el | 33 +++++++++++++
site-lisp/term/gnome.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/kvt.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/linux.el | 79 ++++++++++++++++++++++++++++++++
site-lisp/term/locale.el | 13 +++++
18 files changed, 473 insertions(+), 33 deletions(-)
18 files changed, 471 insertions(+), 32 deletions(-)
--- Makefile.in
+++ Makefile.in 2019-04-15 12:04:25.158945850 +0000
@@ -490,8 +490,8 @@ install-arch-dep: src install-arch-indep
+++ Makefile.in 2020-08-11 10:21:15.194072175 +0000
@@ -493,11 +493,11 @@ install-arch-dep: src install-arch-indep
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
$(MAKE) -C lib-src install
ifeq (${ns_self_contained},no)
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)"
- -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACS)"
ifeq (${DUMPING},pdumper)
${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/emacs.pdmp
endif
- -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
+ -chmod 755 "$(DESTDIR)${bindir}/$(EMACS)"
ifndef NO_BIN_LINK
rm -f "$(DESTDIR)${bindir}/$(EMACS)"
cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)"
@@ -682,6 +682,7 @@ install-man:
@@ -690,6 +690,7 @@ install-man:
umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
@ -40,7 +43,7 @@
for page in *.1; do \
test "$$page" = ChangeLog.1 && continue; \
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
@@ -780,7 +781,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
@@ -788,7 +789,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
for page in *.1; do \
rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
fi)
@ -50,8 +53,8 @@
rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
"hicolor/scalable/apps/${EMACS_NAME}.svg" \
--- configure
+++ configure 2019-04-15 12:04:25.158945850 +0000
@@ -10465,10 +10465,8 @@ fi
+++ configure 2020-08-11 10:17:21.102266456 +0000
@@ -10750,10 +10750,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -65,8 +68,8 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- configure.ac
+++ configure.ac 2019-04-15 12:04:25.162945775 +0000
@@ -1806,10 +1806,8 @@ fi
+++ configure.ac 2020-08-11 10:17:21.102266456 +0000
@@ -1881,10 +1881,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -80,7 +83,7 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- doc/man/etags.1
+++ doc/man/etags.1 2019-04-15 12:04:25.162945775 +0000
+++ doc/man/etags.1 2020-08-11 10:17:21.102266456 +0000
@@ -7,7 +7,7 @@
..
@ -164,7 +167,7 @@
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2019-04-15 12:04:25.162945775 +0000
+++ lib-src/Makefile.in 2020-08-11 10:31:37.642931244 +0000
@@ -30,6 +30,8 @@ CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS = @CPPFLAGS@
@ -183,17 +186,17 @@
ebrowse${EXEEXT}
# Things that Emacs runs internally, or during the build process,
@@ -376,7 +378,7 @@ etags${EXEEXT}: ${etags_deps}
@@ -371,7 +373,7 @@ etags${EXEEXT}: ${etags_deps}
## etags.o files on top of each other.
## FIXME?
## Can't we use a wrapper that calls 'etags --ctags'?
-ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
+gnuctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs)
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
--- lib-src/pop.c
+++ lib-src/pop.c 2019-04-15 12:04:25.242944251 +0000
+++ lib-src/pop.c 2020-08-11 10:17:21.102266456 +0000
@@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
@ -203,7 +206,7 @@
#include "ntlib.h"
#undef _WIN32_WINNT
--- lib/Makefile.in
+++ lib/Makefile.in 2019-04-15 12:04:25.242944251 +0000
+++ lib/Makefile.in 2020-08-11 10:17:21.102266456 +0000
@@ -50,6 +50,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
@ -214,7 +217,7 @@
$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \
$(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el 2019-04-15 12:04:25.242944251 +0000
+++ lisp/cmuscheme.el 2020-08-11 10:17:21.106266385 +0000
@@ -241,7 +241,8 @@ is run).
(read-string "Run Scheme: " scheme-program-name)
scheme-program-name)))
@ -226,7 +229,7 @@
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2019-04-15 12:04:25.242944251 +0000
+++ lisp/international/mule-cmds.el 2020-08-11 10:17:21.106266385 +0000
@@ -39,6 +39,7 @@
(defvar mule-keymap
@ -236,8 +239,8 @@
(define-key map "r" 'revert-buffer-with-coding-system)
(define-key map "F" 'set-file-name-coding-system)
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2019-04-15 12:04:25.242944251 +0000
@@ -4971,7 +4971,7 @@ NEWNAME should be the name to give the n
+++ lisp/net/ange-ftp.el 2020-08-11 10:17:21.106266385 +0000
@@ -5066,7 +5066,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)
@ -246,7 +249,7 @@
; (save-match-data
; (string-match ange-ftp-vos-host-regexp host))))
;
@@ -5086,7 +5086,7 @@ NEWNAME should be the name to give the n
@@ -5181,7 +5181,7 @@ NEWNAME should be the name to give the n
;; Return non-nil if HOST is running VMS.
(defun ange-ftp-vms-host (host)
@ -255,7 +258,7 @@
(string-match-p ange-ftp-vms-host-regexp host)))
;; Because some VMS ftp servers convert filenames to lower case
@@ -5594,7 +5594,7 @@ Other orders of $ and _ seem to all work
@@ -5689,7 +5689,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running MTS.
(defun ange-ftp-mts-host (host)
@ -264,7 +267,7 @@
(string-match-p ange-ftp-mts-host-regexp host)))
;; Parse the current buffer which is assumed to be in mts ftp dir format.
@@ -5792,7 +5792,7 @@ Other orders of $ and _ seem to all work
@@ -5887,7 +5887,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running CMS.
(defun ange-ftp-cms-host (host)
@ -274,7 +277,7 @@
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2019-04-15 12:04:25.246944174 +0000
+++ lisp/site-load.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,41 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
@ -318,8 +321,8 @@
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el 2019-04-15 12:04:25.246944174 +0000
@@ -794,6 +794,7 @@ If you want to change this while speedba
+++ lisp/speedbar.el 2020-08-11 10:17:21.106266385 +0000
@@ -767,6 +767,7 @@ If you want to change this while speedba
;; Navigation.
(define-key map "n" 'speedbar-next)
@ -328,7 +331,7 @@
(define-key map "\M-n" 'speedbar-restricted-next)
(define-key map "\M-p" 'speedbar-restricted-prev)
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2019-04-15 12:04:25.246944174 +0000
+++ lisp/textmodes/ispell.el 2020-08-11 10:30:39.847965024 +0000
@@ -202,10 +202,12 @@ Must be greater than 1."
;; cause an error; and one of the other spelling engines below is
;; almost certainly installed in any case, for enchant to use.
@ -346,33 +349,23 @@
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:set (lambda (symbol value)
@@ -1194,7 +1196,8 @@ dictionary from that list was found."
(setq hunspell-default-dict (or hunspell-multi-dict
(car hunspell-default-dict)))
(setq hunspell-default-dict-entry
- (ispell-parse-hunspell-affix-file hunspell-default-dict))
+ (if hunspell-default-dict
+ (ispell-parse-hunspell-affix-file hunspell-default-dict) nil))
;; Create an alist of found dicts with only names, except for default dict.
(setq ispell-hunspell-dictionary-alist
(list (cons nil (cdr hunspell-default-dict-entry))))
@@ -1430,6 +1433,78 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
+ ;; Begin adding list for ispell dictonaries installed on SuSE
+ (if (and (functionp 'append-ispell-dict-alist)
+ (symbolp 'ispell-program-name)
+ (string-match "ispell" ispell-program-name))
@@ -1438,6 +1440,78 @@ The variable `ispell-library-directory'
;; Define commands in menu in opposite order you want them to appear.
(let ((map (make-sparse-keymap "Spell")))
+ ;; Begin adding list for ispell dictonaries installed on SuSE
+ (if (and (functionp 'append-ispell-dict-alist)
+ (symbolp 'ispell-program-name)
+ (string-match "ispell" ispell-program-name))
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ (path (and (boundp 'ispell-library-path) ispell-library-path))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict)
+ load-dict (car (cdr (member "-d" (nth 5 dict)))))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (define-key map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Ispell was configured"
+ (list 'lambda () '(interactive)
@ -383,60 +376,60 @@
+ (and load-dict
+ (or (file-exists-p(concat path "/" load-dict ".hash"))
+ (file-exists-p(concat path "/" load-dict ".has")))))
+ (define-key ispell-menu-map (vector (intern name))
+ (define-key map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name))))))))
+ (if (and (functionp 'ispell-find-aspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "aspell" ispell-program-name))
+ (progn
+ (ispell-find-aspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Aspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((and (stringp name)
+ (ispell-aspell-find-dictionary name))
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)))))))))
+ (if (and (functionp 'ispell-find-hunspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "hunspell" ispell-program-name))
+ (progn
+ (ispell-find-hunspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-hunspell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Hunspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((stringp name)
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)
+ )))))))))))
+ ;; End adding list for ispell dictonaries installed on SuSE
(define-key ispell-menu-map [ispell-change-dictionary]
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
:help ,(purecopy "Supply explicit dictionary file name")))
+ (if (and (functionp 'ispell-find-aspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "aspell" ispell-program-name))
+ (progn
+ (ispell-find-aspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Aspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((and (stringp name)
+ (ispell-aspell-find-dictionary name))
+ (define-key map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)))))))))
+ (if (and (functionp 'ispell-find-hunspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "hunspell" ispell-program-name))
+ (progn
+ (ispell-find-hunspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-hunspell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Hunspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((stringp name)
+ (define-key map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)
+ )))))))))))
+ ;; End adding list for ispell dictonaries installed on SuSE
(define-key map [ispell-change-dictionary]
`(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 2019-04-15 12:04:25.246944174 +0000
+++ site-lisp/term/func-keys.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
@ -472,7 +465,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el 2019-04-15 12:04:25.246944174 +0000
+++ site-lisp/term/gnome.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
@ -572,7 +565,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el 2019-04-15 12:04:25.246944174 +0000
+++ site-lisp/term/kvt.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
@ -672,7 +665,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el 2019-04-15 12:04:25.246944174 +0000
+++ site-lisp/term/linux.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
@ -754,7 +747,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el 2019-04-15 12:04:25.246944174 +0000
+++ site-lisp/term/locale.el 2020-08-11 10:17:21.106266385 +0000
@@ -0,0 +1,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path

3
emacs-27.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
size 43752012

11
emacs-27.1.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE1AWqLIYsVPF+7mvg6LzXhmr8+XgFAl8xzTYACgkQ6LzXhmr8
+XjGjAf/S3scggDm1G3/EAKf0nMPBNBJaRboWohoUviu6/024WHKdsZ+qJ1w7Ad2
saHbyoouiKJcq75rcfxe4faeRYy/V5QHchxfnvt092UnZrSMaq9jkjp5DUARxeZx
8pCB5OPC9BTMyT/gOe4mqIplYYBRsF26fcKfvcLTuZ45+4Jkii8CSNa9iJbYQoaW
41MqZFvPsQhRF7UH084ONxZnrXpBebrRSoY4yj1eM/lLtcHFgUvSg5UoP6EwXqcL
kkQB4+UGGOzxA3zwsLzmrq9gOa39w/pJY+Fs9+bYuf8xf2nbq3VnobKnPJveeMMq
0yTvrrY5E7/4vTXeb5ykmggNqTMa7w==
=29/a
-----END PGP SIGNATURE-----

View File

@ -1,31 +0,0 @@
From 72c5f71cd45c860299950cd058d8e13b87375741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Mouni=C3=A9?= <Gregory.Mounie@imag.fr>
Date: Sun, 2 Aug 2020 15:56:33 +0200
Subject: [PATCH] Avoid segfaults if XIM is set but not xim_styles
Emacs segfaults at the X11 initialization if XIM is set
and xim_styles is NULL. This patch avoids the crash.
* src/xfns.c: Check also if FRAME_X_XIM_STYLES(f) is NULL.
(Bug#42676) (Bug#42673) (Bug#42677)
Copyright-paperwork-exempt: yes
---
src/xfns.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/xfns.c src/xfns.c
index b89fac1cda..f9a00a6daf 100644
--- src/xfns.c
+++ src/xfns.c
@@ -2563,7 +2563,7 @@ create_frame_xic (struct frame *f)
goto out;
xim = FRAME_X_XIM (f);
- if (!xim)
+ if (!xim || ! FRAME_X_XIM_STYLES(f))
goto out;
/* Determine XIC style. */
--
2.26.2

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Aug 12 12:24:44 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Update to GNU Emacs version 27.1
* Emacs is now compliant with the latest version 13.0 of the Unicode Standard.
* Emacs can now use the XDG convention for init files.
The 'XDG_CONFIG_HOME' environment variable (which defaults to
"~/.config") specifies the XDG configuration parent directory.
Emacs checks for "init.el" and other configuration files inside
the "emacs" subdirectory of 'XDG_CONFIG_HOME', i.e.
"$XDG_CONFIG_HOME/emacs/init.el"
However, Emacs will still initially look for init files in their
traditional locations if "~/.emacs.d" or "~/.emacs" exist, even if
"$XDG_CONFIG_HOME/emacs" also exists. This means that you must delete
or rename any existing "~/.emacs.d" and "~/.emacs" to enable use of
the XDG directory.
* The varius changes can be read in detail at /usr/share/emacs/27.1/etc/NEWS
- Port and rename patch emacs-26.2.dif to emacs-27.1.dif
- Modify/port patches
* emacs-24.1-ps-mule.patch
* emacs-24.3-asian-print.patch
* emacs-24.3-iconic.patch
* emacs-24.3-x11r7.patch
* emacs-24.4-flyspell.patch
* emacs-24.4-glibc.patch
* emacs-24.4-nonvoid.patch
* emacs-24.4-ps-bdf.patch
* emacs-24.4-xim.patch
* emacs-25.1-custom-fonts.patch
* emacs-25.2-ImageMagick7.patch
* emacs-26.1-xft4x11.patch
- Remove patches now upstream solved
* xwidget.patch
* emacs-libX11-boo1175028.patch
- Add patch emacs-27.1-pdftex.patch to generate pdf files
- Add emacs-27.1-pdf.tar.xz as result of this to use texlive only once
- Use emacs.keyring to verify source tar ball
-------------------------------------------------------------------
Mon Aug 10 12:31:55 UTC 2020 - Dr. Werner Fink <werner@suse.de>

BIN
emacs.keyring Normal file

Binary file not shown.

View File

@ -22,12 +22,10 @@
%else
%bcond_with mailutils
%endif
# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
%bcond_with cairo
%bcond_without cairo
%bcond_with tex4pdf
Name: emacs
BuildRequires: ImageMagick
BuildRequires: ImageMagick-devel
%if %{with autoconf}
BuildRequires: autoconf
BuildRequires: automake
@ -68,6 +66,13 @@ BuildRequires: ncurses-devel
BuildRequires: system-user-games
%endif
BuildRequires: systemd-rpm-macros
%if %{with tex4pdf}
BuildRequires: texlive-collection-basic
BuildRequires: texlive-collection-langcyrillic
BuildRequires: texlive-collection-langczechslovak
BuildRequires: texlive-collection-langpolish
BuildRequires: texlive-lh
%endif
BuildRequires: update-alternatives
BuildRequires: update-desktop-files
BuildRequires: xz
@ -75,15 +80,34 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(ice)
%if %{with tex4pdf}
BuildRequires: tex(babel.sty)
BuildRequires: tex(fontenc.sty)
BuildRequires: tex(geometry.sty)
BuildRequires: tex(german.sty)
BuildRequires: tex(graphicx.sty)
BuildRequires: tex(ifpdf.sty)
BuildRequires: tex(inputenc.sty)
BuildRequires: tex(multicol.sty)
BuildRequires: tex(supertabular.sty)
BuildRequires: tex(t2aenc.def)
BuildRequires: tex(tabularx.sty)
BuildRequires: tex(verbatim.sty)
%endif
%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(libacl)
%else
BuildRequires: libacl-devel
%endif
BuildRequires: pkgconfig(jansson)
BuildRequires: pkgconfig(json)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sm)
@ -103,7 +127,7 @@ BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xxf86vm)
URL: http://www.gnu.org/software/emacs/
Version: 26.3
Version: 27.1
Release: 0
Summary: GNU Emacs Base Package
License: GPL-3.0-or-later
@ -129,7 +153,11 @@ Source2: site-lisp.tar.bz2
Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc
Source5: emacs.sh
Patch: emacs-26.2.dif
Source6: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
# https://ftp.gnu.org/gnu/gnu-keyring.gpg
Source7: %{name}.keyring
Source8: emacs-%{version}-pdf.tar.xz
Patch: emacs-27.1.dif
# PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change
Patch2: emacs-24.4-glibc.patch
Patch4: emacs-24.3-asian-print.patch
@ -146,8 +174,7 @@ Patch23: emacs-25.1-custom-fonts.patch
# symlink
Patch24: emacs-25.2-ImageMagick7.patch
Patch25: emacs-26.1-xft4x11.patch
Patch26: xwidget.patch
Patch27: emacs-libX11-boo1175028.patch
Patch26: emacs-27.1-pdftex.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
@ -170,7 +197,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{undefined ext_el}
%define ext_el .gz
%endif
%define info_files emacs eintr elisp ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-mime epa erc ert eshell eudc efaq eww flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
%define info_files emacs eintr elisp auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-mime epa erc ert eshell eudc efaq eww flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
%description
Basic package for the GNU Emacs editor. Requires emacs-x11 or
@ -260,9 +287,13 @@ and most assembler-like syntaxes.
%patch23 -p0 -b .custfnt
%patch24 -p1 -b .imag
%patch25 -p0 -b .xft
%patch26 -p1 -b .xwd
%patch27 -p0 -b .boo1175028
%patch26 -p0 -b .fmt
%patch -p0 -b .0
%if %{without tex4pdf}
pushd etc/refcards/
tar --use-compress-program=xz -xf %{S:8}
popd
%endif
%build
%if %{without autoconf}
@ -478,7 +509,7 @@ export ac_cv_lib_gif_EGifPutExtensionLast
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
make_mchkoff bootstrap
make -C lisp updates compile
make -C lisp/ updates compile
for i in `find site-lisp/ -name '*.el'`; do
src/emacs -batch -q --no-site -f batch-byte-compile $i; \
done
@ -493,11 +524,18 @@ make distclean
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS}
make_mchkoff
cp src/emacs emacs-x11
%if %{with tex4pdf}
#
cd ../site-lisp/
make -C etc/refcards/
%endif
#
pushd ../site-lisp/
../emacs-%{version}/src/emacs -batch -q --no-site -f batch-byte-compile *.el
rm -vf site-start.elc
rm -vf site-start.el.orig
popd
%install
#
@ -563,6 +601,7 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.mule
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.README
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/refcards/*.fmt
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el.psbdf
@ -690,11 +729,11 @@ fi
%dir %{_prefix}/lib/emacs/
%dir %{_prefix}/lib/emacs/%{version}/
%dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs.pdmp
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl
%if %{without mailutils}
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail
%endif
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
%if 0
%attr(04755,games,games) %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
@ -709,23 +748,17 @@ fi
%dir %{_datadir}/emacs/%{version}/etc/
%doc %{_datadir}/emacs/%{version}/etc/AUTHORS
%doc %{_datadir}/emacs/%{version}/etc/CALC-NEWS
%doc %{_datadir}/emacs/%{version}/etc/CENSORSHIP
%doc %{_datadir}/emacs/%{version}/etc/COPYING
%doc %{_datadir}/emacs/%{version}/etc/DEBUG
%doc %{_datadir}/emacs/%{version}/etc/DEVEL.HUMOR
%doc %{_datadir}/emacs/%{version}/etc/DISTRIB
%{_datadir}/emacs/%{version}/etc/DOC
%doc %{_datadir}/emacs/%{version}/etc/ERC-NEWS
%doc %{_datadir}/emacs/%{version}/etc/FTP
%doc %{_datadir}/emacs/%{version}/etc/GNU
%doc %{_datadir}/emacs/%{version}/etc/GNUS-NEWS
%doc %{_datadir}/emacs/%{version}/etc/HELLO
%doc %{_datadir}/emacs/%{version}/etc/HISTORY
%doc %{_datadir}/emacs/%{version}/etc/JOKES
%doc %{_datadir}/emacs/%{version}/etc/LINUX-GNU
%doc %{_datadir}/emacs/%{version}/etc/MACHINES
%doc %{_datadir}/emacs/%{version}/etc/MH-E-NEWS
%doc %{_datadir}/emacs/%{version}/etc/MORE.STUFF
%{_datadir}/emacs/%{version}/etc/NEWS
%doc %{_datadir}/emacs/%{version}/etc/NEWS.1-17
%doc %{_datadir}/emacs/%{version}/etc/NEWS.18
@ -736,16 +769,14 @@ fi
%doc %{_datadir}/emacs/%{version}/etc/NEWS.23
%doc %{_datadir}/emacs/%{version}/etc/NEWS.24
%doc %{_datadir}/emacs/%{version}/etc/NEWS.25
%doc %{_datadir}/emacs/%{version}/etc/NEWS.26
%doc %{_datadir}/emacs/%{version}/etc/NEXTSTEP
%doc %{_datadir}/emacs/%{version}/etc/NXML-NEWS
%doc %{_datadir}/emacs/%{version}/etc/ORDERS
%doc %{_datadir}/emacs/%{version}/etc/ORG-NEWS
%doc %{_datadir}/emacs/%{version}/etc/PROBLEMS
%doc %{_datadir}/emacs/%{version}/etc/README
%doc %{_datadir}/emacs/%{version}/etc/TERMS
%doc %{_datadir}/emacs/%{version}/etc/THE-GNU-PROJECT
%doc %{_datadir}/emacs/%{version}/etc/TODO
%doc %{_datadir}/emacs/%{version}/etc/WHY-FREE
%dir %{_datadir}/emacs/%{version}/etc/charsets/
%{_datadir}/emacs/%{version}/etc/charsets/8859-10.map
%{_datadir}/emacs/%{version}/etc/charsets/8859-11.map
@ -1209,6 +1240,7 @@ fi
%dir %{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/apps/
%{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/apps/emacs.svg
%{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/apps/emacs23.svg
%{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/apps/emacs.ico
%dir %{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/mimetypes/
%{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
%{_datadir}/emacs/%{version}/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
@ -1426,10 +1458,17 @@ fi
%{_datadir}/emacs/%{version}/etc/images/sort-row-ascending.xpm
%{_datadir}/emacs/%{version}/etc/images/spell.pbm
%{_datadir}/emacs/%{version}/etc/images/spell.xpm
%{_datadir}/emacs/%{version}/etc/images/splash.bmp
%{_datadir}/emacs/%{version}/etc/images/splash.pbm
%{_datadir}/emacs/%{version}/etc/images/splash.png
%{_datadir}/emacs/%{version}/etc/images/splash.svg
%{_datadir}/emacs/%{version}/etc/images/splash.xpm
%dir %{_datadir}/emacs/%{version}/etc/images/tabs/
%doc %{_datadir}/emacs/%{version}/etc/images/tabs/README
%{_datadir}/emacs/%{version}/etc/images/tabs/close.xpm
%{_datadir}/emacs/%{version}/etc/images/tabs/left-arrow.xpm
%{_datadir}/emacs/%{version}/etc/images/tabs/new.xpm
%{_datadir}/emacs/%{version}/etc/images/tabs/right-arrow.xpm
%dir %{_datadir}/emacs/%{version}/etc/images/tree-widget/
%dir %{_datadir}/emacs/%{version}/etc/images/tree-widget/default/
%doc %{_datadir}/emacs/%{version}/etc/images/tree-widget/default/README
@ -1610,6 +1649,7 @@ fi
%{_datadir}/emacs/%{version}/etc/srecode/getset-cpp.srt
%{_datadir}/emacs/%{version}/etc/srecode/java.srt
%{_datadir}/emacs/%{version}/etc/srecode/make.srt
%{_datadir}/emacs/%{version}/etc/srecode/proj-test.srt
%{_datadir}/emacs/%{version}/etc/srecode/template.srt
%{_datadir}/emacs/%{version}/etc/srecode/test.srt
%{_datadir}/emacs/%{version}/etc/srecode/texi.srt
@ -1748,6 +1788,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/calendar/hol-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/calendar/holidays.elc
%{_datadir}/emacs/%{version}/lisp/calendar/icalendar.elc
%{_datadir}/emacs/%{version}/lisp/calendar/iso8601.elc
%{_datadir}/emacs/%{version}/lisp/calendar/lunar.elc
%{_datadir}/emacs/%{version}/lisp/calendar/parse-time.elc
%{_datadir}/emacs/%{version}/lisp/calendar/solar.elc
@ -1940,6 +1981,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/descr-text.elc
%{_datadir}/emacs/%{version}/lisp/desktop.elc
%{_datadir}/emacs/%{version}/lisp/dframe.elc
%{_datadir}/emacs/%{version}/lisp/display-fill-column-indicator.elc
%{_datadir}/emacs/%{version}/lisp/dired-aux.elc
%{_datadir}/emacs/%{version}/lisp/dired-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/dired-x.elc
@ -1968,6 +2010,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/autoload.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/avl-tree.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/backquote.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/backtrace.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/benchmark.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/bindat.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/byte-opt.elc
@ -1986,7 +2029,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/crm.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cursor-sensor.elc
@ -2011,6 +2053,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-x.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ewoc.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/faceup.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-func.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/generator.elc
@ -2046,6 +2089,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-unsafep.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/text-property-search.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/thunk.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer.elc
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer-list.elc
@ -2095,6 +2139,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/erc/erc-identd.elc
%{_datadir}/emacs/%{version}/lisp/erc/erc-imenu.elc
%{_datadir}/emacs/%{version}/lisp/erc/erc-join.elc
%{_datadir}/emacs/%{version}/lisp/erc/erc-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/erc/erc-lang.elc
%{_datadir}/emacs/%{version}/lisp/erc/erc-list.elc
%{_datadir}/emacs/%{version}/lisp/erc/erc-log.elc
@ -2153,6 +2198,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/faces.elc
%{_datadir}/emacs/%{version}/lisp/ffap.elc
%{_datadir}/emacs/%{version}/lisp/filecache.elc
%{_datadir}/emacs/%{version}/lisp/fileloop.elc
%{_datadir}/emacs/%{version}/lisp/filenotify.elc
%{_datadir}/emacs/%{version}/lisp/files-x.elc
%{_datadir}/emacs/%{version}/lisp/files.elc
@ -2307,7 +2353,9 @@ fi
%{_datadir}/emacs/%{version}/lisp/imenu.elc
%dir %{_datadir}/emacs/%{version}/lisp/image/
%{_datadir}/emacs/%{version}/lisp/image/compface.elc
%{_datadir}/emacs/%{version}/lisp/image/exif.elc
%{_datadir}/emacs/%{version}/lisp/image/gravatar.elc
%{_datadir}/emacs/%{version}/lisp/image/image-converter.elc
%{_datadir}/emacs/%{version}/lisp/indent.elc
%{_datadir}/emacs/%{version}/lisp/info-look.elc
%{_datadir}/emacs/%{version}/lisp/info-xref.elc
@ -2368,6 +2416,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.elc
%{_datadir}/emacs/%{version}/lisp/jka-compr.elc
%{_datadir}/emacs/%{version}/lisp/json.elc
%{_datadir}/emacs/%{version}/lisp/jsonrpc.elc
%{_datadir}/emacs/%{version}/lisp/htmlfontify-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/kermit.elc
%{_datadir}/emacs/%{version}/lisp/kmacro.elc
@ -2397,6 +2446,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/language/lao-util.elc
%{_datadir}/emacs/%{version}/lisp/language/lao.elc
%{_datadir}/emacs/%{version}/lisp/language/misc-lang.elc
%{_datadir}/emacs/%{version}/lisp/language/pinyin.elc
%{_datadir}/emacs/%{version}/lisp/language/romanian.elc
%{_datadir}/emacs/%{version}/lisp/language/sinhala.elc
%{_datadir}/emacs/%{version}/lisp/language/slovak.elc
@ -2463,6 +2513,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-b5.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-cns.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/rfc1345.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/sami.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/sgml-input.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/sisheng.elc
%{_datadir}/emacs/%{version}/lisp/leim/quail/slovak.elc
@ -2629,18 +2680,20 @@ fi
%{_datadir}/emacs/%{version}/lisp/net/soap-client.elc
%{_datadir}/emacs/%{version}/lisp/net/soap-inspect.elc
%{_datadir}/emacs/%{version}/lisp/net/socks.elc
%{_datadir}/emacs/%{version}/lisp/net/starttls.elc
%{_datadir}/emacs/%{version}/lisp/net/telnet.elc
%{_datadir}/emacs/%{version}/lisp/net/tls.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-archive.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-adb.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-cache.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-compat.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-integration.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/net/tramp-sh.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-smb.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-sudoedit.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-rclone.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp-uu.elc
%{_datadir}/emacs/%{version}/lisp/net/tramp.elc
%{_datadir}/emacs/%{version}/lisp/net/trampver.elc
@ -2678,6 +2731,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/assoc.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/bruce.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/cl.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/complete.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/crisp.elc
@ -2688,6 +2742,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/gs.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/gulp.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/html2text.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/info-edit.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/iswitchb.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/landmark.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc
@ -2696,13 +2751,13 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/longlines.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/lucid.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/mantemp.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/meese.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/messcompat.el
%{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/options.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/otodo-mode.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.elc
@ -2716,18 +2771,33 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/s-region.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/sregex.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/starttls.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/terminal.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/tls.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-mapper.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/url-ns.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/vc-arch.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/vi.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/vip.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/xesam.elc
%{_datadir}/emacs/%{version}/lisp/obsolete/yow.elc
%dir %{_datadir}/emacs/%{version}/lisp/org/
%{_datadir}/emacs/%{version}/lisp/org/ob-eshell.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-bbdb.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-bibtex.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-docview.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-eshell.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-eww.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-gnus.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-info.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-irc.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-mhe.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-rmail.elc
%{_datadir}/emacs/%{version}/lisp/org/ol-w3m.elc
%{_datadir}/emacs/%{version}/lisp/org/ol.elc
%{_datadir}/emacs/%{version}/lisp/org/ob-C.elc
%{_datadir}/emacs/%{version}/lisp/org/ob-J.elc
%{_datadir}/emacs/%{version}/lisp/org/ob-R.elc
@ -2755,7 +2825,6 @@ fi
%{_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
%{_datadir}/emacs/%{version}/lisp/org/ob-latex.elc
%{_datadir}/emacs/%{version}/lisp/org/ob-ledger.elc
%{_datadir}/emacs/%{version}/lisp/org/ob-lilypond.elc
@ -2792,8 +2861,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/org-agenda.elc
%{_datadir}/emacs/%{version}/lisp/org/org-archive.elc
%{_datadir}/emacs/%{version}/lisp/org/org-attach.elc
%{_datadir}/emacs/%{version}/lisp/org/org-bbdb.elc
%{_datadir}/emacs/%{version}/lisp/org/org-bibtex.elc
%{_datadir}/emacs/%{version}/lisp/org/org-attach-git.elc
%{_datadir}/emacs/%{version}/lisp/org/org-capture.elc
%{_datadir}/emacs/%{version}/lisp/org/org-clock.elc
%{_datadir}/emacs/%{version}/lisp/org/org-colview.elc
@ -2801,40 +2869,35 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/org-crypt.elc
%{_datadir}/emacs/%{version}/lisp/org/org-ctags.elc
%{_datadir}/emacs/%{version}/lisp/org/org-datetree.elc
%{_datadir}/emacs/%{version}/lisp/org/org-docview.elc
%{_datadir}/emacs/%{version}/lisp/org/org-duration.elc
%{_datadir}/emacs/%{version}/lisp/org/org-element.elc
%{_datadir}/emacs/%{version}/lisp/org/org-entities.elc
%{_datadir}/emacs/%{version}/lisp/org/org-eshell.elc
%{_datadir}/emacs/%{version}/lisp/org/org-eww.elc
%{_datadir}/emacs/%{version}/lisp/org/org-faces.elc
%{_datadir}/emacs/%{version}/lisp/org/org-feed.elc
%{_datadir}/emacs/%{version}/lisp/org/org-footnote.elc
%{_datadir}/emacs/%{version}/lisp/org/org-gnus.elc
%{_datadir}/emacs/%{version}/lisp/org/org-goto.elc
%{_datadir}/emacs/%{version}/lisp/org/org-habit.elc
%{_datadir}/emacs/%{version}/lisp/org/org-id.elc
%{_datadir}/emacs/%{version}/lisp/org/org-indent.elc
%{_datadir}/emacs/%{version}/lisp/org/org-info.elc
%{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.elc
%{_datadir}/emacs/%{version}/lisp/org/org-install.el
%{_datadir}/emacs/%{version}/lisp/org/org-irc.elc
%{_datadir}/emacs/%{version}/lisp/org/org-keys.elc
%{_datadir}/emacs/%{version}/lisp/org/org-lint.elc
%{_datadir}/emacs/%{version}/lisp/org/org-list.elc
%{_datadir}/emacs/%{version}/lisp/org/org-loaddefs.el
%{_datadir}/emacs/%{version}/lisp/org/org-macro.elc
%{_datadir}/emacs/%{version}/lisp/org/org-macs.elc
%{_datadir}/emacs/%{version}/lisp/org/org-mhe.elc
%{_datadir}/emacs/%{version}/lisp/org/org-mobile.elc
%{_datadir}/emacs/%{version}/lisp/org/org-mouse.elc
%{_datadir}/emacs/%{version}/lisp/org/org-num.elc
%{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.elc
%{_datadir}/emacs/%{version}/lisp/org/org-plot.elc
%{_datadir}/emacs/%{version}/lisp/org/org-protocol.elc
%{_datadir}/emacs/%{version}/lisp/org/org-rmail.elc
%{_datadir}/emacs/%{version}/lisp/org/org-src.elc
%{_datadir}/emacs/%{version}/lisp/org/org-table.elc
%{_datadir}/emacs/%{version}/lisp/org/org-tempo.elc
%{_datadir}/emacs/%{version}/lisp/org/org-timer.elc
%{_datadir}/emacs/%{version}/lisp/org/org-version.el
%{_datadir}/emacs/%{version}/lisp/org/org-w3m.elc
%{_datadir}/emacs/%{version}/lisp/org/org.elc
%{_datadir}/emacs/%{version}/lisp/org/ox-ascii.elc
%{_datadir}/emacs/%{version}/lisp/org/ox-beamer.elc
@ -2890,10 +2953,6 @@ fi
%{_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
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-stmt.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-xref.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/antlr-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/asm-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/autoconf.elc
@ -2918,6 +2977,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/progmodes/cperl-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/cpp.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/cwarn.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/flymake-cc.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/dcl-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-abn.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/ebnf-bnf.elc
@ -2952,7 +3012,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/progmodes/ld-script.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/m4-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/make-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/mantemp.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/meta-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/mixal-mode.elc
%{_datadir}/emacs/%{version}/lisp/progmodes/modula2.elc
@ -3010,6 +3069,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/simple.elc
%{_datadir}/emacs/%{version}/lisp/site-load.el
%{_datadir}/emacs/%{version}/lisp/skeleton.el
%{_datadir}/emacs/%{version}/lisp/so-long.elc
%{_datadir}/emacs/%{version}/lisp/sort.elc
%{_datadir}/emacs/%{version}/lisp/soundex.elc
%{_datadir}/emacs/%{version}/lisp/speedbar.elc
@ -3019,6 +3079,8 @@ fi
%{_datadir}/emacs/%{version}/lisp/subr.elc
%{_datadir}/emacs/%{version}/lisp/svg.elc
%{_datadir}/emacs/%{version}/lisp/t-mouse.elc
%{_datadir}/emacs/%{version}/lisp/tab-bar.elc
%{_datadir}/emacs/%{version}/lisp/tab-line.elc
%{_datadir}/emacs/%{version}/lisp/tabify.elc
%{_datadir}/emacs/%{version}/lisp/talk.elc
%{_datadir}/emacs/%{version}/lisp/tar-mode.elc
@ -3100,6 +3162,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/textmodes/two-column.elc
%{_datadir}/emacs/%{version}/lisp/textmodes/underline.elc
%{_datadir}/emacs/%{version}/lisp/thingatpt.elc
%{_datadir}/emacs/%{version}/lisp/thread.elc
%{_datadir}/emacs/%{version}/lisp/thumbs.elc
%{_datadir}/emacs/%{version}/lisp/time-stamp.elc
%{_datadir}/emacs/%{version}/lisp/time.elc
@ -3136,7 +3199,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/url/url-misc.elc
%{_datadir}/emacs/%{version}/lisp/url/url-news.elc
%{_datadir}/emacs/%{version}/lisp/url/url-nfs.elc
%{_datadir}/emacs/%{version}/lisp/url/url-ns.elc
%{_datadir}/emacs/%{version}/lisp/url/url-parse.elc
%{_datadir}/emacs/%{version}/lisp/url/url-privacy.elc
%{_datadir}/emacs/%{version}/lisp/url/url-proxy.elc
@ -3241,6 +3303,7 @@ fi
%{_datadir}/icons/hicolor/24x24/apps/emacs.png
%{_datadir}/icons/hicolor/32x32/apps/emacs.png
%{_datadir}/icons/hicolor/48x48/apps/emacs.png
%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
@ -3344,6 +3407,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/calendar/diary-lib.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/holidays.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/icalendar.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/iso8601.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/lunar.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/parse-time.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/calendar/solar.el%{ext_el}
@ -3527,6 +3591,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/dired.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/dirtrack.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/disp-table.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/display-fill-column-indicator.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/display-line-numbers.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/dnd.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/doc-view.el%{ext_el}
@ -3547,6 +3612,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/advice.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/autoload.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/avl-tree.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/backtrace.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/backquote.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/benchmark.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/bindat.el%{ext_el}
@ -3565,7 +3631,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/crm.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cursor-sensor.el%{ext_el}
@ -3589,6 +3654,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-x.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ewoc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/faceup.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-func.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/float-sup.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/generator.el%{ext_el}
@ -3624,6 +3690,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-unsafep.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/testcover.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/text-property-search.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/thunk.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/emacs-lisp/timer-list.el%{ext_el}
@ -3727,6 +3794,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/faces.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/ffap.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/filecache.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/fileloop.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/filenotify.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/files-x.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/files.el%{ext_el}
@ -3874,7 +3942,9 @@ fi
%{_datadir}/emacs/%{version}/lisp/image-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/image.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/image/compface.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/image/exif.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/image/gravatar.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/image/image-converter.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/imenu.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/indent.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/info-look.el%{ext_el}
@ -3916,6 +3986,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/jka-compr.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/json.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/jsonrpc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/kermit.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/kmacro.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/burmese.el%{ext_el}
@ -3943,6 +4014,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/language/lao-util.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/lao.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/misc-lang.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/pinyin.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/romanian.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/sinhala.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/language/slovak.el%{ext_el}
@ -4004,6 +4076,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-b5.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/quick-cns.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/rfc1345.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/sami.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/sgml-input.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/sisheng.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/leim/quail/slovak.el%{ext_el}
@ -4161,17 +4234,19 @@ fi
%{_datadir}/emacs/%{version}/lisp/net/soap-client.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/soap-inspect.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/socks.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/starttls.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/telnet.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tls.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-archive.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-adb.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-cache.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-cmds.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-compat.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-gvfs.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-integration.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-rclone.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-sh.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-smb.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-sudoedit.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp-uu.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/tramp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/net/trampver.el%{ext_el}
@ -4206,6 +4281,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/assoc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/bruce.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/cl.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/complete.el%{ext_el}
@ -4218,6 +4294,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/gs.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/iswitchb.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/html2text.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/info-edit.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/landmark.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/ledit.el%{ext_el}
@ -4226,11 +4303,11 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/longlines.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/lucid.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/mailpost.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/mantemp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/meese.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/options.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/otodo-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.el%{ext_el}
@ -4244,17 +4321,31 @@ fi
%{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/s-region.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/sregex.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/starttls.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/terminal.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/tls.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-mapper.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/url-ns.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/vc-arch.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/vi.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/vip.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/xesam.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/obsolete/yow.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-bbdb.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-bibtex.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-docview.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-eshell.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-eww.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-gnus.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-info.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-irc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-mhe.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-rmail.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol-w3m.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ol.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-C.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-J.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-R.el%{ext_el}
@ -4271,6 +4362,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/ob-dot.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-ebnf.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-eshell.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-eval.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-exp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-forth.el%{ext_el}
@ -4282,7 +4374,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/ob-io.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-java.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-js.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-keys.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-latex.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-ledger.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ob-lilypond.el%{ext_el}
@ -4319,8 +4410,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/org-agenda.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-archive.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-attach.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-bbdb.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-bibtex.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-attach-git.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-capture.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-clock.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-colview.el%{ext_el}
@ -4328,37 +4418,32 @@ fi
%{_datadir}/emacs/%{version}/lisp/org/org-crypt.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-ctags.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-datetree.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-docview.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-duration.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-element.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-entities.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-eshell.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-eww.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-faces.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-feed.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-footnote.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-gnus.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-goto.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-habit.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-id.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-indent.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-info.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-inlinetask.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-irc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-keys.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-lint.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-list.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-macro.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-macs.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-mhe.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-mobile.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-mouse.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-num.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-plot.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-protocol.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-rmail.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-src.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-table.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-tempo.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-timer.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org-w3m.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/org.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ox-ascii.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/org/ox-beamer.el%{ext_el}
@ -4412,10 +4497,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/printing.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/proced.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/profiler.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-prj.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-stmt.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/ada-xref.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/antlr-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/asm-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/autoconf.el%{ext_el}
@ -4455,6 +4536,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/progmodes/executable.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/f90.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/flymake.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/flymake-cc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/flymake-proc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/fortran.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/gdb-mi.el%{ext_el}
@ -4474,7 +4556,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/progmodes/ld-script.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/m4-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/make-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/mantemp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/meta-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/mixal-mode.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/progmodes/modula2.el%{ext_el}
@ -4529,6 +4610,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/shadowfile.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/shell.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/simple.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/so-long.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/sort.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/soundex.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/speedbar.el%{ext_el}
@ -4537,6 +4619,8 @@ fi
%{_datadir}/emacs/%{version}/lisp/subr.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/svg.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/t-mouse.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/tab-bar.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/tab-line.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/tabify.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/talk.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/tar-mode.el%{ext_el}
@ -4613,6 +4697,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/textmodes/two-column.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/textmodes/underline.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/thingatpt.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/thread.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/thumbs.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/time-stamp.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/time.el%{ext_el}
@ -4648,7 +4733,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/url/url-misc.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-news.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-nfs.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-ns.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-parse.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-privacy.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/url/url-proxy.el%{ext_el}

View File

@ -1,167 +0,0 @@
Index: emacs-26.1/src/xwidget.c
===================================================================
---
emacs-26.2/src/xwidget.c | 85 ++++++++++++++++++++++++++++++++---------------
emacs-26.2/src/xwidget.h | 3 +
2 files changed, 61 insertions(+), 27 deletions(-)
--- emacs-26.2/src/xwidget.c
+++ emacs-26.2/src/xwidget.c 2019-04-15 12:01:41.038073221 +0000
@@ -364,7 +364,7 @@ webkit_js_to_lisp (JSContextRef context,
static void
webkit_javascript_finished_cb (GObject *webview,
GAsyncResult *result,
- gpointer lisp_callback)
+ gpointer arg)
{
WebKitJavascriptResult *js_result;
JSValueRef value;
@@ -372,6 +372,11 @@ webkit_javascript_finished_cb (GObject
GError *error = NULL;
struct xwidget *xw = g_object_get_data (G_OBJECT (webview),
XG_XWIDGET);
+ ptrdiff_t script_idx = (intptr_t) arg;
+ Lisp_Object script_callback = AREF (xw->script_callbacks, script_idx);
+ ASET (xw->script_callbacks, script_idx, Qnil);
+ if (!NILP (script_callback))
+ xfree (XSAVE_POINTER (XCAR (script_callback), 0));
js_result = webkit_web_view_run_javascript_finish
(WEBKIT_WEB_VIEW (webview), result, &error);
@@ -383,19 +388,19 @@ webkit_javascript_finished_cb (GObject
return;
}
- context = webkit_javascript_result_get_global_context (js_result);
- value = webkit_javascript_result_get_value (js_result);
- Lisp_Object lisp_value = webkit_js_to_lisp (context, value);
- webkit_javascript_result_unref (js_result);
+ if (!NILP (script_callback) && !NILP (XCDR (script_callback)))
+ {
+ context = webkit_javascript_result_get_global_context (js_result);
+ value = webkit_javascript_result_get_value (js_result);
+ Lisp_Object lisp_value = webkit_js_to_lisp (context, value);
+
+ /* Register an xwidget event here, which then runs the callback.
+ This ensures that the callback runs in sync with the Emacs
+ event loop. */
+ store_xwidget_js_callback_event (xw, XCDR (script_callback), lisp_value);
+ }
- /* Register an xwidget event here, which then runs the callback.
- This ensures that the callback runs in sync with the Emacs
- event loop. */
- /* FIXME: This might lead to disaster if LISP_CALLBACK's object
- was garbage collected before now. See the FIXME in
- Fxwidget_webkit_execute_script. */
- store_xwidget_js_callback_event (xw, XIL ((intptr_t) lisp_callback),
- lisp_value);
+ webkit_javascript_result_unref (js_result);
}
@@ -693,8 +698,7 @@ DEFUN ("xwidget-webkit-goto-uri",
DEFUN ("xwidget-webkit-zoom",
Fxwidget_webkit_zoom, Sxwidget_webkit_zoom,
2, 2, 0,
- doc: /* Change the zoom factor of the xwidget webkit instance
-referenced by XWIDGET. */)
+ doc: /* Change the zoom factor of the xwidget webkit instance referenced by XWIDGET. */)
(Lisp_Object xwidget, Lisp_Object factor)
{
WEBKIT_FN_INIT ();
@@ -709,12 +713,33 @@ referenced by XWIDGET. */)
return Qnil;
}
+/* Save script and fun in the script/callback save vector and return
+ its index. */
+static ptrdiff_t
+save_script_callback (struct xwidget *xw, Lisp_Object script, Lisp_Object fun)
+{
+ Lisp_Object cbs = xw->script_callbacks;
+ if (NILP (cbs))
+ xw->script_callbacks = cbs = Fmake_vector (make_number (32), Qnil);
+
+ /* Find first free index. */
+ ptrdiff_t idx;
+ for (idx = 0; !NILP (AREF (cbs, idx)); idx++)
+ if (idx + 1 == ASIZE (cbs))
+ {
+ xw->script_callbacks = cbs = larger_vector (cbs, 1, -1);
+ break;
+ }
+
+ ASET (cbs, idx, Fcons (make_save_ptr (xlispstrdup (script)), fun));
+ return idx;
+}
DEFUN ("xwidget-webkit-execute-script",
Fxwidget_webkit_execute_script, Sxwidget_webkit_execute_script,
2, 3, 0,
- doc: /* Make the Webkit XWIDGET execute JavaScript SCRIPT. If
-FUN is provided, feed the JavaScript return value to the single
+ doc: /* Make the Webkit XWIDGET execute JavaScript SCRIPT.
+If FUN is provided, feed the JavaScript return value to the single
argument procedure FUN.*/)
(Lisp_Object xwidget, Lisp_Object script, Lisp_Object fun)
{
@@ -723,23 +748,19 @@ argument procedure FUN.*/)
if (!NILP (fun) && !FUNCTIONP (fun))
wrong_type_argument (Qinvalid_function, fun);
- GAsyncReadyCallback callback
- = FUNCTIONP (fun) ? webkit_javascript_finished_cb : NULL;
+ script = ENCODE_SYSTEM (script);
- /* FIXME: The following hack assumes USE_LSB_TAG. */
- verify (USE_LSB_TAG);
- /* FIXME: This hack might lead to disaster if FUN is garbage
- collected before store_xwidget_js_callback_event makes it visible
- to Lisp again. See the FIXME in webkit_javascript_finished_cb. */
- gpointer callback_arg = (gpointer) (intptr_t) XLI (fun);
+ /* Protect script and fun during GC. */
+ intptr_t idx = save_script_callback (xw, script, fun);
/* JavaScript execution happens asynchronously. If an elisp
callback function is provided we pass it to the C callback
procedure that retrieves the return value. */
webkit_web_view_run_javascript (WEBKIT_WEB_VIEW (xw->widget_osr),
- SSDATA (script),
+ XSAVE_POINTER (XCAR (AREF (xw->script_callbacks, idx)), 0),
NULL, /* cancelable */
- callback, callback_arg);
+ webkit_javascript_finished_cb,
+ (gpointer) idx);
return Qnil;
}
@@ -1204,6 +1225,16 @@ kill_buffer_xwidgets (Lisp_Object buffer
gtk_widget_destroy (xw->widget_osr);
gtk_widget_destroy (xw->widgetwindow_osr);
}
+ if (!NILP (xw->script_callbacks))
+ {
+ ptrdiff_t idx;
+ for (idx = 0; idx < ASIZE (xw->script_callbacks); idx++)
+ {
+ if (!NILP (AREF (xw->script_callbacks, idx)))
+ xfree (XSAVE_POINTER (XCAR (AREF (xw->script_callbacks, idx)), 0));
+ ASET (xw->script_callbacks, idx, Qnil);
+ }
+ }
}
}
}
--- emacs-26.2/src/xwidget.h
+++ emacs-26.2/src/xwidget.h 2019-04-15 12:01:41.038073221 +0000
@@ -47,6 +47,9 @@ struct xwidget
/* A title used for button labels, for instance. */
Lisp_Object title;
+ /* Vector of currently executing scripts with callbacks. */
+ Lisp_Object script_callbacks;
+
/* Here ends the Lisp part. "height" is the marker field. */
int height;