diff options
| author | Glenn Morris | 2013-01-02 16:50:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-02 16:50:35 -0800 |
| commit | ed5bdeb9687d7942f9b1ec8fefe906f004c50055 (patch) | |
| tree | deab13fd0ae3bc20cc9eb5e684b972d83d6cfefc | |
| parent | ad235a8b88e353d6e51dafc62d020d8ff647857f (diff) | |
| download | emacs-ed5bdeb9687d7942f9b1ec8fefe906f004c50055.tar.gz emacs-ed5bdeb9687d7942f9b1ec8fefe906f004c50055.zip | |
eval-after-load fix
* lisp/subr.el (eval-after-load): Don't purecopy the form, so that it
can be nconc'd later on; reverts 2009-11-11 change.
Fixes: debbugs:13331
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b92be63916..04ba7f802ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> | 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * subr.el (eval-after-load): Don't purecopy the form, so that it | ||
| 4 | can be nconc'd later on; reverts 2009-11-11 change. (Bug#13331) | ||
| 5 | |||
| 3 | * emacs-lisp/byte-run.el (defun): Place cl declarations | 6 | * emacs-lisp/byte-run.el (defun): Place cl declarations |
| 4 | after any interactive spec. (Bug#13265) | 7 | after any interactive spec. (Bug#13265) |
| 5 | 8 | ||
diff --git a/lisp/subr.el b/lisp/subr.el index ce7b74db4ce..eef8c46c7d6 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1877,7 +1877,7 @@ This function makes or adds to an entry on `after-load-alist'." | |||
| 1877 | ,form))) | 1877 | ,form))) |
| 1878 | ;; Add FORM to the element unless it's already there. | 1878 | ;; Add FORM to the element unless it's already there. |
| 1879 | (unless (member form (cdr elt)) | 1879 | (unless (member form (cdr elt)) |
| 1880 | (nconc elt (purecopy (list form))))))) | 1880 | (nconc elt (list form)))))) |
| 1881 | 1881 | ||
| 1882 | (defvar after-load-functions nil | 1882 | (defvar after-load-functions nil |
| 1883 | "Special hook run after loading a file. | 1883 | "Special hook run after loading a file. |