diff options
| author | Glenn Morris | 2012-12-21 11:32:43 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-21 11:32:43 -0800 |
| commit | a4b0cca119b01dc55bad802ef696c857fe014482 (patch) | |
| tree | f2df86b3d472d15d3bbb69274325a7c0090f65b3 /src/buffer.c | |
| parent | 0e9c7693712014196946a83709a83c08a7dfea25 (diff) | |
| parent | 160b3852018831b830a7451f29f770fb49810342 (diff) | |
| download | emacs-a4b0cca119b01dc55bad802ef696c857fe014482.tar.gz emacs-a4b0cca119b01dc55bad802ef696c857fe014482.zip | |
Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 748422df73a..3cf590d4db7 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2049,7 +2049,7 @@ DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal, | |||
| 2049 | DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, | 2049 | DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, |
| 2050 | doc: /* Set an appropriate major mode for BUFFER. | 2050 | doc: /* Set an appropriate major mode for BUFFER. |
| 2051 | For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode | 2051 | For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode |
| 2052 | according to `default-major-mode'. | 2052 | according to the default value of `major-mode'. |
| 2053 | Use this function before selecting the buffer, since it may need to inspect | 2053 | Use this function before selecting the buffer, since it may need to inspect |
| 2054 | the current buffer's major mode. */) | 2054 | the current buffer's major mode. */) |
| 2055 | (Lisp_Object buffer) | 2055 | (Lisp_Object buffer) |