aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2020-05-28 07:50:25 -0700
committerGlenn Morris2020-05-28 07:50:25 -0700
commitdc78327e32fb7496dca10e17189a4d1b7d4923f4 (patch)
tree63393826171effba54be37839174005650519fe6 /lib-src
parentae348f328643e55ea2d2e8fd42ff034d08855cae (diff)
parente7a3ed8a6dddb6e16c83d27a04dfa6ec8160e580 (diff)
downloademacs-dc78327e32fb7496dca10e17189a4d1b7d4923f4.tar.gz
emacs-dc78327e32fb7496dca10e17189a4d1b7d4923f4.zip
Merge from origin/emacs-27
e7a3ed8a6d Fix tab-bar-tab-name-ellipsis initialization 4737d0af75 Fix Elisp manual entry for format-spec 0195809bb6 Fix rare assertion violations in 'etags' cddb0079ff ; * lisp/format-spec.el (format-spec): Fix typo.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 4672e3491da..146cf612505 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1985,8 +1985,11 @@ pfnote (char *name, bool is_func, char *linestart, ptrdiff_t linelen,
1985{ 1985{
1986 register node *np; 1986 register node *np;
1987 1987
1988 assert (name == NULL || name[0] != '\0'); 1988 if ((CTAGS && name == NULL)
1989 if (CTAGS && name == NULL) 1989 /* We used to have an assertion here for the case below, but if we hit
1990 that case, it just means our parser got confused, and there's nothing
1991 to do about such empty "tags". */
1992 || (!CTAGS && name && name[0] == '\0'))
1990 return; 1993 return;
1991 1994
1992 np = xnew (1, node); 1995 np = xnew (1, node);