From: Glenn Morris <rgm@gnu.org>
Date: Tue, 16 Oct 2018 15:08:04 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=722833d30e609655de4675dd5c25eb8460947f93;p=emacs.git

Merge from origin/emacs-26

73babba (origin/emacs-26) Clarify documentation of fractional vertica...
b20c51d * lisp/isearch.el (isearch-cmds): Recall absent isearch--stat...
700acbd doc/lispref/edebug.texi (Specification List) Remove obstrusiv...
1902450 Fix wording in module API documentation
e724a8f Fix redisplay of glyphless characters
8fc892d Update --without-toolkit-scroll-bars doc
80e0bfa Call GTK functions only on GTK scrollbars
91c4c46 Update the description of startup in ELisp manual
18b42c6 Use the 'line-number' face for line-number fields past EOB
a6ab8db Ensure NS frame is redrawn correctly  after scroll

Conflicts:
	lisp/isearch.el
---

722833d30e609655de4675dd5c25eb8460947f93
diff --cc doc/lispref/os.texi
index d74fec5cfd9,44fc9a1eea2..cb337573259
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@@ -95,24 -95,8 +95,24 @@@ if requested by environment variables s
  @item
  It does some basic parsing of the command-line arguments.
  
 +@item
 +It loads your early init file (@pxref{Early Init File,,, emacs, The
 +GNU Emacs Manual}).  This is not done if the options @samp{-q},
 +@samp{-Q}, or @samp{--batch} were specified.  If the @samp{-u} option
 +was specified, Emacs looks for the init file in that user's home
 +directory instead.
 +
 +@item
 +It calls the function @code{package-activate-all} to activate any
 +optional Emacs Lisp package that has been installed.  @xref{Packaging
 +Basics}.  However, Emacs doesn't activate the packages when
 +@code{package-enable-at-startup} is @code{nil} or when it's started
 +with one of the options @samp{-q}, @samp{-Q}, or @samp{--batch}.  To
 +activate the packages in the latter case, @code{package-activate-all}
 +should be called explicitly (e.g., via the @samp{--funcall} option).
 +
  @vindex initial-window-system@r{, and startup}
- @vindex window-system-initialization-alist
+ @findex window-system-initialization
  @item
  If not running in batch mode, it initializes the window system that
  the variable @code{initial-window-system} specifies (@pxref{Window