10 files changed, 156 insertions, 55 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index 9bf9bab1178..1c630f7fd25 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,65 @@
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Mention trace.el facilities in the ELisp manual
+
+        * doc/lispref/debugging.texi (Debugging): Mention the trace.el
+        library.
+
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of safe values of variables
+
+        * doc/lispref/variables.texi (File Local Variables): Mention the
+        autoload cookie as a means of defining safe values for variables.
+        See http://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00261.html
+        for the details.
+        * doc/lispref/compile.texi (Compiler Errors): Document
+        'byte-compile-error-on-warn'.
+
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve the Emacs manual's "Misc" node
+
+        * doc/emacs/misc.texi (Gnus): A more descriptive section name.
+        (Invoking emacsclient): Mention how to avoid errors when there's
+        no Emacs server.
+        (EWW, Embedded WebKit Widgets): Now subsections under
+        "Hyperlinking and Web Navigation Features".
+        (Amusements): Add "games" to the section name.  Suggested by Alex
+        Branham <alex.branham@gmail.com> in emacs-manual-bugs@gnu.org.
+
+        * doc/emacs/emacs.texi (Top): Adjust the top-level menus to the
+        above changes.
+
+        * doc/lispref/os.texi (Security Considerations): Fix typos.
+
+2018-01-13  Martin Rudalics  <rudalics@gmx.at>
+
+        In nsterm.m use FRAME_NS_P instead of FRAME_X_P (Bug#30019)
+
+        * src/nsterm.m (x_set_parent_frame): Call FRAME_NS_P instead
+        of FRAME_X_P (Bug#30019).
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+        Bump Emacs version to 26.0.91
+
+        * README:
+        * configure.ac:
+        * msdos/sed2v2.inp:
+        * nt/README.W32: Bump Emacs version.
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+        * ChangeLog.3: Update
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+        Update authors
+
+        * admin/authors.el (authors-aliases, authors-valid-file-names): Additions.
+        * etc/AUTHORS: Update AUTHORS file.
+
 2018-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * lisp/gnus/message.el (message-do-auto-fill): Prevent do-auto-fill from
@@ -56068,7 +56130,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit bce51bd6f7702dbc70a570e8b905f23db9cdcdcf (inclusive).
+commit 5dd0e5c54d29e81c07798a124295c8c3f016d621 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/admin/authors.el b/admin/authors.el
index 95d9ed16245..8c94014c575 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -130,7 +130,7 @@ files.")
     ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo")
     ("Martin Lorentzon" "Martin Lorentzson")
     ("Matt Swift" "Matthew Swift")
-    (nil "Max")
+    (nil "mu@magi.net.ru")
     ("Maxime Edouard Robert Froumentin" "Max Froumentin")
     ("Michael R. Mauger" "Michael Mauger")
     ("Michael D. Ernst" "Michael Ernst")
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index cda94631b9b..09817080c58 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -191,8 +191,6 @@ Advanced Features
 * Host Security::       Security issues on a single computer.
 * Network Security::    Managing the network security.
 * Document View::       Viewing PDF, PS and DVI files.
-* EWW::                 A web browser in Emacs.
-* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
 * Shell::               Executing shell commands from Emacs.
 * Emacs Server::        Using Emacs as an editing server.
 * Printing::            Printing hardcopies of buffers or regions.
@@ -1095,6 +1093,8 @@ Printing Hard Copies
 
 Hyperlinking and Navigation Features
 
+* EWW::                 A web browser in Emacs.
+* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
 * Browse-URL::          Following URLs.
 * Goto Address mode::   Activating URLs.
 * FFAP::                Finding files etc. at point.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 633e1e881d8..fb39a78de96 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -21,7 +21,7 @@ hyperlinks, and various diversions and amusements.
 @end ifnottex
 
 @node Gnus
-@section Gnus
+@section Email and Usenet News with Gnus
 @cindex Gnus
 @cindex Usenet news
 @cindex newsreader
@@ -587,40 +587,6 @@ associated with the current buffer, type @kbd{K}
 (@code{doc-view-kill-proc-and-buffer}) kills the converter process and
 the DocView buffer.
 
-@node EWW
-@section Web Browsing with EWW
-
-@findex eww
-@findex eww-open-file
-  @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
-It allows browsing URLs within an Emacs buffer.  The command @kbd{M-x
-eww} will open a URL or search the web.  You can open a file
-using the command @kbd{M-x eww-open-file}.  You can use EWW as the
-web browser for @code{browse-url}, @pxref{Browse-URL}.  For full
-details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
-
-@node Embedded WebKit Widgets
-@section Embedded WebKit Widgets
-@cindex xwidget
-@cindex webkit widgets
-@cindex embedded widgets
-
-@findex xwidget-webkit-browse-url
-@findex xwidget-webkit-mode
-@cindex Xwidget-WebKit mode
-  If Emacs was compiled with the appropriate support packages, it is
-able to show browser widgets in its buffers.  The command @kbd{M-x
-xwidget-webkit-browse-url} asks for a URL to display in the browser
-widget.  The URL normally defaults to the URL at or before point, but
-if there is an active region (@pxref{Mark}), the default URL comes
-from the region instead, after removing any whitespace from it.  The
-command then creates a new buffer with the embedded browser showing
-the specified URL.  The buffer is put in the Xwidget-WebKit mode
-(similar to Image mode, @pxref{File Conveniences}), which provides
-one-key commands for scrolling the widget, changing its size, and
-reloading it.  Type @w{@kbd{C-h b}} in that buffer to see the key
-bindings.
-
 @node Shell
 @section Running Shell Commands from Emacs
 @cindex subshell
@@ -1745,7 +1711,9 @@ graphical frame, or one in a text terminal (@pxref{Frames}).  You
 can then select that frame to begin editing.
 
   If there is no Emacs server, the @command{emacsclient} program halts
-with an error message.  If the Emacs process has no existing
+with an error message (you can prevent this from happening by using
+the @samp{--alternate-editor=""} option to @command{emacsclient},
+@pxref{emacsclient Options}).  If the Emacs process has no existing
 frame---which can happen if it was started as a daemon (@pxref{Emacs
 Server})---then Emacs opens a frame on the terminal in which you
 called @command{emacsclient}.
@@ -2702,17 +2670,53 @@ key bindings.
 
 
 @node Hyperlinking
-@section Hyperlinking and Navigation Features
+@section Hyperlinking and Web Navigation Features
 
   The following subsections describe convenience features for handling
 URLs and other types of links occurring in Emacs buffer text.
 
 @menu
+* EWW::                         A web browser in Emacs.
+* Embedded WebKit Widgets::     Embedding browser widgets in Emacs buffers.
 * Browse-URL::                  Following URLs.
 * Goto Address mode::           Activating URLs.
 * FFAP::                        Finding files etc. at point.
 @end menu
 
+@node EWW
+@subsection Web Browsing with EWW
+
+@findex eww
+@findex eww-open-file
+  @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
+It allows browsing URLs within an Emacs buffer.  The command @kbd{M-x
+eww} will open a URL or search the web.  You can open a file
+using the command @kbd{M-x eww-open-file}.  You can use EWW as the
+web browser for @code{browse-url}, @pxref{Browse-URL}.  For full
+details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
+
+@node Embedded WebKit Widgets
+@subsection Embedded WebKit Widgets
+@cindex xwidget
+@cindex webkit widgets
+@cindex embedded widgets
+
+@findex xwidget-webkit-browse-url
+@findex xwidget-webkit-mode
+@cindex Xwidget-WebKit mode
+  If Emacs was compiled with the appropriate support packages, it is
+able to show browser widgets in its buffers.  The command @kbd{M-x
+xwidget-webkit-browse-url} asks for a URL to display in the browser
+widget.  The URL normally defaults to the URL at or before point, but
+if there is an active region (@pxref{Mark}), the default URL comes
+from the region instead, after removing any whitespace from it.  The
+command then creates a new buffer with the embedded browser showing
+the specified URL.  The buffer is put in the Xwidget-WebKit mode
+(similar to Image mode, @pxref{File Conveniences}), which provides
+one-key commands for scrolling the widget, changing its size, and
+reloading it.  Type @w{@kbd{C-h b}} in that buffer to see the key
+bindings.
+
 @node Browse-URL
 @subsection  Following URLs
 @cindex World Wide Web
@@ -2853,7 +2857,7 @@ find the one you select (@code{ffap-menu}).
 @end table
 
 @node Amusements
-@section Other Amusements
+@section Games and Other Amusements
 @cindex boredom
 
 @findex animate-birthday-present
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 32162c9c22b..212b5a45dc6 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -524,6 +524,11 @@ one you intend to suppress.
 the variable @code{byte-compile-warnings}.  See its documentation
 string for details.
 
+@vindex byte-compile-error-on-warn
+  Sometimes you may wish the byte-compiler warnings to be reported
+using @code{error}.  If so, set @code{byte-compile-error-on-warn} to a
+non-nil value.
+
 @node Byte-Code Objects
 @section Byte-Code Function Objects
 @cindex compiled function
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index f937184e73a..307bba6e69b 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -20,6 +20,16 @@ alter its internal state.
 You can use Edebug, a source-level debugger for Emacs Lisp.
 
 @item
+@cindex tracing Lisp programs
+You can trace the execution of functions involved in the problem using
+the tracing facilities provided by the @file{trace.el} package.  This
+package provides the functions @code{trace-function-foreground} and
+@code{trace-function-background} for tracing function calls, and
+@code{trace-values} for adding values of select variables to the
+trace.  For the details, see the documentation of these facilities in
+@file{trace.el}.
+
+@item
 If a syntactic problem is preventing Lisp from even reading the
 program, you can locate it using Lisp editing commands.
 
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 6315574923f..08544688350 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -3001,10 +3001,10 @@ issues involved, rather than to be a security checklist.
 @table @asis
 @item File local variables
 @cindex file local variables
-A file that Emacs visits can contain variable settings that affects
+A file that Emacs visits can contain variable settings that affect
 the buffer visiting that file; @xref{File Local Variables}.
 Similarly, a directory can specify local variable values common to all
-files in that directory; @xref{Directory Local Variables}.  Although
+files in that directory; see @ref{Directory Local Variables}.  Although
 Emacs takes some effort to protect against misuse of these variables,
 a security hole can be created merely by a package setting
 @code{safe-local-variable} too optimistically, a problem that is all
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 01cacb0b23c..8f8e8302c45 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1811,10 +1811,24 @@ variables have @code{safe-local-variable} properties; these include
 For boolean-valued variables that are safe, use @code{booleanp} as the
 property value.
 
+@cindex autoload cookie, and safe values of variable
   When defining a user option using @code{defcustom}, you can set its
 @code{safe-local-variable} property by adding the arguments
 @code{:safe @var{function}} to @code{defcustom} (@pxref{Variable
-Definitions}).
+Definitions}).  However, a safety predicate defined using @code{:safe}
+will only be known once the package that contains the @code{defcustom}
+is loaded, which is often too late.  As an alternative, you can use
+the autoload cookie (@pxref{Autoload}) to assign the option its safety
+predicate, like this:
+
+@lisp
+;;;###autoload (put '@var{var} 'safe-local-variable '@var{pred})
+@end lisp
+
+@noindent
+The safe value definitions specified with @code{autoload} are copied
+into the @file{loaddefs.el} file, and are known to Emacs since the
+beginning of a session.
 
 @defopt safe-local-variable-values
 This variable provides another way to mark some variable values as
