aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2017-10-20 22:45:36 -0700
committerPaul Eggert2017-10-20 22:45:36 -0700
commitf400c7b69714c91a714ff0ab5b9f16708daf49b9 (patch)
tree4a6549c67213696481b659654cac312f204f9479 /src
parent8cedc552463358509dd785f54e58bfaf8099de62 (diff)
parent868eb74f910eb67a5e74ebb1867ebcfbfced55c4 (diff)
downloademacs-f400c7b69714c91a714ff0ab5b9f16708daf49b9.tar.gz
emacs-f400c7b69714c91a714ff0ab5b9f16708daf49b9.zip
Merge from origin/emacs-26
868eb74f91 Simplify make-progress-reporter vs float-time 83db9a1bba Fix two more minor Gnus typos e655946ce0 Fix two minor Gnus typos 6a00914d6d Tweak Fdocumentation's error for an undefined function 7c63655e39 Tweak format of list of old files in NEWS header # Conflicts: # etc/NEWS
Diffstat (limited to 'src')
-rw-r--r--src/doc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/doc.c b/src/doc.c
index 3286c12675a..e81740bfc1c 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -336,6 +336,8 @@ string is passed through `substitute-command-keys'. */)
336 } 336 }
337 337
338 fun = Findirect_function (function, Qnil); 338 fun = Findirect_function (function, Qnil);
339 if (NILP (fun))
340 xsignal1 (Qvoid_function, function);
339 if (CONSP (fun) && EQ (XCAR (fun), Qmacro)) 341 if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
340 fun = XCDR (fun); 342 fun = XCDR (fun);
341 if (SUBRP (fun)) 343 if (SUBRP (fun))