From: Glenn Morris <rgm@gnu.org>
Date: Wed, 28 Nov 2018 15:51:12 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~4468
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=415ef4a2b02dac17bf1bb962154633e671e561dd;p=emacs.git

Merge from origin/emacs-26

74a3a79 (origin/emacs-26) Fix a typo in a doc string
911766d Minor markup fix in frames.texi
19ed1e9 * lisp/net/trampver.el (customize-package-emacs-version-alist...
d7132ad * lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): ...
5f39260 * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to m...
a291f62 Don't call xwidget functions until GTK has been initialized
f0531b8 Improve documentation of Ediff wordwise commands
2925ce5 Support Hunspell 1.7.0 in ispell.el
03bb7a8 Avoid clearing echo-area message by auto-save-visited-file-name
---

415ef4a2b02dac17bf1bb962154633e671e561dd
diff --cc src/xwidget.c
index 6faac107518,09c65d0d3ee..6da7a0bb3f4
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@@ -78,9 -78,11 +78,11 @@@ Returns the newly constructed xwidget, 
     Lisp_Object title, Lisp_Object width, Lisp_Object height,
     Lisp_Object arguments, Lisp_Object buffer)
  {
+   if (!xg_gtk_initialized)
+     error ("make-xwidget: GTK has not been initialized");
    CHECK_SYMBOL (type);
 -  CHECK_NATNUM (width);
 -  CHECK_NATNUM (height);
 +  CHECK_FIXNAT (width);
 +  CHECK_FIXNAT (height);
  
    struct xwidget *xw = allocate_xwidget ();
    Lisp_Object val;