Merge from origin/emacs-26

e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles

15 files changed, 19 insertions, 16 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 9fdcaf86611..eb4d57a5fbb 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -564,7 +564,7 @@ define pgi
 end
 document pgi
 Pretty print glyph structure glyph[I].
-Takes one argument, a integer I.
+Takes one argument, an integer I.
 end
 
 define pgn
diff --git a/src/character.c b/src/character.c
index 4a934c7801c..6a689808043 100644
--- a/src/character.c
+++ b/src/character.c
@@ -983,7 +983,7 @@ alphabeticp (int c)
           || gen_cat == UNICODE_CATEGORY_Nl);
 }
 
-/* Return true if C is a alphabetic or decimal-number character.  */
+/* Return true if C is an alphabetic or decimal-number character.  */
 bool
 alphanumericp (int c)
 {
diff --git a/src/character.h b/src/character.h
index d9e2d7bfc67..1e420ba54cb 100644
--- a/src/character.h
+++ b/src/character.h
@@ -695,7 +695,7 @@ INLINE int
 char_table_translate (Lisp_Object obj, int ch)
 {
   /* This internal function is expected to be called with valid arguments,
-     so there is a eassert instead of CHECK_xxx for the sake of speed.  */
+     so there is an eassert instead of CHECK_xxx for the sake of speed.  */
   eassert (CHAR_VALID_P (ch));
   eassert (CHAR_TABLE_P (obj));
   obj = CHAR_TABLE_REF (obj, ch);
diff --git a/src/charset.c b/src/charset.c
index cc61300b6bd..05290e86b4e 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2332,7 +2332,7 @@ init_charset_once (void)
    Don't make the value so small that the table is reallocated during
    bootstrapping, as glibc malloc calls larger than just under 64 KiB
    during an initial bootstrap wreak havoc after dumping; see the
-   M_MMAP_THRESHOLD value in alloc.c, plus there is a extra overhead
+   M_MMAP_THRESHOLD value in alloc.c, plus there is an extra overhead
    internal to glibc malloc and perhaps to Emacs malloc debugging.  */
 static struct charset charset_table_init[180];
 
diff --git a/src/coding.c b/src/coding.c
index 901f806e44b..a16142a9b41 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -252,7 +252,7 @@ decode_coding_XXXX (struct coding_system *coding)
   CODING_RESULT_XXX indicating how the encoding finished.
 
   DST_BYTES zero means that source area and destination area are
-  overlapped, which means that we can produce a encoded text until it
+  overlapped, which means that we can produce an encoded text until it
   reaches at the head of not-yet-encoded source text.
 
   Below is a template of these functions.  */
@@ -3973,7 +3973,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
       /* Reset the invocation and designation status to the safest
          one; i.e. designate ASCII to the graphic register 0, and
          invoke that register to the graphic plane 0.  This typically
-         helps the case that an designation sequence for ASCII "ESC (
+         helps the case that a designation sequence for ASCII "ESC (
          B" is somehow broken (e.g. broken by a newline).  */
       CODING_ISO_INVOCATION (coding, 0) = 0;
       CODING_ISO_DESIGNATION (coding, 0) = charset_ascii;
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 63dda583529..ec3707d18f3 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1401,7 +1401,7 @@ usage: (dbus-message-internal &rest REST)  */)
 
       if ((mtype == DBUS_MESSAGE_TYPE_ERROR)
           && (!dbus_message_set_error_name (dmessage, DBUS_ERROR_FAILED)))
-        XD_SIGNAL1 (build_string ("Unable to create a error message"));
+        XD_SIGNAL1 (build_string ("Unable to create an error message"));
     }
 
   /* Check for timeout parameter.  */