diff --git a/etc/AUTHORS b/etc/AUTHORS
index e7d00d26d71..fbf3c0e48a3 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -681,7 +681,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 936 other files
+  custom.texi image.c window.el and 935 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -1263,6 +1263,8 @@ Doug Cutting: co-wrote disass.el
 
 Douglas Lewan: changed TUTORIAL.pt_BR
 
+Doug Maxey: changed mouse.el
+
 Drake Wilson: changed emacsclient.c files.el misc.texi
 
 Drew Adams: wrote light-blue-theme.el
@@ -1325,7 +1327,7 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
 and changed xdisp.c msdos.c w32.c w32fns.c display.texi simple.el
   files.el fileio.c w32proc.c keyboard.c w32term.c dispnew.c emacs.c
   lisp.h dispextern.h files.texi process.c term.c window.c text.texi
-  INSTALL and 1103 other files
+  INSTALL and 1102 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1410,7 +1412,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  sb-tag-type.xpm and 34 other files
+  sb-tag-type.xpm and 33 other files
 
 Eric Schulte: wrote ob-asymptote.el ob-awk.el ob-calc.el ob-comint.el
   ob-coq.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el
@@ -1699,7 +1701,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
   progmodes/f90.el bytecomp.el simple.el authors.el emacs.texi
   misc/Makefile.in admin.el startup.el lib-src/Makefile.in ack.texi
