rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Update to GNU Emacs 26.2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=266
This commit is contained in:
Dr. Werner Fink 2019-04-15 13:48:34 +00:00 committed by Git OBS Bridge
parent aff8e914a1
commit 2d7a1f5e78
13 changed files with 103 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emacs-24.1-ps-mule.patch
View File

@ -16,7 +16,7 @@
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000
@@ -1524,10 +1524,18 @@ Protects against bogus binding of `enabl
@@ -1540,10 +1540,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)))))

2
emacs-24.3-iconic.patch
View File

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

6
emacs-24.4-flyspell.patch
View File

@ -4,7 +4,7 @@
--- lisp/textmodes/flyspell.el
+++ lisp/textmodes/flyspell.el 2016-09-19 09:22:48.535025631 +0000
@@ -310,6 +310,12 @@ If this variable is nil, all regions are
@@ -313,6 +313,12 @@ If this variable is nil, all regions are
:type 'key-sequence
:group 'flyspell)
@ -17,7 +17,7 @@
;;*---------------------------------------------------------------------*/
;;* Mode specific options */
;;* ------------------------------------------------------------- */
@@ -333,7 +339,6 @@ property of the major mode name.")
@@ -342,7 +342,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
@@ -345,11 +350,11 @@ property of the major mode name.")
@@ -353,11 +353,11 @@ property of the major mode name.")
nil t)
(point)))
(signature-begin

2
emacs-24.4-glibc.patch
View File

@ -15,7 +15,7 @@
AC_FUNC_MMAP
--- configure
+++ configure 2018-05-29 12:20:07.583908486 +0000
@@ -11423,6 +11423,7 @@ fi
@@ -11455,6 +11455,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
mingw32) use_mmap_for_buffers=yes ;;

2
emacs-24.4-nonvoid.patch
View File

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

2
emacs-24.4-ps-bdf.patch
View File

@ -5,7 +5,7 @@
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2018-05-29 12:23:32.824206557 +0000
@@ -26339,9 +26339,9 @@ With prefix argument ARG, restart the Pr
@@ -26382,9 +26382,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

6
emacs-25.2-ImageMagick7.patch
View File

@ -18,7 +18,7 @@ Index: emacs-25.2/configure.ac
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
@@ -8432,7 +8432,11 @@ imagemagick_compute_animated_image (Magi
@@ -8434,7 +8434,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;
@@ -8497,7 +8501,11 @@ imagemagick_compute_animated_image (Magi
@@ -8499,7 +8503,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);
@@ -8542,7 +8550,11 @@ imagemagick_load_image (struct frame *f,
@@ -8546,7 +8554,11 @@ imagemagick_load_image (struct frame *f,
MagickWand *image_wand;
PixelIterator *iterator;
PixelWand **pixels, *bg_wand = NULL;

3
emacs-26.1.tar.xz
View File

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

50
emacs-26.1.dif → emacs-26.2.dif
View File

@ -20,8 +20,8 @@
18 files changed, 473 insertions(+), 33 deletions(-)
--- Makefile.in
+++ Makefile.in 2018-05-29 13:07:53.479965338 +0000
@@ -487,8 +487,8 @@ install-arch-dep: src install-arch-indep
+++ Makefile.in 2019-04-15 12:04:25.158945850 +0000
@@ -490,8 +490,8 @@ install-arch-dep: src install-arch-indep
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
$(MAKE) -C lib-src install
ifeq (${ns_self_contained},no)
@ -32,7 +32,7 @@
ifndef NO_BIN_LINK
rm -f "$(DESTDIR)${bindir}/$(EMACS)"
cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)"
@@ -677,6 +677,7 @@ install-man:
@@ -682,6 +682,7 @@ install-man:
umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
@ -40,7 +40,7 @@
for page in *.1; do \
test "$$page" = ChangeLog.1 && continue; \
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
@@ -774,7 +775,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
@@ -780,7 +781,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 +50,8 @@
rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
"hicolor/scalable/apps/${EMACS_NAME}.svg" \
--- configure
+++ configure 2018-05-29 13:07:58.359876230 +0000
@@ -10428,10 +10428,8 @@ fi
+++ configure 2019-04-15 12:04:25.158945850 +0000
@@ -10460,10 +10460,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -65,7 +65,7 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- configure.ac
+++ configure.ac 2018-05-29 13:07:53.515964680 +0000
+++ configure.ac 2019-04-15 12:04:25.162945775 +0000
@@ -1806,10 +1806,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
@ -80,7 +80,7 @@
x_default_search_path=""
x_search_path=${x_libraries}
--- doc/man/etags.1
+++ doc/man/etags.1 2018-05-29 13:07:53.515964680 +0000
+++ doc/man/etags.1 2019-04-15 12:04:25.162945775 +0000
@@ -7,7 +7,7 @@
..
@ -164,7 +164,7 @@
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2018-06-08 10:22:59.756084963 +0000
+++ lib-src/Makefile.in 2019-04-15 12:04:25.162945775 +0000
@@ -30,6 +30,8 @@ CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS = @CPPFLAGS@
@ -193,7 +193,7 @@
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
--- lib-src/pop.c
+++ lib-src/pop.c 2018-05-29 13:07:56.015919030 +0000
+++ lib-src/pop.c 2019-04-15 12:04:25.242944251 +0000
@@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
@ -203,7 +203,7 @@
#include "ntlib.h"
#undef _WIN32_WINNT
--- lib/Makefile.in
+++ lib/Makefile.in 2018-06-08 11:18:36.604027828 +0000
+++ lib/Makefile.in 2019-04-15 12:04:25.242944251 +0000
@@ -50,6 +50,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
@ -214,7 +214,7 @@
$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \
$(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el 2018-05-29 13:07:56.015919030 +0000
+++ lisp/cmuscheme.el 2019-04-15 12:04:25.242944251 +0000
@@ -241,7 +241,8 @@ is run).
(read-string "Run Scheme: " scheme-program-name)
scheme-program-name)))
@ -226,7 +226,7 @@
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2018-05-29 13:07:56.015919030 +0000
+++ lisp/international/mule-cmds.el 2019-04-15 12:04:25.242944251 +0000
@@ -39,6 +39,7 @@
(defvar mule-keymap
@ -236,7 +236,7 @@
(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 2018-05-29 13:07:56.015919030 +0000
+++ 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
; "If a host matches this regexp then it is assumed to be running VOS.")
;
@ -274,7 +274,7 @@
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2018-05-29 13:07:56.015919030 +0000
+++ lisp/site-load.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,41 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
@ -318,7 +318,7 @@
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el 2018-05-29 13:07:56.015919030 +0000
+++ lisp/speedbar.el 2019-04-15 12:04:25.246944174 +0000
@@ -794,6 +794,7 @@ If you want to change this while speedba
;; Navigation.
@ -328,8 +328,8 @@
(define-key map "\M-n" 'speedbar-restricted-next)
(define-key map "\M-p" 'speedbar-restricted-prev)
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2018-05-29 13:07:56.015919030 +0000
@@ -200,10 +200,12 @@ Must be greater than 1."
+++ lisp/textmodes/ispell.el 2019-04-15 12:04:25.246944174 +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.
(defcustom ispell-program-name
@ -346,7 +346,7 @@
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:set (lambda (symbol value)
@@ -1179,7 +1181,8 @@ dictionary from that list was found."
@@ -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
@ -356,7 +356,7 @@
;; 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))))
@@ -1414,6 +1417,78 @@ The variable `ispell-library-directory'
@@ -1430,6 +1433,78 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
@ -436,7 +436,7 @@
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
:help ,(purecopy "Supply explicit dictionary file name")))
--- site-lisp/term/func-keys.el
+++ site-lisp/term/func-keys.el 2018-05-29 13:07:56.015919030 +0000
+++ site-lisp/term/func-keys.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
@ -472,7 +472,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el 2018-05-29 13:07:56.015919030 +0000
+++ site-lisp/term/gnome.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
@ -572,7 +572,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el 2018-05-29 13:07:56.019918957 +0000
+++ site-lisp/term/kvt.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
@ -672,7 +672,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el 2018-05-29 13:07:56.019918957 +0000
+++ site-lisp/term/linux.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
@ -754,7 +754,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el 2018-05-29 13:07:56.019918957 +0000
+++ site-lisp/term/locale.el 2019-04-15 12:04:25.246944174 +0000
@@ -0,0 +1,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
size 44406808

