diff options
| author | Paul Eggert | 2011-06-10 11:19:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-10 11:19:35 -0700 |
| commit | e41e9a0e24877b0bc81e08df396f59115f8636da (patch) | |
| tree | c0cf7e2838761b2c26047aeeac6415bb542bf5a0 /src/buffer.c | |
| parent | 6a54b501af0633c909c96de867c805222fde970c (diff) | |
| parent | 529a133c390049085db38e7c8f745d650a2626ee (diff) | |
| download | emacs-e41e9a0e24877b0bc81e08df396f59115f8636da.tar.gz emacs-e41e9a0e24877b0bc81e08df396f59115f8636da.zip | |
Merge from trunk.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 8fdd094a20d..0c4cdb544a5 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1938,6 +1938,8 @@ DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |||
| 1938 | return Qnil; | 1938 | return Qnil; |
| 1939 | } | 1939 | } |
| 1940 | 1940 | ||
| 1941 | extern Lisp_Object Qdelete_window; | ||
| 1942 | |||
| 1941 | DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | 1943 | DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", |
| 1942 | doc: /* Put BUFFER-OR-NAME at the end of the list of all buffers. | 1944 | doc: /* Put BUFFER-OR-NAME at the end of the list of all buffers. |
| 1943 | There it is the least likely candidate for `other-buffer' to return; | 1945 | There it is the least likely candidate for `other-buffer' to return; |
| @@ -1969,7 +1971,7 @@ its frame, iconify that frame. */) | |||
| 1969 | else if (NILP (XWINDOW (selected_window)->parent)) | 1971 | else if (NILP (XWINDOW (selected_window)->parent)) |
| 1970 | Ficonify_frame (Fwindow_frame (selected_window)); | 1972 | Ficonify_frame (Fwindow_frame (selected_window)); |
| 1971 | else | 1973 | else |
| 1972 | Fdelete_window (selected_window); | 1974 | call1 (Qdelete_window, selected_window); |
| 1973 | } | 1975 | } |
| 1974 | } | 1976 | } |
| 1975 | else | 1977 | else |