diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /src/eval.c | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index cb0518f34ec..3d0e82c2d9f 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -2048,7 +2048,7 @@ this does nothing and returns nil. */) | |||
| 2048 | We used to use 0 here, but that leads to accidental sharing in | 2048 | We used to use 0 here, but that leads to accidental sharing in |
| 2049 | purecopy's hash-consing, so we use a (hopefully) unique integer | 2049 | purecopy's hash-consing, so we use a (hopefully) unique integer |
| 2050 | instead. */ | 2050 | instead. */ |
| 2051 | docstring = make_number (XPNTR (function)); | 2051 | docstring = make_number (XUNTAG (function, Lisp_Symbol)); |
| 2052 | return Ffset (function, | 2052 | return Ffset (function, |
| 2053 | Fpurecopy (list5 (Qautoload, file, docstring, | 2053 | Fpurecopy (list5 (Qautoload, file, docstring, |
| 2054 | interactive, type))); | 2054 | interactive, type))); |