41
emacs.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Apr 15 12:13:04 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Update to emacs version 26.2
* Emacs is now compliant with the latest version 11.0 of the Unicode Standard.
* New variable 'xft-ignore-color-fonts'.
* Changes in Specialized Modes and Packages in Emacs 26.2
Dired: The 'Z' command on a directory name compresses all of its files.
* Ibuffer: New toggle 'ibuffer-do-toggle-lock', bound to 'L'.
* Imenu: The value for 'imenu-auto-rescan-maxout' has been increased to 600000.
* Gnus: Mailutils movemail will now be used if found at runtime.
* Shadowfile: shadowfile.el has been rewritten to support Tramp file names.
* Shell mode: Shell mode buffers now have 'scroll-conservatively' set to 101.
* VC: VC support for Mercurial was improved.
* Incompatible Lisp Changes in Emacs 26.2
shadowfile config files have changed their syntax.
'thread-alive-p' has been renamed to 'thread-live-p'.
'while-no-input' does not return due to input from subprocesses.
* Lisp Changes in Emacs 26.2
The new function 'read-answer' accepts either long or short answers
depending on the new customizable variable 'read-answer-short'.
New function 'assoc-delete-all'. Like 'assq-delete-all', but uses
'equal' for comparison.
The function 'thing-at-point' behaves as before Emacs 26.1.
The behavior of 'thing-at-point' when called with argument 'list' has
changed in Emacs 26.1, in that it didn't consider text inside comments
and strings as a potential list. This change is now reverted, and
'thing-at-point' behaves like it did before Emacs 26.1.
To cater to use cases where comments and strings are to be ignored
when looking for a list, the function 'list-at-point' now takes an
optional argument to do so.
- Port and rename patch emacs-26.1.dif to emacs-26.2.dif
- Modify/port patches
* emacs-24.1-ps-mule.patch
* emacs-24.3-iconic.patch
* emacs-24.4-flyspell.patch
* emacs-24.4-glibc.patch
* emacs-24.4-nonvoid.patch
* emacs-24.4-ps-bdf.patch
* emacs-25.2-ImageMagick7.patch
-------------------------------------------------------------------
Tue Oct 23 08:25:39 UTC 2018 - Dr. Werner Fink <werner@suse.de>

