From 07b7fb98e6f980bae3dd15375dc8603b7e9cb61c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 18 Dec 2017 11:39:17 -0500 Subject: * 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). --- test/lisp/emacs-lisp/derived-tests.el | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 test/lisp/emacs-lisp/derived-tests.el (limited to 'test/lisp/emacs-lisp') 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 -- cgit v1.2.3 From 936136ecab567a2ca320df080595a5fd2693b4c3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 18 Dec 2017 11:43:34 -0500 Subject: * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste leftovers --- test/lisp/emacs-lisp/derived-tests.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'test/lisp/emacs-lisp') diff --git a/test/lisp/emacs-lisp/derived-tests.el b/test/lisp/emacs-lisp/derived-tests.el index adea102a78e..8f650916946 100644 --- a/test/lisp/emacs-lisp/derived-tests.el +++ b/test/lisp/emacs-lisp/derived-tests.el @@ -1,4 +1,4 @@ -;;; gv-tests.el --- tests for gv.el -*- lexical-binding: t; -*- +;;; derived-tests.el --- tests for derived.el -*- lexical-binding: t; -*- ;; Copyright (C) 2017 Free Software Foundation, Inc. @@ -20,7 +20,6 @@ ;;; Code: (require 'ert) -(eval-when-compile (require 'cl-lib)) (define-derived-mode derived-tests--parent-mode prog-mode "P" :after-hook @@ -41,4 +40,4 @@ (derived-tests--child-mode) (should (equal (buffer-string) "PB CB MH AFP=S AFC=S "))))) -;;; gv-tests.el ends here +;;; derived-tests.el ends here -- cgit v1.2.3