diff options
author | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:14:19 -0500 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:14:19 -0500 |
commit | b5f140166ab9057b9e9dd56fd332e6b2937388c4 (patch) | |
tree | aba8c8cc99db410ccec64d1fab7c55d2ed43b6f8 /lisp/emacs-lisp | |
parent | 5bf3ab291c90b4976e70694982db55dad3fa84cd (diff) | |
parent | 4122d54067c61bbdff5aab7ddf5dfe5b5797b218 (diff) | |
download | emacs-b5f140166ab9057b9e9dd56fd332e6b2937388c4.tar.gz emacs-b5f140166ab9057b9e9dd56fd332e6b2937388c4.tar.bz2 emacs-b5f140166ab9057b9e9dd56fd332e6b2937388c4.zip |
Merge from origin/emacs-26
4122d54 Fix updating scrollbar sizes when scaling is in effect
21a212f Collect GnuTLS extensions and use them to set %DUMBFW if supp...
936136e * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste lefto...
07b7fb9 * lisp/subr.el (delayed-after-hook-functions): Rename from .....
a5b0a4e * lisp/net/shr.el (shr-string-pixel-width): Return pixel-widt...
c51e797 python.el doc fixes
c62ced5 Make 'mouse-drag-and-drop-region' more robust and customizable
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/derived.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 751291afa88..c0ef199424b 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -285,7 +285,7 @@ No problems result if this variable is not bound. (run-mode-hooks ',hook) ,@(when after-hook `((if delay-mode-hooks - (push ',after-hook delayed-after-hook-forms) + (push (lambda () ,after-hook) delayed-after-hook-functions) ,after-hook))))))) ;; PUBLIC: find the ultimate class of a derived mode. |