Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

7 files changed, 66 insertions, 50 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 34a65edd008..6114a6f7857 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -294,15 +294,31 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
     }
 }
 
-DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",
+DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 3,
+       "(list (region-beginning) (region-end) (region-noncontiguous-p))",
        doc: /* Convert the region to upper case.  In programs, wants two arguments.
 These arguments specify the starting and ending character numbers of
 the region to operate on.  When used as a command, the text between
 point and the mark is operated on.
 See also `capitalize-region'.  */)
-  (Lisp_Object beg, Lisp_Object end)
+  (Lisp_Object beg, Lisp_Object end, Lisp_Object region_noncontiguous_p)
 {
-  casify_region (CASE_UP, beg, end);
+  Lisp_Object bounds = Qnil;
+
+  if (!NILP (region_noncontiguous_p))
+    {
+      bounds = call1 (Fsymbol_value (intern ("region-extract-function")),
+                      intern ("bounds"));
+
+      while (CONSP (bounds))
+        {
+          casify_region (CASE_UP, XCAR (XCAR (bounds)), XCDR (XCAR (bounds)));
+          bounds = XCDR (bounds);
+        }
+    }
+  else
+    casify_region (CASE_UP, beg, end);
+
   return Qnil;
 }
 
diff --git a/src/conf_post.h b/src/conf_post.h
index bea2a8a587f..762aa7727fd 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -64,6 +64,15 @@ typedef bool bool_bf;
     (4 < __GNUC__ + (8 <= __GNUC_MINOR__))
 #endif
 
+/* Simulate __has_builtin on compilers that lack it.  It is used only
+   on arguments like __builtin_assume_aligned that are handled in this
+   simulation.  */
+#ifndef __has_builtin
+# define __has_builtin(a) __has_builtin_##a
+# define __has_builtin___builtin_assume_aligned \
+    (4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+#endif
+
 /* Simulate __has_feature on compilers that lack it.  It is used only
    to define ADDRESS_SANITIZER below.  */
 #ifndef __has_feature
@@ -77,6 +86,11 @@ typedef bool bool_bf;
 # define ADDRESS_SANITIZER false
 #endif
 
+/* Yield PTR, which must be aligned to ALIGNMENT.  */
+#if ! __has_builtin (__builtin_assume_aligned)
+# define __builtin_assume_aligned(ptr, alignment, ...) ((void *) (ptr))
+#endif
+
 #ifdef DARWIN_OS
 #ifdef emacs
 #define malloc unexec_malloc
diff --git a/src/fileio.c b/src/fileio.c
index 9da0bf0234b..5615639a5e1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5387,14 +5387,8 @@ auto_save_error (Lisp_Object error_val)
   msg = CALLN (Fformat, format, BVAR (current_buffer, name),
                Ferror_message_string (error_val));
 
-  for (i = 0; i < 3; ++i)
-    {
-      if (i == 0)
-        message3 (msg);
-      else
-        message3_nolog (msg);
-      Fsleep_for (make_number (1), Qnil);
-    }
+  call3 (intern ("display-warning"),
+         intern ("auto-save"), msg, intern ("error"));
 
   return Qnil;
 }
diff --git a/src/lisp.h b/src/lisp.h
index 1fc6130be0b..4042f4decb1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -341,7 +341,9 @@ error !;
      (struct Lisp_Symbol *) ((intptr_t) XLI (a) - Lisp_Symbol \
                              + (char *) lispsym))
 # define lisp_h_XTYPE(a) ((enum Lisp_Type) (XLI (a) & ~VALMASK))
