diff options
| author | Kenichi Handa | 2012-10-14 17:06:11 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-14 17:06:11 +0900 |
| commit | 9fe32d61c5655878f877522ac4bcc251d092f732 (patch) | |
| tree | 584f4c85fd2e44e8e7d597382f177359b737acb1 /src/eval.c | |
| parent | f5772b8eaee90d0b50a60bd55d9d28805a2543cb (diff) | |
| parent | 8111f5e6f05228e36496f3bdccad711f569acb9b (diff) | |
| download | emacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.gz emacs-9fe32d61c5655878f877522ac4bcc251d092f732.zip | |
merge trunk
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index 4d200fbc2bd..975204da017 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1876,9 +1876,11 @@ this does nothing and returns nil. */) | |||
| 1876 | CHECK_STRING (file); | 1876 | CHECK_STRING (file); |
| 1877 | 1877 | ||
| 1878 | /* If function is defined and not as an autoload, don't override. */ | 1878 | /* If function is defined and not as an autoload, don't override. */ |
| 1879 | if (!EQ (XSYMBOL (function)->function, Qunbound) | 1879 | if ((CONSP (XSYMBOL (function)->function) |
| 1880 | && !(CONSP (XSYMBOL (function)->function) | 1880 | && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) |
| 1881 | && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) | 1881 | /* Remember that the function was already an autoload. */ |
| 1882 | LOADHIST_ATTACH (Fcons (Qt, function)); | ||
| 1883 | else if (!EQ (XSYMBOL (function)->function, Qunbound)) | ||
| 1882 | return Qnil; | 1884 | return Qnil; |
| 1883 | 1885 | ||
| 1884 | if (NILP (Vpurify_flag)) | 1886 | if (NILP (Vpurify_flag)) |