aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-08-05 15:45:12 +0800
committerChong Yidong2012-08-05 15:45:12 +0800
commite5d9c0d111daaff5d1a6ca26ebde4f926da5e410 (patch)
tree65465ddeb2c2e7e1d025520eefa91722fd411114
parenta4f2deaaeba642460b7a0899aa61f7d68e1c69f2 (diff)
downloademacs-e5d9c0d111daaff5d1a6ca26ebde4f926da5e410.tar.gz
emacs-e5d9c0d111daaff5d1a6ca26ebde4f926da5e410.zip
Docfix for kill-buffer-hook and others.
* lisp/files.el (kill-buffer-hook): Provide a defvar. * src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): * src/frame.c (Vdelete_frame_functions): * src/emacs.c (Vkill_emacs_hook): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el6
-rw-r--r--src/ChangeLog6
-rw-r--r--src/emacs.c2
-rw-r--r--src/frame.c2
-rw-r--r--src/term.c4
6 files changed, 19 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e9da4fa8ff..71d7b50482c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-08-05 Chong Yidong <cyd@gnu.org>
2
3 * files.el (kill-buffer-hook): Provide a defvar.
4
12012-08-05 Glenn Morris <rgm@gnu.org> 52012-08-05 Glenn Morris <rgm@gnu.org>
2 6
3 * eshell/esh-ext.el (eshell/addpath): 7 * eshell/esh-ext.el (eshell/addpath):
diff --git a/lisp/files.el b/lisp/files.el
index 2b4ae460c3e..b54d3d1b60e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1514,7 +1514,11 @@ expand wildcards (if any) and replace the file with multiple files."
1514 (other-window 1) 1514 (other-window 1)
1515 (find-alternate-file filename wildcards)))) 1515 (find-alternate-file filename wildcards))))
1516 1516
1517(defvar kill-buffer-hook) ; from buffer.c 1517;; Defined and used in buffer.c, but not as a DEFVAR_LISP.
1518(defvar kill-buffer-hook nil
1519 "Hook run when a buffer is killed.
1520The buffer being killed is current while the hook is running.
1521See `kill-buffer'.")
1518 1522
1519(defun find-alternate-file (filename &optional wildcards) 1523(defun find-alternate-file (filename &optional wildcards)
1520 "Find file FILENAME, select its buffer, kill previous buffer. 1524 "Find file FILENAME, select its buffer, kill previous buffer.
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b60dd07e73..8d13944b633 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-08-05 Chong Yidong <cyd@gnu.org>
2
3 * term.c (Vsuspend_tty_functions, Vresume_tty_functions):
4 * frame.c (Vdelete_frame_functions):
5 * emacs.c (Vkill_emacs_hook): Doc fix.
6
12012-08-04 Eli Zaretskii <eliz@gnu.org> 72012-08-04 Eli Zaretskii <eliz@gnu.org>
2 8
3 * xfns.c (x_set_menu_bar_lines): Fix compilation error in 9 * xfns.c (x_set_menu_bar_lines): Fix compilation error in
diff --git a/src/emacs.c b/src/emacs.c
index c99ed7c4b07..223d125db32 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2424,7 +2424,7 @@ Emacs is running. */);
2424 doc: /* Non-nil means Emacs is running without interactive terminal. */); 2424 doc: /* Non-nil means Emacs is running without interactive terminal. */);
2425 2425
2426 DEFVAR_LISP ("kill-emacs-hook", Vkill_emacs_hook, 2426 DEFVAR_LISP ("kill-emacs-hook", Vkill_emacs_hook,
2427 doc: /* Hook to be run when `kill-emacs' is called. 2427 doc: /* Hook run when `kill-emacs' is called.
2428Since `kill-emacs' may be invoked when the terminal is disconnected (or 2428Since `kill-emacs' may be invoked when the terminal is disconnected (or
2429in other similar situations), functions placed on this hook should not 2429in other similar situations), functions placed on this hook should not
2430expect to be able to interact with the user. To ask for confirmation, 2430expect to be able to interact with the user. To ask for confirmation,
diff --git a/src/frame.c b/src/frame.c
index e43352d4e24..308179e206f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4351,7 +4351,7 @@ The pointer becomes visible again when the mouse is moved. */);
4351 Vmake_pointer_invisible = Qt; 4351 Vmake_pointer_invisible = Qt;
4352 4352
4353 DEFVAR_LISP ("delete-frame-functions", Vdelete_frame_functions, 4353 DEFVAR_LISP ("delete-frame-functions", Vdelete_frame_functions,
4354 doc: /* Functions to be run before deleting a frame. 4354 doc: /* Functions run before deleting a frame.
4355The functions are run with one arg, the frame to be deleted. 4355The functions are run with one arg, the frame to be deleted.
4356See `delete-frame'. 4356See `delete-frame'.
4357 4357
diff --git a/src/term.c b/src/term.c
index 803bb6458b6..64bc88a7cf0 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3571,14 +3571,14 @@ This variable can be used by terminal emulator packages. */);
3571#endif 3571#endif
3572 3572
3573 DEFVAR_LISP ("suspend-tty-functions", Vsuspend_tty_functions, 3573 DEFVAR_LISP ("suspend-tty-functions", Vsuspend_tty_functions,
3574 doc: /* Functions to be run after suspending a tty. 3574 doc: /* Functions run after suspending a tty.
3575The functions are run with one argument, the terminal object to be suspended. 3575The functions are run with one argument, the terminal object to be suspended.
3576See `suspend-tty'. */); 3576See `suspend-tty'. */);
3577 Vsuspend_tty_functions = Qnil; 3577 Vsuspend_tty_functions = Qnil;
3578 3578
3579 3579
3580 DEFVAR_LISP ("resume-tty-functions", Vresume_tty_functions, 3580 DEFVAR_LISP ("resume-tty-functions", Vresume_tty_functions,
3581 doc: /* Functions to be run after resuming a tty. 3581 doc: /* Functions run after resuming a tty.
3582The functions are run with one argument, the terminal object that was revived. 3582The functions are run with one argument, the terminal object that was revived.
3583See `resume-tty'. */); 3583See `resume-tty'. */);
3584 Vresume_tty_functions = Qnil; 3584 Vresume_tty_functions = Qnil;