diff options
| author | Miles Bader | 2004-10-22 10:13:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-10-22 10:13:52 +0000 |
| commit | 5ea24f9468ea9fb01253a98343a67fdb74d1817e (patch) | |
| tree | 434ee6dc5f051d6deaf0c357b97b656d16e4ed12 /lisp/server.el | |
| parent | 56c68b971d6f7665dd035df1ff302d794c0f294a (diff) | |
| parent | d5ddd795bdab373fe62ccfd099c270fd97da0964 (diff) | |
| download | emacs-5ea24f9468ea9fb01253a98343a67fdb74d1817e.tar.gz emacs-5ea24f9468ea9fb01253a98343a67fdb74d1817e.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
Update from CVS: Add lisp/legacy-gnus-agent.el
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
Update from CVS
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el index 3a330f07a3c..534ba9fa09e 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -631,6 +631,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." | |||
| 631 | (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) | 631 | (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) |
| 632 | (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) | 632 | (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
| 633 | (remove-hook 'kill-buffer-hook 'server-kill-buffer)) | 633 | (remove-hook 'kill-buffer-hook 'server-kill-buffer)) |
| 634 | |||
| 635 | (add-hook 'server-unload-hook 'server-unload-hook) | ||
| 634 | 636 | ||
| 635 | (provide 'server) | 637 | (provide 'server) |
| 636 | 638 | ||