13
emacs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package emacs
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -102,7 +102,7 @@ BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xxf86vm)
Url: http://www.gnu.org/software/emacs/
Version: 26.1
Version: 26.2
Release: 0
Summary: GNU Emacs Base Package
License: GPL-3.0-or-later
@ -128,7 +128,7 @@ Source2: site-lisp.tar.bz2
Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc
Source5: emacs.sh
Patch: emacs-26.1.dif
Patch: emacs-26.2.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
@ -253,7 +253,7 @@ and most assembler-like syntaxes.
%patch23 -p0 -b .custfnt
%patch24 -p1 -b .imag
%patch25 -p0 -b .xft
%patch26 -p1
%patch26 -p1 -b .xwd
%patch -p0 -b .0
%build
@ -3224,7 +3224,6 @@ fi
%{_bindir}/emacs-gtk
%dir %{appDefaultsDir}
%{appDefaultsFile}
%{_datadir}/appdata/emacs.appdata.xml
%{_datadir}/applications/emacs.desktop
%{_datadir}/icons/hicolor/128x128/apps/emacs.png
%{_datadir}/icons/hicolor/16x16/apps/emacs.png
@ -3234,6 +3233,7 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
%{_datadir}/metainfo/emacs.appdata.xml
%{_datadir}/pixmaps/emacs.png
%files -n emacs-info
@ -3245,6 +3245,7 @@ fi
%files -n emacs-el
%defattr(-, root, root)
%{_x11inc}/emacs-module.h
%{_datadir}/emacs/%{version}/lisp/abbrev.el.gz
%{_datadir}/emacs/%{version}/lisp/align.el.gz
%{_datadir}/emacs/%{version}/lisp/allout-widgets.el.gz