diff --git a/src/eval.c b/src/eval.c
index 3c2b300096b..08a73b1e4a5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1604,7 +1604,10 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit)
 
   /* This hook is used by edebug.  */
   if (! NILP (Vsignal_hook_function)
-      && ! NILP (error_symbol))
+      && ! NILP (error_symbol)
+      /* Don't try to call a lisp function if we've already overflowed
+         the specpdl stack.  */
+      && specpdl_ptr < specpdl + specpdl_size)
     {
       /* Edebug takes care of restoring these variables when it exits.  */
       if (lisp_eval_depth + 20 > max_lisp_eval_depth)
diff --git a/src/image.c b/src/image.c
index 6e860834378..37416c16168 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8281,7 +8281,7 @@ extern WandExport void PixelGetMagickColor (const PixelWand *,
 #endif
 
 /* Log ImageMagick error message.
-   Useful when a ImageMagick function returns the status `MagickFalse'.  */
+   Useful when an ImageMagick function returns the status `MagickFalse'.  */
 
 static void
 imagemagick_error (MagickWand *wand)
diff --git a/src/inotify.c b/src/inotify.c
index 08da308c978..e06cc97c6a7 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -503,7 +503,7 @@ DEFUN ("inotify-watch-list", Finotify_watch_list, Sinotify_watch_list, 0, 0, 0,
 }
 
 DEFUN ("inotify-allocated-p", Finotify_allocated_p, Sinotify_allocated_p, 0, 0, 0,
-       doc: /* Return non-nil, if a inotify instance is allocated.  */)
+       doc: /* Return non-nil, if an inotify instance is allocated.  */)
 {
   return inotifyfd < 0 ? Qnil : Qt;
 }
diff --git a/src/keymap.c b/src/keymap.c
index 80a899b5755..c8cc933e782 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1278,7 +1278,7 @@ append_key (Lisp_Object key_sequence, Lisp_Object key)
   return CALLN (Fvconcat, key_sequence, key_list);
 }
 
-/* Given a event type C which is a symbol,
+/* Given an event type C which is a symbol,
    signal an error if is a mistake such as RET or M-RET or C-DEL, etc.  */
 
 static void
diff --git a/src/process.c b/src/process.c
index 496b1f2b70c..6ba27a33f4d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3733,7 +3733,7 @@ setting of the remote datagram address.  When specified for a client
 process, the FAMILY, HOST, and SERVICE args are ignored.
 
 The format of ADDRESS depends on the address family:
-- An IPv4 address is represented as an vector of integers [A B C D P]
+- An IPv4 address is represented as a vector of integers [A B C D P]
 corresponding to numeric IP address A.B.C.D and port number P.
 - A local address is represented as a string with the address in the
 local address space.
diff --git a/src/regex.c b/src/regex.c
index 122cf712422..a4e6441cce3 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -5787,7 +5787,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
             EXTRACT_NUMBER (mcnt, p2 - 2);
 
-            /* Ensure this is a indeed the trivial kind of loop
+            /* Ensure this is indeed the trivial kind of loop
                we are expecting.  */
             assert (skip_one_char (p1) == p2 - 3);
             assert ((re_opcode_t) p2[-3] == jump && p2 + mcnt == p);
diff --git a/src/syntax.c b/src/syntax.c
index 52cec23cd7e..20c607420c1 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3049,7 +3049,7 @@ Comments are ignored if `parse-sexp-ignore-comments' is non-nil.
 
 If we reach the beginning or end of the accessible part of the buffer
 before we have scanned over COUNT lists, return nil if the depth at
-that point is zero, and signal a error if the depth is nonzero.  */)
+that point is zero, and signal an error if the depth is nonzero.  */)
   (Lisp_Object from, Lisp_Object count, Lisp_Object depth)
 {
   CHECK_NUMBER (from);
diff --git a/src/xdisp.c b/src/xdisp.c
index f6fcdec6624..14286447d13 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -32499,7 +32499,7 @@ or `nobreak-hyphen' face respectively.
 U+00A0 (no-break space), U+00AD (soft hyphen), U+2010 (hyphen), and
 U+2011 (non-breaking hyphen) are affected.
 
-Any other non-nil value means to display these characters as a escape
+Any other non-nil value means to display these characters as an escape
 glyph followed by an ordinary space or hyphen.
 
 A value of nil means no special handling of these characters.  */);
diff --git a/src/xsettings.c b/src/xsettings.c
index ac2d86f5922..81c8f9b2919 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -53,7 +53,7 @@ static char *current_font;
 static struct x_display_info *first_dpyinfo;
 static Lisp_Object current_tool_bar_style;
 
-/* Store an config changed event in to the event queue.  */
+/* Store a config changed event in to the event queue.  */
 
 static void
 store_config_changed_event (Lisp_Object arg, Lisp_Object display_name)