diff options
| author | Miles Bader | 2007-04-11 00:17:47 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-04-11 00:17:47 +0000 |
| commit | 57cb2e6f261bb0aad81a9f7e6f3017b54adee068 (patch) | |
| tree | 6ceb46f2e3bf08f16468d77f4fbfd201f637596a /src/buffer.c | |
| parent | 3bd1d328e94787ac52ef6ba5dfec3b94ba23917a (diff) | |
| parent | c429815a6b9d271a57eed4956125f6bc89d1d72b (diff) | |
| download | emacs-57cb2e6f261bb0aad81a9f7e6f3017b54adee068.tar.gz emacs-57cb2e6f261bb0aad81a9f7e6f3017b54adee068.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index f8d5bdc76fe..09166b17cfb 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1615,6 +1615,8 @@ the current buffer's major mode. */) | |||
| 1615 | int count; | 1615 | int count; |
| 1616 | Lisp_Object function; | 1616 | Lisp_Object function; |
| 1617 | 1617 | ||
| 1618 | CHECK_BUFFER (buffer); | ||
| 1619 | |||
| 1618 | if (STRINGP (XBUFFER (buffer)->name) | 1620 | if (STRINGP (XBUFFER (buffer)->name) |
| 1619 | && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) | 1621 | && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) |
| 1620 | function = find_symbol_value (intern ("initial-major-mode")); | 1622 | function = find_symbol_value (intern ("initial-major-mode")); |