29
xwidget.patch
View File

@ -1,8 +1,13 @@
Index: emacs-26.1/src/xwidget.c
===================================================================
--- emacs-26.1.orig/src/xwidget.c
+++ emacs-26.1/src/xwidget.c
@@ -362,7 +362,7 @@ webkit_js_to_lisp (JSContextRef context,
---
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,
@ -11,7 +16,7 @@ Index: emacs-26.1/src/xwidget.c
{
WebKitJavascriptResult *js_result;
JSValueRef value;
@@ -370,6 +370,11 @@ webkit_javascript_finished_cb (GObject
@@ -372,6 +372,11 @@ webkit_javascript_finished_cb (GObject
GError *error = NULL;
struct xwidget *xw = g_object_get_data (G_OBJECT (webview),
XG_XWIDGET);
@ -23,7 +28,7 @@ Index: emacs-26.1/src/xwidget.c
js_result = webkit_web_view_run_javascript_finish
(WEBKIT_WEB_VIEW (webview), result, &error);
@@ -381,19 +386,19 @@ webkit_javascript_finished_cb (GObject
@@ -383,19 +388,19 @@ webkit_javascript_finished_cb (GObject
return;
}
@ -55,7 +60,7 @@ Index: emacs-26.1/src/xwidget.c
}
@@ -687,8 +692,7 @@ DEFUN ("xwidget-webkit-goto-uri",
@@ -693,8 +698,7 @@ DEFUN ("xwidget-webkit-goto-uri",
DEFUN ("xwidget-webkit-zoom",
Fxwidget_webkit_zoom, Sxwidget_webkit_zoom,
2, 2, 0,
@ -65,7 +70,7 @@ Index: emacs-26.1/src/xwidget.c
(Lisp_Object xwidget, Lisp_Object factor)
{
WEBKIT_FN_INIT ();
@@ -703,12 +707,33 @@ referenced by XWIDGET. */)
@@ -709,12 +713,33 @@ referenced by XWIDGET. */)
return Qnil;
}
@ -101,7 +106,7 @@ Index: emacs-26.1/src/xwidget.c
argument procedure FUN.*/)
(Lisp_Object xwidget, Lisp_Object script, Lisp_Object fun)
{
@@ -717,23 +742,19 @@ argument procedure FUN.*/)
@@ -723,23 +748,19 @@ argument procedure FUN.*/)
if (!NILP (fun) && !FUNCTIONP (fun))
wrong_type_argument (Qinvalid_function, fun);
@ -131,7 +136,7 @@ Index: emacs-26.1/src/xwidget.c
return Qnil;
}
@@ -1200,6 +1221,16 @@ kill_buffer_xwidgets (Lisp_Object buffer
@@ -1204,6 +1225,16 @@ kill_buffer_xwidgets (Lisp_Object buffer
gtk_widget_destroy (xw->widget_osr);
gtk_widget_destroy (xw->widgetwindow_osr);
}
@ -148,10 +153,8 @@ Index: emacs-26.1/src/xwidget.c
}
}
}
Index: emacs-26.1/src/xwidget.h
===================================================================
--- emacs-26.1.orig/src/xwidget.h
+++ emacs-26.1/src/xwidget.h
--- 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;