Merge from origin/emacs-27

df04f3e755 Fix a rare segfault in syntax.c
fd1fe1e1ec Add doc to syntax-propertize-function saying it must do a ...
fcd599bbea Minor copyedits of doc of 'with-silent-modifications'
759399cdb1 Improve documentation of 'max-mini-window-height'
3223302aa2 Use modern constant names for the NS pasteboard
985703d380 Fix doc string of 'toggle-menu-bar-mode-from-frame'
184a4977c7 Make vc-bzr tests work with brz 3.1 (bug#43314)

# Conflicts:
#	lisp/emacs-lisp/syntax.el
#	src/syntax.c

3 files changed, 21 insertions, 16 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index f6a36c8fdcb..5e5d09f058b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8610,7 +8610,7 @@ not_in_argv (NSString *arg)
       while ( (file = [fenum nextObject]) )
         strings = Fcons ([file lispString], strings);
     }
-  else if ([type isEqualToString: NSURLPboardType])
+  else if ([type isEqualToString: NSPasteboardTypeURL])
     {
       NSURL *url = [NSURL URLFromPasteboard: pb];
       if (url == nil) return NO;
@@ -8619,8 +8619,8 @@ not_in_argv (NSString *arg)
 
       strings = list1 ([[url absoluteString] lispString]);
     }
-  else if ([type isEqualToString: NSStringPboardType]
-           || [type isEqualToString: NSTabularTextPboardType])
+  else if ([type isEqualToString: NSPasteboardTypeString]
+           || [type isEqualToString: NSPasteboardTypeTabularText])
     {
       NSString *data;
 
diff --git a/src/syntax.c b/src/syntax.c
index 7f0fc341f6e..e6af8a377bb 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2542,20 +2542,23 @@ between them, return t; otherwise return nil.  */)
               bool fence_found = 0;
               ptrdiff_t ini = from, ini_byte = from_byte;
 
-              while (1)
+              if (from > stop)
                 {
-                  dec_both (&from, &from_byte);
-                  UPDATE_SYNTAX_TABLE_BACKWARD (from);
-                  c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
-                  if (SYNTAX (c) == Scomment_fence
-                      && !char_quoted (from, from_byte))
+                  while (1)
                     {
-                      fence_found = 1;
-                      break;
+                      dec_both (&from, &from_byte);
+                      UPDATE_SYNTAX_TABLE_BACKWARD (from);
+                      c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
+                      if (SYNTAX (c) == Scomment_fence
+                          && !char_quoted (from, from_byte))
+                        {
+                          fence_found = 1;
+                          break;
+                        }
+                      else if (from == stop)
+                        break;
+                      rarely_quit (++quit_count);
                     }
-                  else if (from == stop)
-                    break;
-                  rarely_quit (++quit_count);
                 }
               if (fence_found == 0)
                 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 615f0ca7cf8..49225c56fe3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -35009,8 +35009,10 @@ but does not change the fact they are interpreted as raw bytes.  */);
 
   DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height,
     doc: /* Maximum height for resizing mini-windows (the minibuffer and the echo area).
-If a float, it specifies a fraction of the mini-window frame's height.
-If an integer, it specifies a number of lines.  */);
+If a float, it specifies the maximum height in units of the
+mini-window frame's height.
+If an integer, it specifies the maximum height in units of the
+mini-window frame's default font's height.  */);
   Vmax_mini_window_height = make_float (0.25);
 
   DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,