From 07b7fb98e6f980bae3dd15375dc8603b7e9cb61c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 18 Dec 2017 11:39:17 -0500 Subject: [PATCH] * lisp/subr.el (delayed-after-hook-functions): Rename from ...-forms (run-mode-hooks): `funcall` the functions instead of `eval`ing the forms. * lisp/emacs-lisp/derived.el (define-derived-mode): Push functions rather than forms (bug#29679). --- lisp/emacs-lisp/derived.el | 2 +- lisp/subr.el | 12 ++++---- test/lisp/emacs-lisp/derived-tests.el | 44 +++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 test/lisp/emacs-lisp/derived-tests.el 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. diff --git a/lisp/subr.el b/lisp/subr.el index 6db3b614d6d..64521711b7a 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1844,10 +1844,10 @@ if it is empty or a duplicate." (make-variable-buffer-local 'delayed-mode-hooks) (put 'delay-mode-hooks 'permanent-local t) -(defvar delayed-after-hook-forms nil +(defvar delayed-after-hook-functions nil "List of delayed :after-hook forms waiting to be run. These forms come from `define-derived-mode'.") -(make-variable-buffer-local 'delayed-after-hook-forms) +(make-variable-buffer-local 'delayed-after-hook-functions) (defvar change-major-mode-after-body-hook nil "Normal hook run in major mode functions, before the mode hooks.") @@ -1865,7 +1865,7 @@ just adds the HOOKS to the list `delayed-mode-hooks'. Otherwise, runs hooks in the sequence: `change-major-mode-after-body-hook', `delayed-mode-hooks' (in reverse order), HOOKS, then runs `hack-local-variables', runs the hook `after-change-major-mode-hook', and -finally evaluates the forms in `delayed-after-hook-forms' (see +finally evaluates the functions in `delayed-after-hook-functions' (see `define-derived-mode'). Major mode functions should use this instead of `run-hooks' when @@ -1882,9 +1882,9 @@ running their FOO-mode-hook." (with-demoted-errors "File local-variables error: %s" (hack-local-variables 'no-mode))) (run-hooks 'after-change-major-mode-hook) - (dolist (form (nreverse delayed-after-hook-forms)) - (eval form)) - (setq delayed-after-hook-forms nil))) + (dolist (fun (nreverse delayed-after-hook-functions)) + (funcall fun)) + (setq delayed-after-hook-functions nil))) (defmacro delay-mode-hooks (&rest body) "Execute BODY, but delay any `run-mode-hooks'. diff --git a/test/lisp/emacs-lisp/derived-tests.el b/test/lisp/emacs-lisp/derived-tests.el new file mode 100644 index 00000000000..adea102a78e --- /dev/null +++ b/test/lisp/emacs-lisp/derived-tests.el @@ -0,0 +1,44 @@ +;;; gv-tests.el --- tests for gv.el -*- lexical-binding: t; -*- + +;; Copyright (C) 2017 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Code: + +(require 'ert) +(eval-when-compile (require 'cl-lib)) + +(define-derived-mode derived-tests--parent-mode prog-mode "P" + :after-hook + (let ((f (let ((x "S")) (lambda () x)))) + (insert (format "AFP=%s " (let ((x "D")) (funcall f))))) + (insert "PB ")) + +(define-derived-mode derived-tests--child-mode derived-tests--parent-mode "C" + :after-hook + (let ((f (let ((x "S")) (lambda () x)))) + (insert (format "AFC=%s " (let ((x "D")) (funcall f))))) + (insert "CB ")) + +(ert-deftest derived-tests-after-hook-lexical () + (with-temp-buffer + (let ((derived-tests--child-mode-hook + (lambda () (insert "MH ")))) + (derived-tests--child-mode) + (should (equal (buffer-string) "PB CB MH AFP=S AFC=S "))))) + +;;; gv-tests.el ends here -- 2.39.2