From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Jan 2018 16:23:30 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5839
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60d5a13d28705e116e0a69c48f15d20aab9d3081;p=emacs.git

Merge from origin/emacs-26

cfc94fd (origin/emacs-26) Don't mention 'vc-stay-local' in the user m...
8ce430b Fix a typo in calendar.texi
bb748b3 Minor improvement in wording of the Emacs manual
b603aff Revert "Fix tempfile creation when byte compiling"
4fd446e Fix tempfile creation when byte compiling
7f48a11 Improve the Emacs manual as suggested in emacs-manual-bugs
728ded0 * lisp/emacs-lisp/bytecomp.el: Tweak last change
c6c05e2 Unbreak building Emacs on FreeBSD
a41ad3d Don't unnecessarily use non-ASCII characters in C sources
c28d4b6 Portability fixes in emacs-module-tests
1d50c18 Add tests for term.el
---

60d5a13d28705e116e0a69c48f15d20aab9d3081
diff --cc src/xwidget.c
index 17f7d477f62,530d1af707a..95fa5f19c40
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@@ -389,10 -389,11 +389,10 @@@ webkit_javascript_finished_cb (GObjec
      /* Register an xwidget event here, which then runs the callback.
         This ensures that the callback runs in sync with the Emacs
         event loop.  */
-     /* FIXME: This might lead to disaster if LISP_CALLBACK’s object
+     /* FIXME: This might lead to disaster if LISP_CALLBACK's object
         was garbage collected before now.  See the FIXME in
         Fxwidget_webkit_execute_script.  */
 -    store_xwidget_js_callback_event (xw, XIL ((intptr_t) lisp_callback),
 -                                     lisp_value);
 +    store_xwidget_js_callback_event (xw, XPL (lisp_callback), lisp_value);
  }