-  display.texi cal-menu.el and 1672 other files
+  display.texi cal-menu.el and 1671 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2501,7 +2503,7 @@ Juri Linkov: wrote files-x.el misearch.el replace-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
   dired-aux.el dired.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 358 other files
+  image-mode.el ispell.el man.el cus-edit.el and 357 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -2899,7 +2901,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 213 other files
+  variables.texi buffers.texi commands.texi and 212 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3206,6 +3208,10 @@ Matt Simmons: changed message.el
 Matt Swift: changed dired.el editfns.c lisp-mode.el mm-decode.el
   outline.el progmodes/compile.el rx.el simple.el startup.el
 
+Maxime Edouard Robert Froumentin: changed gnus-art.el mml.el
+
+Max Mikhanosha: changed org-agenda.el org-habit.el org.el
+
 Memnon Anon: changed org.texi
 
 Micah Anderson: changed spook.lines
@@ -3286,7 +3292,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el and 56 other files
+  erc-button.el and 55 other files
 
 Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 
@@ -4441,7 +4447,7 @@ and changed todo-mode.texi diary-lib.el dired-tests.el doc-view.el
   files.el minibuffer.el dired.el frames.texi hl-line.el info.el
   menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes allout.el
   artist.el compile.texi cus-start.el descr-text.el dframe.el
-  and 40 other files
+  and 39 other files
 
 Stephen Compall: changed saveplace.el texinfo.el
 
@@ -4605,7 +4611,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-tests.el
 and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el encrypt.el mail-source.el nnir.el
-  nnmail.el auth-source-tests.el configure.ac and 121 other files
+  nnmail.el auth-source-tests.el configure.ac and 120 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 1f23a6e4fa8..d2927d26b45 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1946,7 +1946,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
   if (!NILP (new_value)
       && (!FRAMEP (new_value)
           || !FRAME_LIVE_P (p = XFRAME (new_value))
-          || !FRAME_X_P (p)))
+          || !FRAME_NS_P (p)))
     {
       store_frame_param (f, Qparent_frame, old_value);
       error ("Invalid specification of `parent-frame'");