diff options
| author | Gerd Moellmann | 2000-10-26 11:59:45 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-10-26 11:59:45 +0000 |
| commit | 6c5b90af8664ac6b44c3e5ed1210ac175e0b8daf (patch) | |
| tree | b232a8dc657dfc40364756a4d5a13b7f3d054d5f /src | |
| parent | e9f63196af080c981ac9a45799273dd57b74ec3e (diff) | |
| download | emacs-6c5b90af8664ac6b44c3e5ed1210ac175e0b8daf.tar.gz emacs-6c5b90af8664ac6b44c3e5ed1210ac175e0b8daf.zip | |
(Fdelete_frame): Run delete-frame-hook.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a191eb5e6db..9ad8f78b389 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-10-26 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * frame.c (Fdelete_frame): Run delete-frame-hook. | ||
| 4 | |||
| 1 | 2000-10-26 Kenichi Handa <handa@etl.go.jp> | 5 | 2000-10-26 Kenichi Handa <handa@etl.go.jp> |
| 2 | 6 | ||
| 3 | * coding.c (decode_coding): Fix previous change (check also | 7 | * coding.c (decode_coding): Fix previous change (check also |
diff --git a/src/frame.c b/src/frame.c index 403261ed326..0233b171e24 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1169,6 +1169,14 @@ but if the second optional argument FORCE is non-nil, you may do so.") | |||
| 1169 | error ("Attempt to delete the only frame"); | 1169 | error ("Attempt to delete the only frame"); |
| 1170 | #endif | 1170 | #endif |
| 1171 | 1171 | ||
| 1172 | if (!NILP (Vrun_hooks)) | ||
| 1173 | { | ||
| 1174 | Lisp_Object args[2]; | ||
| 1175 | args[0] = intern ("delete-frame-hook"); | ||
| 1176 | args[1] = frame; | ||
| 1177 | Frun_hook_with_args (2, args); | ||
| 1178 | } | ||
| 1179 | |||
| 1172 | /* Does this frame have a minibuffer, and is it the surrogate | 1180 | /* Does this frame have a minibuffer, and is it the surrogate |
| 1173 | minibuffer for any other frame? */ | 1181 | minibuffer for any other frame? */ |
| 1174 | if (FRAME_HAS_MINIBUF_P (XFRAME (frame))) | 1182 | if (FRAME_HAS_MINIBUF_P (XFRAME (frame))) |