Merge pull request #792 from Wilfred/rollup

Merge upstream GNU Emacs master branch

doc/lispref/strings.texi

@@ -826,7 +826,6 @@ to the produced string representations of the argument @var{objects}.
 @defun format-message string &rest objects
 @cindex curved quotes, in formatted messages
 @cindex curly quotes, in formatted messages
-@cindex @code{text-quoting-style}, and formatting messages
 This function acts like @code{format}, except it also converts any
 grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the
 value of @code{text-quoting-style}.

etc/NEWS

@@ -1220,12 +1220,6 @@ calling 'eldoc-message' directly.
 ** The FILENAME argument to 'file-name-base' is now mandatory and no
 longer defaults to 'buffer-file-name'.
 
----
-** 'eldoc-message' only accepts one argument now.  Programs that
-called it with multiple arguments before should pass them through
-'format' first.  Even that is discouraged: for ElDoc support, you
-should set 'eldoc-documentation-function' instead of calling
-'eldoc-message' directly.
 
 * Lisp Changes in Emacs 26.1
 

lisp/simple.el

@@ -53,8 +53,8 @@ restores the buffer position before the command."
   :version "26.1")
 
 (defvar shell-command-saved-pos nil
-  "Point position in the output buffer after command completes.
-It is an alist of (BUFFER . POS), where BUFFER is the output
+  "Position of point in the output buffer after command completes.
+It is a cons cell of the form (BUFFER . POS), where BUFFER is the output
 buffer, and POS is the point position in BUFFER once the command finishes.
 This variable is used when `shell-command-dont-erase-buffer' is non-nil.")
 
@@ -1003,7 +1003,7 @@ Called with one argument METHOD.
 If METHOD is `delete-only', then delete the region; the return value
 is undefined.  If METHOD is nil, then return the content as a string.
 If METHOD is `bounds', then return the boundaries of the region
-as a list of pairs of (START . END) positions.
+as a cons cell of the form (START . END).
 If METHOD is anything else, delete the region and return its content
 as a string, after filtering it with `filter-buffer-substring', which
 is called with METHOD as its 3rd argument.")
@@ -5473,7 +5473,8 @@ also checks the value of `use-empty-active-region'."
        (progn (cl-assert (mark)) t)))
 
 (defun region-bounds ()
-  "Return the boundaries of the region as a list of pairs of (START . END) positions."
+  "Return the boundaries of the region as a pair of positions.
+Value is a cons cell of the form (START . END)."
   (funcall region-extract-function 'bounds))
 
 (defun region-noncontiguous-p ()

lisp/term/ns-win.el

@@ -741,18 +741,20 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
 ;; FIXME: This doesn't look right.  Is there a better way to do this
 ;; that keeps customize happy?
-(let ((appkit-version (progn
-                        (string-match "^appkit-\\([^\s-]*\\)" ns-version-string)
-                        (string-to-number (match-string 1 ns-version-string)))))
-  ;; Appkit 1138 ~= macOS 10.7.
-  (when (and (featurep 'cocoa) (>= appkit-version 1138))
-    (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control))))
-    (put 'mouse-wheel-scroll-amount 'customized-value
-         (list (custom-quote (symbol-value 'mouse-wheel-scroll-amount))))
-
-    (setq mouse-wheel-progressive-speed nil)
-    (put 'mouse-wheel-progressive-speed 'customized-value
-         (list (custom-quote (symbol-value 'mouse-wheel-progressive-speed))))))
+(when (featurep 'cocoa)
+  (let ((appkit-version
+         (progn (string-match "^appkit-\\([^\s-]*\\)" ns-version-string)
+                (string-to-number (match-string 1 ns-version-string)))))
+    ;; Appkit 1138 ~= macOS 10.7.
+    (when (>= appkit-version 1138)
+      (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control))))
+      (put 'mouse-wheel-scroll-amount 'customized-value
+           (list (custom-quote (symbol-value 'mouse-wheel-scroll-amount))))
+
+      (setq mouse-wheel-progressive-speed nil)
+      (put 'mouse-wheel-progressive-speed 'customized-value
+           (list (custom-quote
+                  (symbol-value 'mouse-wheel-progressive-speed)))))))
 
 
 ;;;; Color support.

m4/sys_types_h.m4

@@ -40,7 +40,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
 m4_version_prereq([2.70], [], [
 
 # This is taken from the following Autoconf patch:
-# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
+# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974
 
 m4_undefine([AC_HEADER_MAJOR])
 AC_DEFUN([AC_HEADER_MAJOR],

src/editfns.c

@@ -75,11 +75,6 @@ static long int tm_gmtoff (struct tm *);
 static int tm_diff (struct tm *, struct tm *);
 static void update_buffer_properties (ptrdiff_t, ptrdiff_t);
 
-void
-find_field (Lisp_Object pos, Lisp_Object merge_at_boundary,
-	    Lisp_Object beg_limit,
-	    ptrdiff_t *beg, Lisp_Object end_limit, ptrdiff_t *end);
-
 #ifndef HAVE_TM_GMTOFF
 # define HAVE_TM_GMTOFF false
 #endif

src/frame.c

@@ -2421,7 +2421,7 @@ for how to proceed.  */)
 {
   struct frame *f = decode_live_frame (frame);
 #ifdef HAVE_WINDOW_SYSTEM
- Lisp_Object parent = f->parent_frame;
+  Lisp_Object parent = f->parent_frame;
 
   if (!NILP (parent))
     {

src/gtkutil.c

@@ -577,6 +577,10 @@ xg_check_special_colors (struct frame *f,
     if (get_fg)
       gtk_style_context_get_color (gsty, state, &col);
     else
+      /* FIXME: gtk_style_context_get_background_color is deprecated
+         in GTK+ 3.16.  New versions of GTK+ don’t use the concept of
+         a single background color any more, so we shouldn’t query for
+         it.  */
       gtk_style_context_get_background_color (gsty, state, &col);
 
     unsigned short