diff --git a/boo1178942-bedb3cb6.patch b/boo1178942-bedb3cb6.patch deleted file mode 100644 index 11b29ce..0000000 --- a/boo1178942-bedb3cb6.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bedb3cb66541fd4dd35cf15261c6d99f132e7d2c Mon Sep 17 00:00:00 2001 -From: Eli Zaretskii -Date: Wed, 15 Apr 2020 14:28:21 +0300 -Subject: [PATCH] Avoid infloop in redisplay when wrap-prefix is too wide - -* src/xdisp.c (move_it_to): Avoid infloop due to wrap-prefix that -is wide enough to leave no space to display even the first -character of the continuation line. (Bug#40632) ---- - src/xdisp.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - ---- src/xdisp.c -+++ src/xdisp.c 2021-09-09 10:14:45.107931449 +0000 -@@ -9727,9 +9727,13 @@ move_it_to (struct it *it, ptrdiff_t to_ - int line_height, line_start_x = 0, reached = 0; - int max_current_x = 0; - void *backup_data = NULL; -+ ptrdiff_t orig_charpos = -1; -+ enum it_method orig_method = NUM_IT_METHODS; - - for (;;) - { -+ orig_charpos = IT_CHARPOS (*it); -+ orig_method = it->method; - if (op & MOVE_TO_VPOS) - { - /* If no TO_CHARPOS and no TO_X specified, stop at the -@@ -9963,7 +9967,17 @@ move_it_to (struct it *it, ptrdiff_t to_ - } - } - else -- it->continuation_lines_width += it->current_x; -+ { -+ /* Make sure we do advance, otherwise we might infloop. -+ This could happen when the first display element is -+ wider than the window, or if we have a wrap-prefix -+ that doesn't leave enough space after it to display -+ even a single character. */ -+ if (IT_CHARPOS (*it) == orig_charpos -+ && it->method == orig_method) -+ set_iterator_to_next (it, false); -+ it->continuation_lines_width += it->current_x; -+ } - break; - - default: diff --git a/emacs-24.1-ps-mule.patch b/emacs-24.1-ps-mule.patch index 5b22495..ba64355 100644 --- a/emacs-24.1-ps-mule.patch +++ b/emacs-24.1-ps-mule.patch @@ -16,7 +16,7 @@ --- lisp/textmodes/ispell.el +++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000 -@@ -1544,10 +1544,18 @@ Protects against bogus binding of `enabl +@@ -1502,10 +1502,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))))) diff --git a/emacs-24.3-iconic.patch b/emacs-24.3-iconic.patch index 8326c95..2303fb7 100644 --- a/emacs-24.3-iconic.patch +++ b/emacs-24.3-iconic.patch @@ -4,7 +4,7 @@ --- lisp/startup.el +++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000 -@@ -2455,6 +2455,9 @@ nil default-directory" name) +@@ -2470,6 +2470,9 @@ nil default-directory" name) ((equal argi "-no-splash") (setq inhibit-startup-screen t)) diff --git a/emacs-24.4-flyspell.patch b/emacs-24.4-flyspell.patch index 5cfcdf0..ea98fcb 100644 --- a/emacs-24.4-flyspell.patch +++ b/emacs-24.4-flyspell.patch @@ -3,10 +3,10 @@ 1 file changed, 8 insertions(+), 3 deletions(-) --- lisp/textmodes/flyspell.el -+++ lisp/textmodes/flyspell.el 2016-09-19 09:22:48.535025631 +0000 -@@ -319,6 +319,12 @@ If this variable is nil, all regions are - :type 'key-sequence - :group 'flyspell) ++++ lisp/textmodes/flyspell.el 2021-10-08 09:31:55.632323098 +0000 +@@ -289,6 +289,12 @@ If this variable is nil, all regions are + "The key binding for flyspell auto correction." + :type 'key-sequence) +(defvar flyspell-signature-separator + (if (boundp 'message-signature-separator) @@ -17,7 +17,7 @@ ;;*---------------------------------------------------------------------*/ ;;* Mode specific options */ ;;* ------------------------------------------------------------- */ -@@ -344,7 +350,6 @@ property of the major mode name.") +@@ -313,7 +319,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 -@@ -356,11 +361,11 @@ property of the major mode name.") +@@ -325,11 +330,11 @@ property of the major mode name.") nil t) (point))) (signature-begin diff --git a/emacs-24.4-nonvoid.patch b/emacs-24.4-nonvoid.patch index ae61aed..c0364f6 100644 --- a/emacs-24.4-nonvoid.patch +++ b/emacs-24.4-nonvoid.patch @@ -4,7 +4,7 @@ --- src/xmenu.c +++ src/xmenu.c 2016-09-19 09:01:56.930605125 +0000 -@@ -1979,8 +1979,8 @@ Lisp_Object +@@ -2003,8 +2003,8 @@ Lisp_Object xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) { Lisp_Object title; diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index 076fd2d..5dc62a6 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -5,7 +5,7 @@ --- lisp/ldefs-boot.el +++ lisp/ldefs-boot.el 2018-05-29 12:23:32.824206557 +0000 -@@ -25982,9 +25982,9 @@ With prefix argument ARG, restart the Pr +@@ -26758,9 +26758,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 diff --git a/emacs-24.4-xim.patch b/emacs-24.4-xim.patch deleted file mode 100644 index 7c00fc7..0000000 --- a/emacs-24.4-xim.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - src/xfns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- src/xfns.c -+++ src/xfns.c 2016-09-19 09:10:35.504833294 +0000 -@@ -2332,8 +2332,8 @@ static XIMStyle best_xim_style (XIMStyle - - static const XIMStyle supported_xim_styles[] = - { -- XIMPreeditPosition | XIMStatusArea, - XIMPreeditPosition | XIMStatusNothing, -+ XIMPreeditPosition | XIMStatusArea, - XIMPreeditPosition | XIMStatusNone, - XIMPreeditNothing | XIMStatusArea, - XIMPreeditNothing | XIMStatusNothing, diff --git a/emacs-25.2-ImageMagick7.patch b/emacs-25.2-ImageMagick7.patch index cfd58ab..a50ab25 100644 --- a/emacs-25.2-ImageMagick7.patch +++ b/emacs-25.2-ImageMagick7.patch @@ -7,7 +7,7 @@ Index: emacs-25.2/configure.ac --- emacs-27.1/configure.ac +++ emacs-27.1/configure.ac 2020-08-11 09:59:04.349950601 +0000 -@@ -2617,7 +2617,7 @@ if test "${HAVE_X11}" = "yes" || test "$ +@@ -2605,7 +2605,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. @@ -18,7 +18,7 @@ Index: emacs-25.2/configure.ac if test $HAVE_IMAGEMAGICK = yes; then --- emacs-27.1/src/image.c +++ emacs-27.1/src/image.c 2020-08-11 09:49:35.500181432 +0000 -@@ -8784,7 +8784,11 @@ imagemagick_compute_animated_image (Magi +@@ -9005,7 +9005,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; -@@ -8849,7 +8853,11 @@ imagemagick_compute_animated_image (Magi +@@ -9070,7 +9074,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); -@@ -8894,7 +8902,11 @@ imagemagick_load_image (struct frame *f, +@@ -9115,7 +9123,11 @@ imagemagick_load_image (struct frame *f, MagickWand *image_wand; PixelIterator *iterator; PixelWand **pixels, *bg_wand = NULL; diff --git a/emacs-27.1-Xauthority4server.patch b/emacs-27.1-Xauthority4server.patch index a97697e..c9b924d 100644 --- a/emacs-27.1-Xauthority4server.patch +++ b/emacs-27.1-Xauthority4server.patch @@ -10,18 +10,18 @@ even if the Xauthority file is not the default expected by XCloseDisplay() 2 files changed, 39 insertions(+), 2 deletions(-) --- etc/emacs.service -+++ etc/emacs.service 2021-03-08 13:24:42.504543632 +0000 ++++ etc/emacs.service 2021-10-08 09:41:15.350644801 +0000 @@ -8,6 +8,7 @@ Documentation=info:emacs man:emacs(1) ht [Service] Type=notify +Environment=XAUTHORITY=%t/emacs/xauth ExecStart=emacs --fg-daemon - ExecStop=emacsclient --eval "(kill-emacs)" - # The location of the SSH auth socket varies by distribution, and some + + # Emacs will exit with status 15 after having received SIGTERM, which --- lisp/server.el -+++ lisp/server.el 2021-03-08 13:12:50.619365207 +0000 -@@ -281,6 +281,11 @@ the \"-f\" switch otherwise." ++++ lisp/server.el 2021-10-08 09:40:13.683712534 +0000 +@@ -286,6 +286,11 @@ If nil, no instructions are displayed." "The directory in which to place the server socket. If local sockets are not supported, this is nil.") @@ -33,7 +33,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (defun server-clients-with (property value) "Return a list of clients with PROPERTY set to VALUE." (let (result) -@@ -630,7 +635,8 @@ the `server-process' variable." +@@ -642,7 +647,8 @@ the `server-process' variable." (t (yes-or-no-p "The current server still has clients; delete them? ")))) (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) @@ -43,7 +43,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (when server-process ;; kill it dead! (ignore-errors (delete-process server-process))) -@@ -704,6 +710,14 @@ server or call `\\[server-force-delete]' +@@ -726,6 +732,14 @@ server or call `\\[server-force-delete]' :plist '(:authenticated t))))) (unless server-process (error "Could not start server process")) (process-put server-process :server-file server-file) @@ -58,7 +58,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (when server-use-tcp (let ((auth-key (server-get-auth-key))) (process-put server-process :auth-key auth-key) -@@ -832,7 +846,7 @@ This handles splitting the command if it +@@ -854,7 +868,7 @@ This handles splitting the command if it (let ((frame (server-with-environment (process-get proc 'env) @@ -67,7 +67,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() ;; For tgetent(3); list according to ncurses(3). "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" -@@ -1088,6 +1102,8 @@ The following commands are accepted by t +@@ -1122,6 +1136,8 @@ The following commands are accepted by t nowait ; t if emacsclient does not want to wait for us. frame ; Frame opened for the client (if any). display ; Open frame on this display. @@ -76,7 +76,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() parent-id ; Window ID for XEmbed dontkill ; t if client should not be killed. commands -@@ -1228,6 +1244,16 @@ The following commands are accepted by t +@@ -1262,6 +1278,16 @@ The following commands are accepted by t ;; -env NAME=VALUE: An environment variable. ("-env" (let ((var (pop args-left))) @@ -93,7 +93,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() ;; XXX Variables should be encoded as in getenv/setenv. (process-put proc 'env (cons var (process-get proc 'env))))) -@@ -1243,6 +1269,16 @@ The following commands are accepted by t +@@ -1277,6 +1303,16 @@ The following commands are accepted by t ;; Unknown command. (arg (error "Unknown command: %s" arg)))) diff --git a/emacs-27.1-pdftex.patch b/emacs-27.1-pdftex.patch index 7b75d81..0c1a98c 100644 --- a/emacs-27.1-pdftex.patch +++ b/emacs-27.1-pdftex.patch @@ -58,7 +58,7 @@ +% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2021 Free Software Foundation, Inc. + % Copyright (C) 2000--2022 Free Software Foundation, Inc. --- etc/refcards/pl-refcard.tex +++ etc/refcards/pl-refcard.tex 2021-03-25 15:08:53.917386707 +0000 @@ -1,4 +1,4 @@ @@ -66,7 +66,7 @@ +% % Reference Card for GNU Emacs - % Copyright (C) 1999, 2001--2021 Free Software Foundation, Inc. + % Copyright (C) 1999, 2001--2022 Free Software Foundation, Inc. --- etc/refcards/ru-refcard.tex +++ etc/refcards/ru-refcard.tex 2021-03-25 15:07:14.519265674 +0000 @@ -25,6 +25,7 @@ @@ -108,4 +108,4 @@ +% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2021 Free Software Foundation, Inc. + % Copyright (C) 2000--2022 Free Software Foundation, Inc. diff --git a/emacs-27.2-COLORTERM-24bit.patch b/emacs-27.2-COLORTERM-24bit.patch deleted file mode 100644 index 35c3325..0000000 --- a/emacs-27.2-COLORTERM-24bit.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi -index f5f01848f77f..8f7ed715b523 100644 ---- a/doc/misc/efaq.texi -+++ b/doc/misc/efaq.texi -@@ -1595,6 +1595,10 @@ xterm-direct2 xterm with direct-color indexing (old) - xterm-direct xterm with direct-color indexing - @end example - -+If Terminfo database is not available, but 24-bit direct color mode is -+supported, it can still be enabled by defining the environment -+variable @env{COLORTERM} to @samp{truecolor}. -+ - Terminals with @samp{RGB} capability treat pixels #000001 - #000007 as - indexed colors to maintain backward compatibility with applications - that are unaware of direct color mode. Therefore the seven darkest -diff --git a/src/term.c b/src/term.c -index 94bf013f4a07..5cbb092ad177 100644 ---- a/src/term.c -+++ b/src/term.c -@@ -4168,6 +4168,15 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\ - could return 32767. */ - tty->TN_max_colors = 16777216; - } -+ /* Fall back to xterm+direct (semicolon version) if requested -+ by the COLORTERM environment variable. */ -+ else if ((bg = getenv("COLORTERM")) != NULL -+ && strcasecmp(bg, "truecolor") == 0) -+ { -+ tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TN_max_colors = 16777216; -+ } - } - #endif - diff --git a/emacs-27.2.tar.xz b/emacs-27.2.tar.xz deleted file mode 100644 index d9e7b90..0000000 --- a/emacs-27.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9 -size 44624480 diff --git a/emacs-27.2.tar.xz.sig b/emacs-27.2.tar.xz.sig deleted file mode 100644 index fefce58..0000000 --- a/emacs-27.2.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJgXHmkAAoJEJHBJi8B6405d2EIAIPafSj+sV3Hemu9CSPL+F38 -KutOo7nUF1AO0tgdijPGZ4BTBsWnsum0dLQ/JLtor7/NQuqrZTMJQbrorLluwCR7 -p1aVtwQ+enWn3G0Aq/4uWo0xaMCvJlEPOQuYE8Dtt12PFZzmfAE1r4KZa4cL073h -suugT/tz7awq7QS6GbjI88mkJXVMuEwVYPPS2tzBUTkA2152dikFSyqBhUnIo3Ni -eDN6NvSYBpL1I9HgNYuiBJp9xv8CzGtwm/7Nidntzl9SPVQlZkZIHNj8tRbE67Ge -R0EXBgnDsSKlRUM51R7PejnSG6134VcLCaItMF6dIiVBu6BwQXw1t+zdqnzG6v8= -=L6J6 ------END PGP SIGNATURE----- diff --git a/emacs-27.1.dif b/emacs-28.1.dif similarity index 94% rename from emacs-27.1.dif rename to emacs-28.1.dif index d3fe861..265efa3 100644 --- a/emacs-27.1.dif +++ b/emacs-28.1.dif @@ -21,7 +21,7 @@ --- Makefile.in +++ Makefile.in 2020-08-11 10:21:15.194072175 +0000 -@@ -493,11 +493,11 @@ install-arch-dep: src install-arch-indep +@@ -519,11 +519,11 @@ install-arch-dep: src install-arch-indep umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" $(MAKE) -C lib-src install ifeq (${ns_self_contained},no) @@ -35,7 +35,7 @@ ifndef NO_BIN_LINK rm -f "$(DESTDIR)${bindir}/$(EMACS)" cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)" -@@ -690,6 +690,7 @@ install-man: +@@ -712,6 +712,7 @@ install-man: umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}" thisdir=`/bin/pwd`; \ cd ${mansrcdir}; \ @@ -43,7 +43,7 @@ for page in *.1; do \ test "$$page" = ChangeLog.1 && continue; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ -@@ -788,7 +789,7 @@ uninstall: uninstall-$(NTDIR) uninstall- +@@ -843,7 +844,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) @@ -52,24 +52,24 @@ (if cd "$(DESTDIR)${icondir}"; then \ rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \ "hicolor/scalable/apps/${EMACS_NAME}.svg" \ ---- configure -+++ 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 -- LD_SWITCH_X_SITE=-L`$as_echo "$x_libraries" | sed -e 's/:/ -L/g'` -- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,` -- $as_echo "$x_libraries" | sed -e 's/:/ -Wl,-rpath,/g' -- ` -+ LD_SWITCH_X_SITE="-L ${x_libraries%%:*}" -+ LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}" - fi - x_default_search_path="" - x_search_path=${x_libraries} +|--- configure +|+++ 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 +|- LD_SWITCH_X_SITE=-L`$as_echo "$x_libraries" | sed -e 's/:/ -L/g'` +|- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,` +|- $as_echo "$x_libraries" | sed -e 's/:/ -Wl,-rpath,/g' +|- ` +|+ LD_SWITCH_X_SITE="-L ${x_libraries%%:*}" +|+ LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}" +| fi +| x_default_search_path="" +| x_search_path=${x_libraries} --- configure.ac +++ configure.ac 2020-08-11 10:17:21.102266456 +0000 -@@ -1881,10 +1881,8 @@ fi +@@ -1832,10 +1832,8 @@ fi LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then @@ -111,8 +111,8 @@ format understood by .BR vi ( 1 )\c \&. Both forms of the program understand -@@ -55,7 +55,7 @@ Ruby, PHP, PostScript, Python, Prolog, S - most assembler\-like syntaxes. +@@ -55,7 +55,7 @@ Perl, Ruby, Rust, PHP, PostScript, Pytho + assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for -\fBctags\fP) in the current working directory. @@ -138,7 +138,7 @@ .TP .B \-\-declarations In C and derived languages, create tags for function declarations, -@@ -174,7 +174,7 @@ the previous ones. The regexps are of o +@@ -181,7 +181,7 @@ the previous ones. The regexps are of o where \fItagregexp\fP is used to match the tag. It should not match useless characters. If the match is such that more characters than needed are unavoidably matched by \fItagregexp\fP, it may be useful to @@ -147,7 +147,7 @@ ignores regexps without a \fInameregexp\fP. The syntax of regexps is the same as in emacs. The following character escape sequences are supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which -@@ -253,15 +253,15 @@ tag entries for other files in place. C +@@ -260,15 +260,15 @@ tag entries for other files in place. C by deleting the existing entries for the given files and then rewriting the new entries at the end of the tags file. It is often faster to simply rebuild the entire tag file than to use this. @@ -177,7 +177,7 @@ version=@version@ ## Used in $archlibdir. -@@ -158,7 +160,7 @@ MKDIR_P = @MKDIR_P@ +@@ -134,7 +136,7 @@ MKDIR_P = @MKDIR_P@ CLIENTW = @CLIENTW@ # Things that a user might actually run, which should be installed in bindir. @@ -186,7 +186,7 @@ ebrowse${EXEEXT} # Things that Emacs runs internally, or during the build process, -@@ -371,7 +373,7 @@ etags${EXEEXT}: ${etags_deps} +@@ -379,7 +381,7 @@ etags${EXEEXT}: ${etags_deps} ## etags.o files on top of each other. ## FIXME? ## Can't we use a wrapper that calls 'etags --ctags'? @@ -207,9 +207,9 @@ #undef _WIN32_WINNT --- lib/Makefile.in +++ 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 = +@@ -33,6 +33,8 @@ all: + + HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ +override CFLAGS := $(CFLAGS) -fPIC + @@ -218,14 +218,14 @@ $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ --- lisp/cmuscheme.el +++ lisp/cmuscheme.el 2020-08-11 10:17:21.106266385 +0000 -@@ -241,7 +241,8 @@ is run). +@@ -231,7 +231,8 @@ is run). (read-string "Run Scheme: " scheme-program-name) scheme-program-name))) (if (not (comint-check-proc "*scheme*")) - (let ((cmdlist (split-string-and-unquote cmd))) + (let ((cmdlist (split-string-and-unquote cmd)) + process-connection-type) - (set-buffer (apply 'make-comint "scheme" (car cmdlist) + (set-buffer (apply #'make-comint "scheme" (car cmdlist) (scheme-start-file (car cmdlist)) (cdr cmdlist))) (inferior-scheme-mode))) --- lisp/international/mule-cmds.el @@ -240,7 +240,7 @@ (define-key map "F" 'set-file-name-coding-system) --- lisp/net/ange-ftp.el +++ 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 +@@ -5076,7 +5076,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) @@ -249,7 +249,7 @@ ; (save-match-data ; (string-match ange-ftp-vos-host-regexp host)))) ; -@@ -5181,7 +5181,7 @@ NEWNAME should be the name to give the n +@@ -5191,7 +5191,7 @@ NEWNAME should be the name to give the n ;; Return non-nil if HOST is running VMS. (defun ange-ftp-vms-host (host) @@ -258,7 +258,7 @@ (string-match-p ange-ftp-vms-host-regexp host))) ;; Because some VMS ftp servers convert filenames to lower case -@@ -5689,7 +5689,7 @@ Other orders of $ and _ seem to all work +@@ -5699,7 +5699,7 @@ Other orders of $ and _ seem to all work ;; Return non-nil if HOST is running MTS. (defun ange-ftp-mts-host (host) @@ -267,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. -@@ -5887,7 +5887,7 @@ Other orders of $ and _ seem to all work +@@ -5897,7 +5897,7 @@ Other orders of $ and _ seem to all work ;; Return non-nil if HOST is running CMS. (defun ange-ftp-cms-host (host) @@ -326,7 +326,7 @@ +;;; site-load.el ends here --- lisp/speedbar.el +++ lisp/speedbar.el 2020-08-11 10:17:21.106266385 +0000 -@@ -767,6 +767,7 @@ If you want to change this while speedba +@@ -732,6 +732,7 @@ If you want to change this while speedba ;; Navigation. (define-key map "n" 'speedbar-next) @@ -336,24 +336,30 @@ (define-key map "\M-p" 'speedbar-restricted-prev) --- lisp/textmodes/ispell.el +++ 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. +@@ -191,13 +191,15 @@ Must be greater than 1." + :type 'integer) + (defcustom ispell-program-name - (or (executable-find "aspell") - (executable-find "ispell") - (executable-find "hunspell") +- ;; Enchant is commonly installed as `enchant-2', so use this +- ;; name and avoid old versions of `enchant'. +- (executable-find "enchant-2") - "ispell") + (if (functionp 'append-ispell-dict-alist) + "ispell" + (or (executable-find "aspell") + (executable-find "ispell") + (executable-find "hunspell") ++ ;; Enchant is commonly installed as `enchant-2', so use this ++ ;; name and avoid old versions of `enchant'. ++ (executable-find "enchant-2") + "ispell")) "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string :set (lambda (symbol value) -@@ -1438,6 +1440,78 @@ The variable `ispell-library-directory' +@@ -1396,6 +1398,78 @@ The variable `ispell-library-directory' ;; Define commands in menu in opposite order you want them to appear. (let ((map (make-sparse-keymap "Spell"))) diff --git a/emacs-28.1.tar.xz b/emacs-28.1.tar.xz new file mode 100644 index 0000000..af68f72 --- /dev/null +++ b/emacs-28.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1 +size 47699512 diff --git a/emacs-28.1.tar.xz.sig b/emacs-28.1.tar.xz.sig new file mode 100644 index 0000000..a9cc194 --- /dev/null +++ b/emacs-28.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmJK2PAACgkQ542uDzEV +4GuLAxAAuUO0wrWOs8bIyoFDspz0oBgJsZD6gScqRf9jVpITqegYQA6UYhPtBg24 +CZGvJYX3TUpw6B+9dzOaRcFghzmgJTOvQemo8WK7o4aumUtp4BUjl1vLsAMgsA7e +age+IY9z6Uo7GsUttpDvdZJYh+YV+p/GPu0Po441ztPAyxWzrSyRVqXXZXb0/tg6 +98MyzcffZbYr/D4Aox/V0Y2PXbO+0S097jFLtKRX/UioEHeGLKdeVbVa7eB5kfJu +IUS7Kg015loBY8UxObnMAU0WGUaPbPk/+Zk4QqRnAf08F8F+ajZxv6nRyPIzv82T +ULgmSdn0SXh870+Q7RWo8Wq+s+9CdYCUVT5DKV9G3aoBGqZnUNe9Wv295GKbZYqE +9TRTFr6000FNIMocc22rVmRVq2cxUUe9uNyZM7jw4Juhczw0/vGA0nSWfqlPSTsH +88AJCyjzL/HqrU9zqS5wwx+DIkVlUW+94/0jo0AUls/2z1oFfrxsv0GEXhtQWR6N +iMdfdY1tLwoS3xx3r9+mEDivn7EW9ySJO41rQ79FTiq5UgZzw+Y+szT7CWpiK/99 +DRPS4yTZsVXfAlLcjSsL+KimBhdWrgrwDIViW1WkJMngwjhRjcRuFpDjZbUYhYaH +a55ePutqf/+R5a0mlgCV3RPmqf+lGp30JohtWL5VZsK90jtdATQ= +=maOw +-----END PGP SIGNATURE----- diff --git a/emacs-rpmlintrc b/emacs-rpmlintrc index a3da5cb..dfb562e 100644 --- a/emacs-rpmlintrc +++ b/emacs-rpmlintrc @@ -1,11 +1,12 @@ -addFilter(".*no-documentation.*") addFilter(".*zero-length.*/var/games/emacs/.*-scores.*") -addFilter(".*hidden-file-or-dir.*/etc/skel/.gnu-emacs.*") -addFilter(".*file-in-usr-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*") addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*") -addFilter(".*no-manual-page-for-binary.*emacs-*") addFilter(".*name-repeated-in-summar.*") -addFilter(".*idden-file-or-dir.*\.dir-locals.el.*") addFilter(".*position-independent-executable-suggested.*/usr/bin/emacs-.*") addFilter(".*files-duplicate.*/usr/share/emacs.*") addFilter(".*desktopfile-without-binary.*/usr/share/applications/emacs.desktop.*emacs.*") +addFilter(".*emacs-info.noarch:.*W:.*package-with-huge-docs:.*100%.*") +addFilter(".*emacs-eln.*:.*W:.*unstripped-binary-or-object.*") +addFilter(".*emacs-eln.*:.*E:.*shared-library-without-dependency-information.*") +addFilter(".*position-independent-executable-suggested.*") +addFilter(".*desktopfile-without-binary.*") +addFilter(".*E:.*invalid-desktopfile.*/usr/share/applications/emacsclient.*\.desktop.*") diff --git a/emacs.changes b/emacs.changes index 97f89c9..52abd1e 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 4 12:45:06 UTC 2022 - Dr. Werner Fink + +- Update to GNU Emacs version 28.1 + * Emacs now optionally supports native compilation of Lisp files. + * The Cairo graphics library is now used by default if present. + * 'configure' now warns about building with libXft support. + * 'configure' now warns about not using HarfBuzz if using Cairo. + * Building without double buffering support. + ------------------------------------------------------------------- Wed Feb 9 23:28:45 UTC 2022 - Bjørn Lie @@ -9,6 +19,15 @@ Thu Jan 27 12:59:04 UTC 2022 - Andreas Schwab - Remove unneeded pure size adjustments +------------------------------------------------------------------- +Wed Jan 19 14:56:14 UTC 2022 - Dr. Werner Fink + +- Remove patches now upstream and in 28.1 + * boo1178942-bedb3cb6.patch + * emacs-27.2-COLORTERM-24bit.patch + * sigsegv-stack.patch +- Remove patch emacs-24.4-xim.patch as not needed anymore + ------------------------------------------------------------------- Thu Jan 13 07:25:28 UTC 2022 - Dr. Werner Fink diff --git a/emacs.keyring b/emacs.keyring index 72d2b0d..ea36242 100644 Binary files a/emacs.keyring and b/emacs.keyring differ diff --git a/emacs.spec b/emacs.spec index 449fefb..2aa92d5 100644 --- a/emacs.spec +++ b/emacs.spec @@ -16,6 +16,7 @@ # +%bcond_without nativecomp %bcond_without autoconf %if 0%{?suse_version} >= 1550 %bcond_without mailutils @@ -24,6 +25,7 @@ %endif %bcond_without cairo %bcond_with tex4pdf +%bcond_with memmmap Name: emacs %if %{with autoconf} @@ -38,8 +40,10 @@ BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: fonts-config BuildRequires: freetype2-devel +BuildRequires: gettext-devel BuildRequires: giflib-devel BuildRequires: git +BuildRequires: glibc-locale BuildRequires: gpm-devel BuildRequires: gtk3-devel # Used for installtion of info pages as well as to @@ -74,6 +78,7 @@ BuildRequires: texlive-collection-langczechslovak BuildRequires: texlive-collection-langpolish BuildRequires: texlive-lh %endif +BuildRequires: procps BuildRequires: update-alternatives BuildRequires: update-desktop-files BuildRequires: xz @@ -86,6 +91,8 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(valgrind) %if %{with tex4pdf} BuildRequires: tex(babel.sty) BuildRequires: tex(fontenc.sty) @@ -105,6 +112,9 @@ BuildRequires: pkgconfig(libacl) %else BuildRequires: libacl-devel %endif +%if %{with nativecomp} +BuildRequires: libgccjit0-devel +%endif BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(lcms2) @@ -127,7 +137,7 @@ BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xxf86vm) URL: http://www.gnu.org/software/emacs/ -Version: 27.2 +Version: 28.1 Release: 0 Summary: GNU Emacs Base Package License: GPL-3.0-or-later @@ -153,18 +163,18 @@ Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs Source4: emacs-rpmlintrc Source5: emacs.sh -Source6: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig +# 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 +#Source8: emacs-%{version}-pdf.tar.xz +Source8: emacs-27.2-pdf.tar.xz +Patch: emacs-28.1.dif # Currently disabled Patch2: emacs-24.4-glibc.patch Patch4: emacs-24.3-asian-print.patch Patch5: emacs-24.4-ps-bdf.patch Patch7: emacs-24.1-ps-mule.patch Patch8: emacs-24.4-nonvoid.patch -Patch11: emacs-24.4-xim.patch Patch12: emacs-24.3-x11r7.patch Patch15: emacs-24.3-iconic.patch Patch16: emacs-24.4-flyspell.patch @@ -177,12 +187,6 @@ Patch24: emacs-25.2-ImageMagick7.patch Patch25: emacs-26.1-xft4x11.patch Patch26: emacs-27.1-pdftex.patch Patch29: emacs-27.1-Xauthority4server.patch -# This patch allows vte based terminals like gnome-terminal to get 24bit colors -# without setting a custom terminfo, honouring COLORTERM=truecolor -Patch30: emacs-27.2-COLORTERM-24bit.patch -# PATCH-FIX-UPSTREAM boo#1178942 -- emacs hang in isearch -Patch31: boo1178942-bedb3cb6.patch -Patch39: sigsegv-stack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)} @@ -205,15 +209,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{undefined ext_el} %define ext_el .gz %endif -%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 +%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 modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode transient tramp url vhdl-mode vip viper widget wisent woman %description -Basic package for the GNU Emacs editor. Requires emacs-x11 or -emacs-nox. +Basic package for the GNU Emacs editor. For a documentation see https://www.emacsdocs.org/. +This package requires emacs-x11 and/or emacs-nox to have the GNU Emacs editor its self. %package -n emacs-nox Requires(post): fileutils Requires: emacs = %{version}-%{release} +%if %{with nativecomp} +Requires: emacs-eln = %{version} +%endif Provides: emacs_program = %{version}-%{release} Summary: GNU Emacs-nox: An Emacs Binary without X Window System Support Group: Productivity/Text/Editors @@ -228,6 +235,9 @@ Love it or leave it. %package -n emacs-x11 Requires(post): fileutils Requires: emacs = %{version}-%{release} +%if %{with nativecomp} +Requires: emacs-eln = %{version} +%endif Provides: emacs_program = %{version}-%{release} Requires: efont-unicode Requires: ifnteuro @@ -245,6 +255,29 @@ Emacs Love it or leave it. This is the Emacs binary with X Window System Support. +%if %{with nativecomp} +%package -n emacs-eln +# Without the el.gz files a starting emacs with support of native compiled +# lisp code will show an error +# >> Symbol's value as variable is void: auto-save-list-file-prefix << +# and exceeds the limit for open files as it opens warnings.elc several +# times up to the set open file limit +Requires: emacs-el = %{version} +Summary: GNU Emacs-nox: Emacs Lisp native compiled binary files +Group: Productivity/Text/Editors + +%define _libeln %{_prefix}/lib + +%description -n emacs-eln +Emacs Lisp (Elisp) is the Lisp dialect used by the Emacs text editor +family. GNU Emacs can currently execute Elisp code either interpreted +or byte-interpreted after it has been compiled to byte-code. +The native compiler employs the byte-compiler's internal representation +as input and exploits libgccjit to achieve code generation using the GNU +Compiler Collection (GCC) infrastructure. Generated executables are stored +as binary files and can be loaded and unloaded dynamically. +%endif + %package -n emacs-el Requires: emacs = %{version}-%{release} Provides: emacs-devel = %{version}-%{release} @@ -284,12 +317,13 @@ and most assembler-like syntaxes. %prep %setup -q -b 2 -#%patch2 -p0 -b .glibc +%if %{with memmmap} +%patch2 -p0 -b .glibc +%endif %patch4 -p0 -b .print %patch5 -p0 -b .psbdf %patch7 -p0 -b .psmu %patch8 -p0 -b .nvoid -%patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell @@ -299,9 +333,6 @@ and most assembler-like syntaxes. %patch25 -p0 -b .xft %patch26 -p0 -b .fmt %patch29 -p0 -b .xauth -%patch30 -p1 -b .colorterm -%patch31 -p0 -b .isearch -%patch39 -p1 %patch -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ @@ -400,7 +431,11 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS --datadir=%{_datadir} \ --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_localstatedir}/lib \ - --libexecdir=%{_prefix}/lib \ + --libexecdir=%{_libexecdir} \ + --with-file-notification=yes \ +%if %{with nativecomp} + --with-native-compilation \ +%endif --enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp " DESKTOP="--with-x \ @@ -482,25 +517,28 @@ ac_cv_lib_gif_EGifPutExtensionLast=yes export ac_cv_lib_gif_EGifPutExtensionLast CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-nox\"'" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} --with-dumping=pdumper -%make_build bootstrap +%make_build V=1 make -C lisp/ updates compile V=1 for i in $(find site-lisp/ -name '*.el'); do EMACSLOADPATH='' src/emacs -batch -q --no-site -f batch-byte-compile $i done cp src/emacs emacs-nox cp src/emacs.pdmp emacs-nox.pdmp +find -name '*.eln' make distclean # CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-gtk\"'" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS} --with-dumping=pdumper %make_build cp src/emacs emacs-gtk cp src/emacs.pdmp emacs-gtk.pdmp +find -name '*.eln' make distclean # CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-x11\"'" ./configure ${COMP} ${PREFIX} ${X11} ${SYS} --with-dumping=pdumper %make_build cp src/emacs emacs-x11 cp src/emacs.pdmp emacs-x11.pdmp +find -name '*.eln' %if %{with tex4pdf} # @@ -522,16 +560,16 @@ VERSION=%{version} eval $(sed -rn "/^configuration=/p" config.log) sed -ri 's@/usr/lib/X11/fonts@/usr/share/fonts@g;s@(/usr/)local/(info|share|lib)@\1\2@;s@\$VERSION@%{version}@g;s@\$ARCH@'${configuration}'@g' doc/man/emacs.1 mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration} +mkdir -p %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration} install -m 0755 emacs-nox %{buildroot}%{_bindir} install -m 0755 emacs-gtk %{buildroot}%{_bindir} install -m 0755 emacs-x11 %{buildroot}%{_bindir} -install -m 0644 emacs-nox.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/ -install -m 0644 emacs-gtk.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/ -install -m 0644 emacs-x11.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/ +install -m 0644 emacs-nox.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ +install -m 0644 emacs-gtk.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ +install -m 0644 emacs-x11.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ make install DESTDIR=%{buildroot} systemdunitdir=%{_userunitdir} rm -vf %{buildroot}/usr/bin/emacs -rm -vf %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/emacs.pdmp +rm -vf %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/emacs.pdmp install -p %{S:5} %{buildroot}/usr/bin/emacs chmod 0755 %{buildroot}/usr/bin/emacs tar cf - `find site-lisp/ -name '*.el' -o -name '*.elc'` | \ @@ -644,7 +682,7 @@ done # install desktop file test -e etc/emacs.desktop || exit 1 echo 'X-KDE-StartupNotify=false' >> etc/emacs.desktop -rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs.desktop +rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs*.desktop cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png %suse_update_desktop_file -r -i emacs TextEditor Utility mkdir -p %{buildroot}%{_sysconfdir}/alternatives @@ -653,6 +691,26 @@ ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man} %{buildroot}%{_mandir}/man1 ln -sf %{_bindir}/gnuctags %{buildroot}%{_sysconfdir}/alternatives/ctags ln -sf %{_mandir}/man1/gnuctags.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/ctags.1%{ext_man} +%if %{with nativecomp} +touch eln.list +for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/*.eln +do + if test -e $eln + then + echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/*.eln' >> eln.list + fi + break +done +for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/*.eln +do + if test -e $eln + then + echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/preloaded/*.eln' >> eln.list + fi + break +done +%endif + %pre test -L usr/bin/emacs && rm -f usr/bin/emacs || true @@ -701,8 +759,8 @@ test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags --slave %{_mandir}/man1/ctags.1%{ext_man} ctags.1 %{_mandir}/man1/gnuctags.1%{ext_man} %{_sbindir}/update-alternatives --auto ctags -%preun -n etags -if test $1 -eq 0 ; then +%postun -n etags +if test ! -f %{_bindir}/gnuctags ; then %{_sbindir}/update-alternatives --quiet --remove ctags %{_bindir}/gnuctags fi @@ -712,18 +770,18 @@ fi %{_bindir}/ebrowse %{_bindir}/emacs %{_bindir}/emacsclient -%dir %{_prefix}/lib/emacs/ -%dir %{_prefix}/lib/emacs/%{version}/ -%dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/ -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl +%dir %{_libexecdir}/emacs/ +%dir %{_libexecdir}/emacs/%{version}/ +%dir %{_libexecdir}/emacs/%{version}/*-suse-linux*/ +%{_libexecdir}/emacs/%{version}/*-suse-linux*/hexl %if %{without mailutils} -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail +%{_libexecdir}/emacs/%{version}/*-suse-linux*/movemail %endif -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log +%{_libexecdir}/emacs/%{version}/*-suse-linux*/rcs2log %if 0 -%attr(04755,games,games) %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score +%attr(04755,games,games) %{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score %else -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score +%{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score %endif %{_userunitdir}/emacs.service %dir %{_datadir}/doc/packages/emacs/ @@ -745,16 +803,7 @@ fi %doc %{_datadir}/emacs/%{version}/etc/MACHINES %doc %{_datadir}/emacs/%{version}/etc/MH-E-NEWS %{_datadir}/emacs/%{version}/etc/NEWS -%doc %{_datadir}/emacs/%{version}/etc/NEWS.1-17 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.18 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.19 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.20 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.21 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.22 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.23 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.24 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.25 -%doc %{_datadir}/emacs/%{version}/etc/NEWS.26 +%doc %{_datadir}/emacs/%{version}/etc/NEWS.* %doc %{_datadir}/emacs/%{version}/etc/NEXTSTEP %doc %{_datadir}/emacs/%{version}/etc/NXML-NEWS %doc %{_datadir}/emacs/%{version}/etc/ORG-NEWS @@ -896,14 +945,19 @@ fi %{_datadir}/emacs/%{version}/etc/charsets/stdenc.map %{_datadir}/emacs/%{version}/etc/charsets/symbol.map %{_datadir}/emacs/%{version}/etc/compilation.txt +%dir %{_datadir}/emacs/%{version}/etc/org/ +%dir %{_datadir}/emacs/%{version}/etc/org/csl/ +%{_datadir}/emacs/%{version}/etc/org/csl/README +%{_datadir}/emacs/%{version}/etc/org/csl/chicago-author-date.csl +%{_datadir}/emacs/%{version}/etc/org/csl/locales-en-US.xml %dir %{_datadir}/emacs/%{version}/etc/e/ %doc %{_datadir}/emacs/%{version}/etc/e/README %{_datadir}/emacs/%{version}/etc/e/eterm-color %{_datadir}/emacs/%{version}/etc/e/eterm-color.ti %{_datadir}/emacs/%{version}/etc/edt-user.el %{_datadir}/emacs/%{version}/etc/emacs-buffer.gdb -%{_datadir}/emacs/%{version}/etc/emacs.appdata.xml %{_datadir}/emacs/%{version}/etc/emacs.icon +%{_datadir}/emacs/%{version}/etc/emacs.metainfo.xml %{_datadir}/emacs/%{version}/etc/emacs.service %{_datadir}/emacs/%{version}/etc/enriched.txt %dir %{_datadir}/emacs/%{version}/etc/forms/ @@ -919,6 +973,16 @@ fi %{_datadir}/emacs/%{version}/etc/grep.txt %dir %{_datadir}/emacs/%{version}/etc/images/ %doc %{_datadir}/emacs/%{version}/etc/images/README +%{_datadir}/emacs/%{version}/etc/images/checkbox-mixed.svg +%{_datadir}/emacs/%{version}/etc/images/checked.svg +%{_datadir}/emacs/%{version}/etc/images/down.svg +%{_datadir}/emacs/%{version}/etc/images/left.svg +%{_datadir}/emacs/%{version}/etc/images/radio-checked.svg +%{_datadir}/emacs/%{version}/etc/images/radio-mixed.svg +%{_datadir}/emacs/%{version}/etc/images/radio.svg +%{_datadir}/emacs/%{version}/etc/images/right.svg +%{_datadir}/emacs/%{version}/etc/images/unchecked.svg +%{_datadir}/emacs/%{version}/etc/images/up.svg %{_datadir}/emacs/%{version}/etc/images/attach.pbm %{_datadir}/emacs/%{version}/etc/images/attach.xpm %{_datadir}/emacs/%{version}/etc/images/back-arrow.pbm @@ -1572,6 +1636,8 @@ fi %{_datadir}/emacs/%{version}/etc/rgb.txt %dir %{_datadir}/emacs/%{version}/etc/schema/ %doc %{_datadir}/emacs/%{version}/etc/schema/README +%{_datadir}/emacs/%{version}/etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc +%{_datadir}/emacs/%{version}/etc/schema/OpenDocument-schema-v1.3.rnc %{_datadir}/emacs/%{version}/etc/schema/calstbl.rnc %{_datadir}/emacs/%{version}/etc/schema/dbcalstbl.rnc %{_datadir}/emacs/%{version}/etc/schema/dbhier.rnc @@ -1581,7 +1647,6 @@ fi %{_datadir}/emacs/%{version}/etc/schema/docbook.rnc %{_datadir}/emacs/%{version}/etc/schema/locate.rnc %{_datadir}/emacs/%{version}/etc/schema/od-manifest-schema-v1.2-os.rnc -%{_datadir}/emacs/%{version}/etc/schema/od-schema-v1.2-os.rnc %{_datadir}/emacs/%{version}/etc/schema/rdfxml.rnc %{_datadir}/emacs/%{version}/etc/schema/relaxng.rnc %{_datadir}/emacs/%{version}/etc/schema/schemas.xml @@ -1647,6 +1712,9 @@ fi %{_datadir}/emacs/%{version}/etc/themes/light-blue-theme.el %{_datadir}/emacs/%{version}/etc/themes/manoj-dark-theme.el %{_datadir}/emacs/%{version}/etc/themes/misterioso-theme.el +%{_datadir}/emacs/%{version}/etc/themes/modus-operandi-theme.el +%{_datadir}/emacs/%{version}/etc/themes/modus-themes.el +%{_datadir}/emacs/%{version}/etc/themes/modus-vivendi-theme.el %{_datadir}/emacs/%{version}/etc/themes/tango-dark-theme.el %{_datadir}/emacs/%{version}/etc/themes/tango-theme.el %{_datadir}/emacs/%{version}/etc/themes/tsdh-dark-theme.el @@ -1829,11 +1897,10 @@ fi %{_datadir}/emacs/%{version}/lisp/cedet/ede/srecode.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/system.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/util.elc -%{_datadir}/emacs/%{version}/lisp/cedet/inversion.elc %{_datadir}/emacs/%{version}/lisp/cedet/mode-local.elc %{_datadir}/emacs/%{version}/lisp/cedet/pulse.elc -%{_datadir}/emacs/%{version}/lisp/cedet/semantic.elc %dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ +%{_datadir}/emacs/%{version}/lisp/cedet/semantic.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze.elc %dir %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/ %{_datadir}/emacs/%{version}/lisp/cedet/semantic/analyze/complete.elc @@ -1880,6 +1947,7 @@ fi %{_datadir}/emacs/%{version}/lisp/cedet/semantic/fw.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar-wy.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar.elc +%{_datadir}/emacs/%{version}/lisp/cedet/semantic/grm-wy-boot.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/html.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia-sb.elc %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.elc @@ -2015,6 +2083,13 @@ 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 +%if %{without nativecomp} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.el +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.el +%else +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.elc +%endif %{_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 @@ -2046,6 +2121,7 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gv.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/helper.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/hierarchy.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/inline.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/let-alist.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.elc @@ -2054,6 +2130,7 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/memory-report.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/nadvice.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package-x.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.elc @@ -2068,12 +2145,13 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/seq.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/shortdoc.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/shorthands.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/subr-x.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tabulated-list.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.elc -%{_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 @@ -2106,6 +2184,7 @@ fi %{_datadir}/emacs/%{version}/lisp/epa-dired.elc %{_datadir}/emacs/%{version}/lisp/epa-file.elc %{_datadir}/emacs/%{version}/lisp/epa-hook.elc +%{_datadir}/emacs/%{version}/lisp/epa-ks.elc %{_datadir}/emacs/%{version}/lisp/epa-mail.elc %{_datadir}/emacs/%{version}/lisp/epa.elc %{_datadir}/emacs/%{version}/lisp/epg-config.elc @@ -2143,6 +2222,7 @@ fi %{_datadir}/emacs/%{version}/lisp/erc/erc-speedbar.elc %{_datadir}/emacs/%{version}/lisp/erc/erc-spelling.elc %{_datadir}/emacs/%{version}/lisp/erc/erc-stamp.elc +%{_datadir}/emacs/%{version}/lisp/erc/erc-status-sidebar.elc %{_datadir}/emacs/%{version}/lisp/erc/erc-track.elc %{_datadir}/emacs/%{version}/lisp/erc/erc-truncate.elc %{_datadir}/emacs/%{version}/lisp/erc/erc-xdcc.elc @@ -2208,7 +2288,6 @@ fi %{_datadir}/emacs/%{version}/lisp/fringe.elc %{_datadir}/emacs/%{version}/lisp/generic-x.el %dir %{_datadir}/emacs/%{version}/lisp/gnus/ -%{_datadir}/emacs/%{version}/lisp/gnus/.dir-locals.el %{_datadir}/emacs/%{version}/lisp/gnus/canlock.elc %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.elc %{_datadir}/emacs/%{version}/lisp/gnus/gmm-utils.elc @@ -2221,6 +2300,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cite.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cloud.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cus.elc +%{_datadir}/emacs/%{version}/lisp/gnus/gnus-dbus.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-delay.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-demon.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-diary.elc @@ -2246,6 +2326,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/gnus-registry.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-rfc1843.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-salt.elc +%{_datadir}/emacs/%{version}/lisp/gnus/gnus-search.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.elc %{_datadir}/emacs/%{version}/lisp/gnus/gnus-spec.elc @@ -2289,7 +2370,6 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/nngateway.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnheader.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnimap.elc -%{_datadir}/emacs/%{version}/lisp/gnus/nnir.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnmail.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnmaildir.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnmairix.elc @@ -2300,6 +2380,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/nnoo.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnregistry.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnrss.elc +%{_datadir}/emacs/%{version}/lisp/gnus/nnselect.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnspool.elc %{_datadir}/emacs/%{version}/lisp/gnus/nntp.elc %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.elc @@ -2353,6 +2434,7 @@ fi %{_datadir}/emacs/%{version}/lisp/international/charprop.el %{_datadir}/emacs/%{version}/lisp/international/charscript.elc %{_datadir}/emacs/%{version}/lisp/international/cp51932.elc +%{_datadir}/emacs/%{version}/lisp/international/emoji-zwj.elc %{_datadir}/emacs/%{version}/lisp/international/eucjp-ms.elc %{_datadir}/emacs/%{version}/lisp/international/fontset.elc %{_datadir}/emacs/%{version}/lisp/international/isearch-x.elc @@ -2470,6 +2552,8 @@ fi %{_datadir}/emacs/%{version}/lisp/leim/quail/ZIRANMA.elc %{_datadir}/emacs/%{version}/lisp/leim/quail/ZOZY.elc %{_datadir}/emacs/%{version}/lisp/leim/quail/arabic.elc +%{_datadir}/emacs/%{version}/lisp/leim/quail/cham.elc +%{_datadir}/emacs/%{version}/lisp/leim/quail/compose.elc %{_datadir}/emacs/%{version}/lisp/leim/quail/croatian.elc %{_datadir}/emacs/%{version}/lisp/leim/quail/cyril-jis.elc %{_datadir}/emacs/%{version}/lisp/leim/quail/cyrillic.elc @@ -2540,14 +2624,13 @@ fi %{_datadir}/emacs/%{version}/lisp/mail/mailalias.elc %{_datadir}/emacs/%{version}/lisp/mail/mailclient.elc %{_datadir}/emacs/%{version}/lisp/mail/mailheader.elc -%{_datadir}/emacs/%{version}/lisp/mail/metamail.elc %{_datadir}/emacs/%{version}/lisp/mail/mspools.elc %{_datadir}/emacs/%{version}/lisp/mail/qp.elc %{_datadir}/emacs/%{version}/lisp/mail/reporter.elc %{_datadir}/emacs/%{version}/lisp/mail/rfc2045.elc %{_datadir}/emacs/%{version}/lisp/mail/rfc2047.elc %{_datadir}/emacs/%{version}/lisp/mail/rfc2231.elc -%{_datadir}/emacs/%{version}/lisp/mail/rfc2368.elc +%{_datadir}/emacs/%{version}/lisp/mail/rfc6068.elc %{_datadir}/emacs/%{version}/lisp/mail/rfc822.elc %{_datadir}/emacs/%{version}/lisp/mail/rmail-spam-filter.elc %{_datadir}/emacs/%{version}/lisp/mail/rmail.elc @@ -2615,6 +2698,8 @@ fi %{_datadir}/emacs/%{version}/lisp/net/ange-ftp.elc %{_datadir}/emacs/%{version}/lisp/net/browse-url.elc %{_datadir}/emacs/%{version}/lisp/net/dbus.elc +%{_datadir}/emacs/%{version}/lisp/net/dictionary-connection.elc +%{_datadir}/emacs/%{version}/lisp/net/dictionary.elc %{_datadir}/emacs/%{version}/lisp/net/dig.elc %{_datadir}/emacs/%{version}/lisp/net/dns.elc %{_datadir}/emacs/%{version}/lisp/net/eudc-bob.elc @@ -2625,6 +2710,7 @@ fi %{_datadir}/emacs/%{version}/lisp/net/eudcb-bbdb.elc %{_datadir}/emacs/%{version}/lisp/net/eudcb-ldap.elc %{_datadir}/emacs/%{version}/lisp/net/eudcb-mab.elc +%{_datadir}/emacs/%{version}/lisp/net/eudcb-macos-contacts.elc %{_datadir}/emacs/%{version}/lisp/net/eww.elc %{_datadir}/emacs/%{version}/lisp/net/gnutls.elc %{_datadir}/emacs/%{version}/lisp/net/goto-addr.elc @@ -2655,6 +2741,7 @@ fi %{_datadir}/emacs/%{version}/lisp/net/sasl-digest.elc %{_datadir}/emacs/%{version}/lisp/net/sasl-ntlm.elc %{_datadir}/emacs/%{version}/lisp/net/sasl-scram-rfc.elc +%{_datadir}/emacs/%{version}/lisp/net/sasl-scram-sha256.elc %{_datadir}/emacs/%{version}/lisp/net/sasl.elc %{_datadir}/emacs/%{version}/lisp/net/secrets.elc %{_datadir}/emacs/%{version}/lisp/net/sieve-manage.elc @@ -2672,12 +2759,15 @@ fi %{_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-crypt.elc %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.elc +%{_datadir}/emacs/%{version}/lisp/net/tramp-fuse.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-sshfs.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 @@ -2729,21 +2819,19 @@ fi %{_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/inversion.elc %{_datadir}/emacs/%{version}/lisp/obsolete/iswitchb.elc %{_datadir}/emacs/%{version}/lisp/obsolete/landmark.elc %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc -%{_datadir}/emacs/%{version}/lisp/obsolete/ledit.elc -%{_datadir}/emacs/%{version}/lisp/obsolete/levents.elc -%{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc %{_datadir}/emacs/%{version}/lisp/obsolete/longlines.elc -%{_datadir}/emacs/%{version}/lisp/obsolete/lucid.elc %{_datadir}/emacs/%{version}/lisp/obsolete/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/metamail.elc %{_datadir}/emacs/%{version}/lisp/obsolete/mouse-sel.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/nnir.elc %{_datadir}/emacs/%{version}/lisp/obsolete/old-emacs-lock.elc -%{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc %{_datadir}/emacs/%{version}/lisp/obsolete/otodo-mode.elc %{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.elc %{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.elc @@ -2755,7 +2843,9 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp5.elc %{_datadir}/emacs/%{version}/lisp/obsolete/pgg.elc %{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/rfc2368.elc %{_datadir}/emacs/%{version}/lisp/obsolete/s-region.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/sb-image.elc %{_datadir}/emacs/%{version}/lisp/obsolete/sregex.elc %{_datadir}/emacs/%{version}/lisp/obsolete/starttls.elc %{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.elc @@ -2771,35 +2861,18 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.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 -%{_datadir}/emacs/%{version}/lisp/org/ob-abc.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.elc %{_datadir}/emacs/%{version}/lisp/org/ob-awk.elc %{_datadir}/emacs/%{version}/lisp/org/ob-calc.elc %{_datadir}/emacs/%{version}/lisp/org/ob-clojure.elc %{_datadir}/emacs/%{version}/lisp/org/ob-comint.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-coq.elc %{_datadir}/emacs/%{version}/lisp/org/ob-core.elc %{_datadir}/emacs/%{version}/lisp/org/ob-css.elc %{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.elc %{_datadir}/emacs/%{version}/lisp/org/ob-dot.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-ebnf.elc %{_datadir}/emacs/%{version}/lisp/org/ob-emacs-lisp.elc +%{_datadir}/emacs/%{version}/lisp/org/ob-eshell.elc %{_datadir}/emacs/%{version}/lisp/org/ob-eval.elc %{_datadir}/emacs/%{version}/lisp/org/ob-exp.elc %{_datadir}/emacs/%{version}/lisp/org/ob-forth.elc @@ -2807,12 +2880,10 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.elc %{_datadir}/emacs/%{version}/lisp/org/ob-groovy.elc %{_datadir}/emacs/%{version}/lisp/org/ob-haskell.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-hledger.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-io.elc %{_datadir}/emacs/%{version}/lisp/org/ob-java.elc +%{_datadir}/emacs/%{version}/lisp/org/ob-julia.elc %{_datadir}/emacs/%{version}/lisp/org/ob-js.elc %{_datadir}/emacs/%{version}/lisp/org/ob-latex.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-ledger.elc %{_datadir}/emacs/%{version}/lisp/org/ob-lilypond.elc %{_datadir}/emacs/%{version}/lisp/org/ob-lisp.elc %{_datadir}/emacs/%{version}/lisp/org/ob-lob.elc @@ -2820,12 +2891,10 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-makefile.elc %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.elc %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.elc %{_datadir}/emacs/%{version}/lisp/org/ob-ocaml.elc %{_datadir}/emacs/%{version}/lisp/org/ob-octave.elc %{_datadir}/emacs/%{version}/lisp/org/ob-org.elc %{_datadir}/emacs/%{version}/lisp/org/ob-perl.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.elc %{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.elc %{_datadir}/emacs/%{version}/lisp/org/ob-processing.elc %{_datadir}/emacs/%{version}/lisp/org/ob-python.elc @@ -2835,15 +2904,31 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-scheme.elc %{_datadir}/emacs/%{version}/lisp/org/ob-screen.elc %{_datadir}/emacs/%{version}/lisp/org/ob-sed.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-shen.elc %{_datadir}/emacs/%{version}/lisp/org/ob-shell.elc %{_datadir}/emacs/%{version}/lisp/org/ob-sql.elc %{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-stan.elc %{_datadir}/emacs/%{version}/lisp/org/ob-table.elc %{_datadir}/emacs/%{version}/lisp/org/ob-tangle.elc -%{_datadir}/emacs/%{version}/lisp/org/ob-vala.elc %{_datadir}/emacs/%{version}/lisp/org/ob.elc +%{_datadir}/emacs/%{version}/lisp/org/oc-basic.elc +%{_datadir}/emacs/%{version}/lisp/org/oc-biblatex.elc +%{_datadir}/emacs/%{version}/lisp/org/oc-csl.elc +%{_datadir}/emacs/%{version}/lisp/org/oc-natbib.elc +%{_datadir}/emacs/%{version}/lisp/org/oc.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-doi.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-man.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/org-agenda.elc %{_datadir}/emacs/%{version}/lisp/org/org-archive.elc %{_datadir}/emacs/%{version}/lisp/org/org-attach.elc @@ -2890,6 +2975,7 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ox-beamer.elc %{_datadir}/emacs/%{version}/lisp/org/ox-html.elc %{_datadir}/emacs/%{version}/lisp/org/ox-icalendar.elc +%{_datadir}/emacs/%{version}/lisp/org/ox-koma-letter.elc %{_datadir}/emacs/%{version}/lisp/org/ox-latex.elc %{_datadir}/emacs/%{version}/lisp/org/ox-man.elc %{_datadir}/emacs/%{version}/lisp/org/ox-md.elc @@ -2951,6 +3037,7 @@ fi %{_datadir}/emacs/%{version}/lisp/progmodes/cc-cmds.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-defs.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-engine.elc +%{_datadir}/emacs/%{version}/lisp/progmodes/cl-font-lock.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-fonts.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-guess.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-langs.elc @@ -3044,7 +3131,6 @@ fi %{_datadir}/emacs/%{version}/lisp/ruler-mode.elc %{_datadir}/emacs/%{version}/lisp/savehist.elc %{_datadir}/emacs/%{version}/lisp/saveplace.elc -%{_datadir}/emacs/%{version}/lisp/sb-image.elc %{_datadir}/emacs/%{version}/lisp/scroll-all.elc %{_datadir}/emacs/%{version}/lisp/scroll-bar.elc %{_datadir}/emacs/%{version}/lisp/scroll-lock.elc @@ -3089,6 +3175,7 @@ fi %{_datadir}/emacs/%{version}/lisp/term/pc-win.elc %{_datadir}/emacs/%{version}/lisp/term/rxvt.elc %{_datadir}/emacs/%{version}/lisp/term/screen.elc +%{_datadir}/emacs/%{version}/lisp/term/st.elc %{_datadir}/emacs/%{version}/lisp/term/sun.elc %{_datadir}/emacs/%{version}/lisp/term/tmux.elc %{_datadir}/emacs/%{version}/lisp/term/tty-colors.elc @@ -3109,6 +3196,7 @@ fi %{_datadir}/emacs/%{version}/lisp/textmodes/css-mode.elc %{_datadir}/emacs/%{version}/lisp/textmodes/dns-mode.elc %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.elc +%{_datadir}/emacs/%{version}/lisp/textmodes/etc-authors-mode.elc %{_datadir}/emacs/%{version}/lisp/textmodes/fill.elc %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.elc %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.elc @@ -3143,6 +3231,7 @@ fi %{_datadir}/emacs/%{version}/lisp/textmodes/tex-mode.elc %{_datadir}/emacs/%{version}/lisp/textmodes/texinfmt.elc %{_datadir}/emacs/%{version}/lisp/textmodes/texinfo.elc +%{_datadir}/emacs/%{version}/lisp/textmodes/texinfo-loaddefs.el %{_datadir}/emacs/%{version}/lisp/textmodes/texnfo-upd.elc %{_datadir}/emacs/%{version}/lisp/textmodes/text-mode.elc %{_datadir}/emacs/%{version}/lisp/textmodes/tildify.elc @@ -3157,6 +3246,7 @@ fi %{_datadir}/emacs/%{version}/lisp/tmm.elc %{_datadir}/emacs/%{version}/lisp/tool-bar.elc %{_datadir}/emacs/%{version}/lisp/tooltip.elc +%{_datadir}/emacs/%{version}/lisp/transient.elc %{_datadir}/emacs/%{version}/lisp/tree-widget.elc %{_datadir}/emacs/%{version}/lisp/tutorial.elc %{_datadir}/emacs/%{version}/lisp/type-break.elc @@ -3277,17 +3367,17 @@ fi %files -n emacs-nox %defattr(-, root, root) %{_bindir}/emacs-nox -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-nox.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-nox.pdmp %files -n emacs-x11 %defattr(-, root, root) %{_bindir}/emacs-x11 %{_bindir}/emacs-gtk -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-x11.pdmp -%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-gtk.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-x11.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-gtk.pdmp %dir %{appDefaultsDir} %{appDefaultsFile} -%{_datadir}/applications/emacs.desktop +%{_datadir}/applications/emacs*.desktop %{_datadir}/icons/hicolor/128x128/apps/emacs.png %{_datadir}/icons/hicolor/16x16/apps/emacs.png %{_datadir}/icons/hicolor/24x24/apps/emacs.png @@ -3300,9 +3390,19 @@ fi %if 0%{?suse_version} <= 1315 %dir %{_datadir}/metainfo/ %endif -%{_datadir}/metainfo/emacs.appdata.xml +%{_datadir}/metainfo/emacs.metainfo.xml %{_datadir}/pixmaps/emacs.png +%if %{with nativecomp} +%files -n emacs-eln -f eln.list +%defattr(-, root, root) +%dir %{_libeln}/emacs/ +%dir %{_libeln}/emacs/%{version}/ +%dir %{_libeln}/emacs/%{version}/native-lisp/ +%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/ +%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/ +%endif + %files -n emacs-info %defattr(-, root, root) %doc %{_infodir}/*%{ext_info} @@ -3449,7 +3549,6 @@ fi %{_datadir}/emacs/%{version}/lisp/cedet/ede/srecode.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/ede/system.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/ede/util.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/cedet/inversion.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/mode-local.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/pulse.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic.el%{ext_el} @@ -3496,6 +3595,7 @@ fi %{_datadir}/emacs/%{version}/lisp/cedet/semantic/fw.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar-wy.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic/grammar.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/cedet/semantic/grm-wy-boot.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic/html.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia-sb.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/cedet/semantic/ia.el%{ext_el} @@ -3613,6 +3713,10 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/chart.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/check-declare.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.el%{ext_el} +%if %{with nativecomp} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.el%{ext_el} +%endif %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-generic.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.el%{ext_el} @@ -3651,6 +3755,7 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/generic.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/gv.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/helper.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/hierarchy.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/inline.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/let-alist.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.el%{ext_el} @@ -3659,6 +3764,7 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/memory-report.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/nadvice.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package-x.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/package.el%{ext_el} @@ -3671,6 +3777,8 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/seq.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/shortdoc.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/shorthands.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/subr-x.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.el%{ext_el} @@ -3678,7 +3786,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rmc.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tabulated-list.el%{ext_el} %{_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} @@ -3710,6 +3817,7 @@ fi %{_datadir}/emacs/%{version}/lisp/epa-dired.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/epa-file.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/epa-hook.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/epa-ks.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/epa-mail.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/epa.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/epg-config.el%{ext_el} @@ -3745,6 +3853,7 @@ fi %{_datadir}/emacs/%{version}/lisp/erc/erc-speedbar.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/erc/erc-spelling.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/erc/erc-stamp.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/erc/erc-status-sidebar.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/erc/erc-track.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/erc/erc-truncate.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/erc/erc-xdcc.el%{ext_el} @@ -3817,6 +3926,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cite.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cloud.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-cus.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/gnus/gnus-dbus.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-delay.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-demon.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-diary.el%{ext_el} @@ -3843,6 +3953,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/gnus-rfc1843.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-salt.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-score.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/gnus/gnus-search.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-sieve.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-spec.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/gnus-srvr.el%{ext_el} @@ -3885,7 +3996,6 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/nngateway.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnheader.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnimap.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/gnus/nnir.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnmail.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnmaildir.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnmairix.el%{ext_el} @@ -3896,6 +4006,7 @@ fi %{_datadir}/emacs/%{version}/lisp/gnus/nnoo.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnregistry.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnrss.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/gnus/nnselect.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnspool.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nntp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/gnus/nnvirtual.el%{ext_el} @@ -3945,6 +4056,7 @@ fi %{_datadir}/emacs/%{version}/lisp/international/characters.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/international/charscript.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/international/cp51932.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/international/emoji-zwj.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/international/eucjp-ms.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/international/fontset.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/international/isearch-x.el%{ext_el} @@ -4037,6 +4149,8 @@ fi %{_datadir}/emacs/%{version}/lisp/leim/quail/ZIRANMA.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/leim/quail/ZOZY.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/leim/quail/arabic.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/leim/quail/cham.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/leim/quail/compose.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/leim/quail/croatian.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/leim/quail/cyril-jis.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/leim/quail/cyrillic.el%{ext_el} @@ -4103,14 +4217,13 @@ fi %{_datadir}/emacs/%{version}/lisp/mail/mailalias.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/mailclient.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/mailheader.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/mail/metamail.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/mspools.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/qp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/reporter.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rfc2045.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rfc2047.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rfc2231.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/mail/rfc2368.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/mail/rfc6068.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rfc822.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rmail-spam-filter.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/mail/rmail.el%{ext_el} @@ -4173,6 +4286,8 @@ fi %{_datadir}/emacs/%{version}/lisp/net/ange-ftp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/browse-url.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/dbus.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/net/dictionary-connection.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/net/dictionary.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/dig.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/dns.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/eudc-bob.el%{ext_el} @@ -4183,6 +4298,7 @@ fi %{_datadir}/emacs/%{version}/lisp/net/eudcb-bbdb.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/eudcb-ldap.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/eudcb-mab.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/net/eudcb-macos-contacts.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/eww.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/gnutls.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/goto-addr.el%{ext_el} @@ -4213,6 +4329,7 @@ fi %{_datadir}/emacs/%{version}/lisp/net/sasl-digest.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/sasl-ntlm.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/sasl-scram-rfc.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/net/sasl-scram-sha256.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/sasl.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/secrets.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/sieve-manage.el%{ext_el} @@ -4230,12 +4347,15 @@ fi %{_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-crypt.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/net/tramp-ftp.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/net/tramp-fuse.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-sshfs.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} @@ -4285,19 +4405,17 @@ fi %{_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/inversion.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} -%{_datadir}/emacs/%{version}/lisp/obsolete/levents.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.el%{ext_el} %{_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/metamail.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/nnir.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/otodo-mode.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/patcomp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/pc-mode.el%{ext_el} @@ -4309,7 +4427,9 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/pgg-pgp5.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/pgg.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/rcompile.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/obsolete/rfc2368.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/s-region.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/obsolete/sb-image.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} @@ -4324,33 +4444,16 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/vip.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.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} -%{_datadir}/emacs/%{version}/lisp/org/ob-abc.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-asymptote.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-awk.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-calc.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-clojure.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-comint.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-coq.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-core.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-css.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-ditaa.el%{ext_el} %{_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} @@ -4360,12 +4463,10 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-gnuplot.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-groovy.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-haskell.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-hledger.el%{ext_el} -%{_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-julia.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-js.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} %{_datadir}/emacs/%{version}/lisp/org/ob-lisp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-lob.el%{ext_el} @@ -4373,12 +4474,10 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-makefile.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-matlab.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-maxima.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-mscgen.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-ocaml.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-octave.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-org.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-perl.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-picolisp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-plantuml.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-processing.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-python.el%{ext_el} @@ -4389,14 +4488,30 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ob-screen.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-sed.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-shell.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-shen.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-sql.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-sqlite.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-stan.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-table.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob-tangle.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/org/ob-vala.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ob.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/oc-basic.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/oc-biblatex.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/oc-csl.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/oc-natbib.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/oc.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-doi.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-man.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/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} @@ -4440,6 +4555,7 @@ fi %{_datadir}/emacs/%{version}/lisp/org/ox-beamer.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ox-html.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ox-icalendar.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/ox-koma-letter.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ox-latex.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ox-man.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/ox-md.el%{ext_el} @@ -4507,6 +4623,7 @@ fi %{_datadir}/emacs/%{version}/lisp/progmodes/cc-styles.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/progmodes/cc-vars.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/progmodes/cfengine.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/progmodes/cl-font-lock.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/progmodes/cmacexp.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/progmodes/compile.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/progmodes/cperl-mode.el%{ext_el} @@ -4591,7 +4708,6 @@ fi %{_datadir}/emacs/%{version}/lisp/rtree.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/savehist.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/saveplace.el%{ext_el} -%{_datadir}/emacs/%{version}/lisp/sb-image.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/scroll-all.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/scroll-bar.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/scroll-lock.el%{ext_el} @@ -4631,6 +4747,7 @@ fi %{_datadir}/emacs/%{version}/lisp/term/pc-win.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/term/rxvt.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/term/screen.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/term/st.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/term/sun.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/term/tmux.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/term/tty-colors.el%{ext_el} @@ -4648,6 +4765,7 @@ fi %{_datadir}/emacs/%{version}/lisp/textmodes/conf-mode.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/textmodes/css-mode.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/textmodes/dns-mode.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/textmodes/etc-authors-mode.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/textmodes/fill.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.el%{ext_el} @@ -4696,6 +4814,7 @@ fi %{_datadir}/emacs/%{version}/lisp/tmm.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/tool-bar.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/tooltip.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/transient.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/tree-widget.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/tutorial.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/type-break.el%{ext_el} diff --git a/pdump.patch b/pdump.patch index f3b550f..f3a2c59 100644 --- a/pdump.patch +++ b/pdump.patch @@ -2,17 +2,26 @@ From: Andreas Schwab Index: src/emacs.c =================================================================== ---- src/emacs.c.orig -+++ src/emacs.c -@@ -869,7 +869,11 @@ load_pdump (int argc, char **argv) - /* Look for "emacs.pdmp" in PATH_EXEC. We hardcode "emacs" in - "emacs.pdmp" so that the Emacs binary still works if the user - copies and renames it. */ +--- + src/emacs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- src/emacs.c ++++ src/emacs.c 2021-10-08 09:36:17.039806927 +0000 +@@ -837,12 +837,16 @@ load_pdump (int argc, char **argv) + NULL + #endif + ; +#ifdef PDMP_BASE -+ const char *argv0_base = PDMP_BASE; ++ const char *argv0_base = PDMP_BASE +#else - const char *argv0_base = "emacs"; + const char *argv0_base = + #ifdef NS_SELF_CONTAINED + "Emacs" + #else + "emacs" + #endif +#endif - ptrdiff_t needed = (strlen (path_exec) - + 1 - + strlen (argv0_base) + ; + + /* TODO: maybe more thoroughly scrub process environment in order to