-# define lisp_h_XUNTAG(a, type) ((void *) (intptr_t) (XLI (a) - (type)))
+# define lisp_h_XUNTAG(a, type) \
+    __builtin_assume_aligned ((void *) (intptr_t) (XLI (a) - (type)), \
+                              GCALIGNMENT)
 #endif
 
 /* When compiling via gcc -O0, define the key operations as macros, as
diff --git a/src/nsfns.m b/src/nsfns.m
index ea099081a7f..9bc6c1d3418 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3125,7 +3125,7 @@ Example: Install an icon Gnus.tiff and execute the following code
 
   (setq ns-icon-type-alist
         (append ns-icon-type-alist
-                '((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary \\\\|Article\\\\*$\\\\)\"
+                \\='((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary \\\\|Article\\\\*$\\\\)\"
                    . \"Gnus\"))))
 
 When you miniaturize a Group, Summary or Article frame, Gnus.tiff will
diff --git a/src/search.c b/src/search.c
index f39df6784c3..7cb18a2059a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2691,7 +2691,8 @@ since only regular expressions have distinguished subexpressions.  */)
 
   if (case_action == all_caps)
     Fupcase_region (make_number (search_regs.start[sub]),
-                    make_number (newpoint));
+                    make_number (newpoint),
+                    Qnil);
   else if (case_action == cap_initial)
     Fupcase_initials_region (make_number (search_regs.start[sub]),
                              make_number (newpoint));
diff --git a/src/syntax.c b/src/syntax.c
index 1c3f644aec5..78c7de9c65b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2182,63 +2182,51 @@ skip_syntaxes (bool forwardp, Lisp_Object string, Lisp_Object lim)
     ptrdiff_t start_point = PT;
     ptrdiff_t pos = PT;
     ptrdiff_t pos_byte = PT_BYTE;
-    unsigned char *p = PT_ADDR, *endp, *stop;
-
-    if (forwardp)
-      {
-        endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
-        stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp;
-      }
-    else
-      {
-        endp = CHAR_POS_ADDR (XINT (lim));
-        stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp;
-      }
+    unsigned char *p, *endp, *stop;
 
     immediate_quit = 1;
     SETUP_SYNTAX_TABLE (pos, forwardp ? 1 : -1);
+
     if (forwardp)
       {
-        if (multibyte)
+        while (true)
           {
-            while (1)
+            p = BYTE_POS_ADDR (pos_byte);
+            endp = XINT (lim) == GPT ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
+            stop = pos < GPT && GPT < XINT (lim) ? GPT_ADDR : endp;
+
+            do
               {
                 int nbytes;
 
                 if (p >= stop)
                   {
                     if (p >= endp)
-                      break;
+                      goto done;
                     p = GAP_END_ADDR;
                     stop = endp;
                   }
-                c = STRING_CHAR_AND_LENGTH (p, nbytes);
+                if (multibyte)
+                  c = STRING_CHAR_AND_LENGTH (p, nbytes);
+                else
+                  c = *p, nbytes = 1;
                 if (! fastmap[SYNTAX (c)])
-                  break;
+                  goto done;
                 p += nbytes, pos++, pos_byte += nbytes;
-                UPDATE_SYNTAX_TABLE_FORWARD (pos);
-              }
-          }
-        else
-          {
-            while (1)
-              {
-                if (p >= stop)
-                  {
-                    if (p >= endp)
-                      break;
-                    p = GAP_END_ADDR;
-                    stop = endp;
-                  }
-                if (! fastmap[SYNTAX (*p)])
-                  break;
-                p++, pos++, pos_byte++;
-                UPDATE_SYNTAX_TABLE_FORWARD (pos);
               }
+            while (!parse_sexp_lookup_properties
+                   || pos < gl_state.e_property);
+
+            update_syntax_table_forward (pos + gl_state.offset,
+                                         false, gl_state.object);
           }
       }
     else
       {
+        p = BYTE_POS_ADDR (pos_byte);
+        endp = CHAR_POS_ADDR (XINT (lim));
+        stop = pos >= GPT && GPT > XINT (lim) ? GAP_END_ADDR : endp;
+
         if (multibyte)
           {
             while (1)
@@ -2280,6 +2268,7 @@ skip_syntaxes (bool forwardp, Lisp_Object string, Lisp_Object lim)
           }
       }
 
+  done:
     SET_PT_BOTH (pos, pos_byte);
     immediate_quit = 0;
 
@@ -3109,7 +3098,7 @@ but before count is used up, nil is returned.  */)
 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars,
        0, 0, 0,
        doc: /* Move point backward over any number of chars with prefix syntax.
-This includes chars with expression prefix syntax class (') and those with
+This includes chars with expression prefix syntax class (\\=') and those with
 the prefix syntax flag (p).  */)
   (void)
 {