Merge from origin/emacs-26

3109d2b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
86825c4 * etc/NEWS: Remove temporary markup.
737d0a2 * Update etc/AUTHORS
fbd03ba * ChangeLog.3: Update
56794ac Fix Bug#31022
a231c33 Update "Calendrical Calculations" cites
1527235 ; * doc/lispref/compile.texi (Compilation Functions): Fix wor...
b07decd ; * doc/lispref/compile.texi (Compilation Functions): Fix typo
a64c11a Fix term.el rendering following a window resize (Bug#30544)
1e6f09a * files.el (auto-save-visited-mode): Don't prompt for filenames.
eb8b13f ; * etc/NEWS: Improve the entry about pinentry.el removal.
52501ec Quote a few backticks in docstrings.

Conflicts:
	etc/NEWS
	lisp/ldefs-boot.el

5 files changed, 32 insertions, 24 deletions

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 4bf8b67ee53..16009df8245 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -76,20 +76,19 @@
 ;;    solar.el                   Sunrise/sunset, equinoxes/solstices
 
 ;; Technical details of all the calendrical calculations can be found in
-;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold
-;; and Nachum Dershowitz, Cambridge University Press (2001).
+;; "Calendrical Calculations: The Ultimate Edition" by Edward M. Reingold
+;; and Nachum Dershowitz, Cambridge University Press (2018).
 
-;; An earlier version of the technical details appeared in
-;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold,
+;; An earlier version of the technical details appeared in "Calendrical
+;; Calculations" by Nachum Dershowitz and Edward M. Reingold,
 ;; Software--Practice and Experience, Volume 20, Number 9 (September, 1990),
-;; pages 899-928, and in ``Calendrical Calculations, Part II: Three Historical
-;; Calendars'' by E. M. Reingold,  N. Dershowitz, and S. M. Clamen,
-;; Software--Practice and Experience, Volume 23, Number 4 (April, 1993),
-;; pages 383-404.
-
-;; Hard copies of these two papers can be obtained by sending email to
-;; reingold@cs.uiuc.edu with the SUBJECT "send-paper-cal" (no quotes) and
-;; the message BODY containing your mailing address (snail).
+;; pages 899-928 <https://doi.org/10.1002/spe.4380200905>
+;; <https://pdfs.semanticscholar.org/83b1/14f570002a7a8e1d4e3730cd0e4cdbcad212.pdf>,
+;; and in "Calendrical Calculations, Part II: Three Historical Calendars" by
+;; E. M. Reingold, N. Dershowitz, and S. M. Clamen, Software--Practice and
+;; Experience, Volume 23, Number 4 (April, 1993), pages 383-404
+;; <https://doi.org/10.1002/spe.4380230404>
+;; <http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.42.6421&rep=rep1&type=pdf>
 
 
 ;; A note on free variables:
@@ -1948,10 +1947,12 @@ use instead of point."
 The absolute date is the number of days elapsed since the (imaginary)
 Gregorian date Sunday, December 31, 1 BC.  This function does not
 handle dates in years BC."
-  ;; See the footnote on page 384 of ``Calendrical Calculations, Part II:
-  ;; Three Historical Calendars'' by E. M. Reingold,  N. Dershowitz, and S. M.
-  ;; Clamen, Software--Practice and Experience, Volume 23, Number 4
-  ;; (April, 1993), pages 383-404 for an explanation.
+  ;; For an explanation, see the footnote on page 384 of "Calendrical
+  ;; Calculations, Part II: Three Historical Calendars" by
+  ;; E. M. Reingold, N. Dershowitz, and S. M.  Clamen,
+  ;; Software--Practice and Experience, Volume 23, Number 4 (April,
+  ;; 1993), pages 383-404 <https://doi.org/10.1002/spe.4380230404>
+  ;; <http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.42.6421&rep=rep1&type=pdf>.
   (let* ((d0 (1- date))
          (n400 (/ d0 146097))
          (d1 (% d0 146097))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9ba1e105a1b..f31d1df3097 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -277,9 +277,10 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      ((eq system-type 'darwin)
                       (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
                           ;; See bug#7135.
-                          (let ((tmp (ignore-errors
-                                       (shell-command-to-string
-                                        "getconf DARWIN_USER_TEMP_DIR"))))
+                          (let* (file-name-handler-alist
+                                 (tmp (ignore-errors
+                                        (shell-command-to-string
+                                         "getconf DARWIN_USER_TEMP_DIR"))))
                             (and (stringp tmp)
                                  (setq tmp (replace-regexp-in-string
                                             "\n\\'" "" tmp))
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index b2ac8be53cc..93678bad7a6 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -318,7 +318,7 @@ definitions to shadow the loaded ones for use in file byte-compilation."
     (cons (nreverse decls) body)))
 
 (defun macroexp-progn (exps)
-  "Return an expression equivalent to `(progn ,@EXPS)."
+  "Return an expression equivalent to \\=`(progn ,@EXPS)."
   (if (cdr exps) `(progn ,@exps) (car exps)))
 
 (defun macroexp-unprogn (exp)
@@ -327,14 +327,14 @@ Never returns an empty list."
   (if (eq (car-safe exp) 'progn) (or (cdr exp) '(nil)) (list exp)))
 
 (defun macroexp-let* (bindings exp)
-  "Return an expression equivalent to `(let* ,bindings ,exp)."
+  "Return an expression equivalent to \\=`(let* ,bindings ,exp)."
   (cond
    ((null bindings) exp)
    ((eq 'let* (car-safe exp)) `(let* (,@bindings ,@(cadr exp)) ,@(cddr exp)))
    (t `(let* ,bindings ,exp))))
 
 (defun macroexp-if (test then else)
-  "Return an expression equivalent to `(if ,TEST ,THEN ,ELSE)."
+  "Return an expression equivalent to \\=`(if ,TEST ,THEN ,ELSE)."
   (cond
    ((eq (car-safe else) 'if)
     (cond
diff --git a/lisp/files.el b/lisp/files.el
index 6a13a9d71a6..83cba24336c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -436,8 +436,9 @@ and toggle it if ARG is `toggle'."
            auto-save-visited-interval :repeat
            #'save-some-buffers :no-prompt
            (lambda ()
-             (not (and buffer-auto-save-file-name
-                       auto-save-visited-file-name)))))))
+             (and buffer-file-name
+                  (not (and buffer-auto-save-file-name
+                            auto-save-visited-file-name))))))))
 
 ;; The 'set' part is so we don't get a warning for using this variable
 ;; above, while still catching code that _sets_ the variable to get
diff --git a/lisp/term.el b/lisp/term.el
index 91eab771cf0..d3a9ef30371 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1138,6 +1138,11 @@ Entry to this mode runs the hooks on `term-mode-hook'."
       (setq term-current-row nil)
       (setq term-current-column nil)
       (term-set-scroll-region 0 height)
+      ;; `term-set-scroll-region' causes these to be set, we have to
+      ;; clear them again since we're changing point (Bug#30544).
+      (setq term-start-line-column nil)
+      (setq term-current-row nil)
+      (setq term-current-column nil)
       (goto-char point))))
 
 ;; Recursive routine used to check if any string in term-kill-echo-list