From: Glenn Morris Date: Wed, 30 Jan 2019 17:12:15 +0000 (-0800) Subject: Merge from origin/emacs-26 X-Git-Tag: emacs-27.0.90~3704 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08bc407a228796b64e321cb28b38b39062ab1732;p=emacs.git Merge from origin/emacs-26 b94d767 (origin/emacs-26) Minor copyedits in last manual change 73508e6 Improve documentation of face numbers bf235ce * doc/emacs/custom.texi (Authentication): Refer to the "Help ... ceccb3c New node Authentication in the Emacs manual 9078f34 Fix a loop in c-fl-decl-start. This fixes bug #34186. a177fe7 Fix LaTeX output of month and day from cal-tex.el 90177d7 Avoid elisp crash for OpenPGP User IDs with no e-mail address 68e55a0 image-mode: Do not use default scaling (bug#33990) b6c762a create-image: Expand documentation (bug#33990) 928d342 Improve documentation of 'isearch-filter-predicate' 9034dd6 Fix cursor column positioning on Grep hits # Conflicts: # doc/emacs/custom.texi --- 08bc407a228796b64e321cb28b38b39062ab1732 diff --cc doc/emacs/custom.texi index 618692e479f,3f660fe9a28..474149fcae6 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@@ -2610,32 -2612,39 +2612,69 @@@ instance @noindent Type @kbd{C-q}, followed by the key you want to bind, to insert @var{char}. +@node Early Init File +@subsection The Early Init File +@cindex early init file + + Most customizations for Emacs should be put in the normal init file, +@file{.emacs} or @file{~/.emacs.d/init.el}. However, it is sometimes desirable +to have customizations that take effect during Emacs startup earlier than the +normal init file is processed. Such customizations can be put in the early +init file, @file{~/.emacs.d/early-init.el}. This file is loaded before the +package system and GUI is initialized, so in it you can customize variables +that affect frame appearance as well as the package initialization process, +such as @code{package-enable-at-startup}, @code{package-load-list}, and +@code{package-user-dir}. Note that variables like @code{package-archives} +which only affect the installation of new packages, and not the process of +making already-installed packages available, may be customized in the regular +init file. @xref{Package Installation}. + + We do not recommend that you move into @file{early-init.el} +customizations that can be left in the normal init files. That is +because the early init file is read before the GUI is initialized, so +customizations related to GUI features will not work reliably in +@file{early-init.el}. By contrast, the normal init files are read +after the GUI is initialized. If you must have customizations in the +early init file that rely on GUI features, make them run off hooks +provided by the Emacs startup, such as @code{window-setup-hook} or +@code{tty-setup-hook}. @xref{Hooks}. + + For more information on the early init file, @pxref{Init File,,, +elisp, The Emacs Lisp Reference Manual}. ++ + @node Authentication + @section Keeping Persistent Authentication Information + + Some Emacs packages, which connect to other services, require + authentication (@pxref{Passwords}), e.g., see @ref{Top, Gnus,, gnus, The + Gnus Manual}, or @ref{Top, Tramp,, tramp, The Tramp Manual}. Because + it might be annoying to provide the same user name and password again + and again, Emacs offers to keep this information persistent via the + @file{auth-source} library. + + @cindex @file{~/.authinfo} file + @cindex @file{~/.authinfo.gpg} file + @cindex ~/.netrc file + By default, the authentication information is taken from the file + @file{~/.authinfo} or @file{~/.authinfo.gpg} or @file{~/.netrc}. + These files have a syntax similar to netrc files as known from the + @command{ftp} program, like this: + + @example + machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport} + @end example + + Similarly, the @file{auth-source} library supports multiple storage + backend, currently either the classic netrc backend, JSON files, the + Secret Service API, and pass, the standard unix password manager. + + @vindex auth-sources + All these alternatives can be customized via the user option + @code{auth-sources}, see @ref{Help for users, Emacs auth-source,, + auth, Emacs auth-source}. + + @vindex auth-source-save-behavior + When a password is entered interactively, which is not found via the + configured backend, some of the backends offer to save it + persistently. This can be changed by customizing the user option + @code{auth-source-save-behavior}. diff --cc lisp/image-mode.el index 3be515d9143,3666009c7e0..fa1362c471b --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@@ -738,12 -758,14 +738,14 @@@ was inserted. (edges (and (null image-transform-resize) (window-inside-pixel-edges (get-buffer-window (current-buffer))))) - (type (if (fboundp 'imagemagick-types) + (type (if (image--imagemagick-wanted-p filename) 'imagemagick (image-type file-or-data nil data-p))) + ;; :scale 1: If we do not set this, create-image will apply + ;; default scaling based on font size. (image (if (not edges) - (create-image file-or-data type data-p) - (create-image file-or-data type data-p + (create-image file-or-data type data-p :scale 1) + (create-image file-or-data type data-p :scale 1 :max-width (- (nth 2 edges) (nth 0 edges)) :max-height (- (nth 3 edges) (nth 1 edges))))) (inhibit-read-only t)