diff options
| author | Eli Zaretskii | 2012-10-12 11:45:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-12 11:45:45 +0200 |
| commit | 0dc9ee4adad0b566c32036a4c201a1de882ac65b (patch) | |
| tree | a61f585563633f0f38838012771dae63a3cef098 /src/eval.c | |
| parent | 182b170f7ec712b7f89ada65095aae5bb8fe553e (diff) | |
| parent | 81749a2374c78d656888b462f3b29301e4cbd1c7 (diff) | |
| download | emacs-0dc9ee4adad0b566c32036a4c201a1de882ac65b.tar.gz emacs-0dc9ee4adad0b566c32036a4c201a1de882ac65b.zip | |
Merge from 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)) |