aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 86ba8263ab1..bafcb020e8d 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1811,42 +1811,6 @@ the window-buffer correspondences. */)
1811 return switch_to_buffer_1 (buffer, norecord); 1811 return switch_to_buffer_1 (buffer, norecord);
1812} 1812}
1813 1813
1814DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
1815 doc: /* Select buffer BUFFER in some window, preferably a different one.
1816BUFFER may be a buffer, a string \(a buffer name), or nil.
1817If BUFFER is a string which is not the name of an existing buffer,
1818then this function creates a buffer with that name.
1819If BUFFER is nil, then it chooses some other buffer.
1820If `pop-up-windows' is non-nil, windows can be split to do this.
1821If optional second arg OTHER-WINDOW is non-nil, insist on finding another
1822window even if BUFFER is already visible in the selected window,
1823and ignore `same-window-regexps' and `same-window-buffer-names'.
1824This function returns the buffer it switched to.
1825This uses the function `display-buffer' as a subroutine; see the documentation
1826of `display-buffer' for additional customization information.
1827
1828Optional third arg NORECORD non-nil means
1829do not put this buffer at the front of the list of recently selected ones. */)
1830 (buffer, other_window, norecord)
1831 Lisp_Object buffer, other_window, norecord;
1832{
1833 register Lisp_Object buf;
1834 if (NILP (buffer))
1835 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
1836 else
1837 {
1838 buf = Fget_buffer (buffer);
1839 if (NILP (buf))
1840 {
1841 buf = Fget_buffer_create (buffer);
1842 Fset_buffer_major_mode (buf);
1843 }
1844 }
1845 Fset_buffer (buf);
1846 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord);
1847 return buf;
1848}
1849
1850DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, 1814DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
1851 doc: /* Return the current buffer as a Lisp object. */) 1815 doc: /* Return the current buffer as a Lisp object. */)
1852 () 1816 ()
@@ -6269,7 +6233,6 @@ The function `kill-all-local-variables' runs this before doing anything else. *
6269 defsubr (&Skill_buffer); 6233 defsubr (&Skill_buffer);
6270 defsubr (&Sset_buffer_major_mode); 6234 defsubr (&Sset_buffer_major_mode);
6271 defsubr (&Sswitch_to_buffer); 6235 defsubr (&Sswitch_to_buffer);
6272 defsubr (&Spop_to_buffer);
6273 defsubr (&Scurrent_buffer); 6236 defsubr (&Scurrent_buffer);
6274 defsubr (&Sset_buffer); 6237 defsubr (&Sset_buffer);
6275 defsubr (&Sbarf_if_buffer_read_only); 6238 defsubr (&Sbarf_if_buffer_read_only);