diff options
author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-09-02 15:41:22 +0400 |
---|---|---|
committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-09-02 15:41:22 +0400 |
commit | 77ea21cdfcc4d41aaac7dad2d0ed9f74e02603e7 (patch) | |
tree | 058039c9708f42c31e8f8d682e1e8fc47ccc13c6 /src/marker.c | |
parent | f25cd98b276ba1a11d7be5506c8624c72060b25f (diff) | |
download | emacs-77ea21cdfcc4d41aaac7dad2d0ed9f74e02603e7.tar.gz |
* buffer.h (decode_buffer): New function.
* buffer.c (Fbuffer_name, Fbuffer_file_name, Fbuffer_base_buffer)
(Fbuffer_local_variables, Fbuffer_modified_p, Fbuffer_modified_tick)
(Fbuffer_chars_modified_tick, Fdelete_all_overlays):
* data.c (Flocal_variables_p):
* fileio.c (Fverify_visited_file_modtime):
* marker.c (live_buffer): Use it.
Diffstat (limited to 'src/marker.c')
-rw-r--r-- | src/marker.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/marker.c b/src/marker.c index 91fcea5f25f..d377efbc4fa 100644 --- a/src/marker.c +++ b/src/marker.c @@ -455,21 +455,8 @@ attach_marker (struct Lisp_Marker *m, struct buffer *b, static struct buffer * live_buffer (Lisp_Object buffer) { - struct buffer *b; - - if (NILP (buffer)) - { - b = current_buffer; - eassert (BUFFER_LIVE_P (b)); - } - else - { - CHECK_BUFFER (buffer); - b = XBUFFER (buffer); - if (!BUFFER_LIVE_P (b)) - b = NULL; - } - return b; + struct buffer *b = decode_buffer (buffer); + return BUFFER_LIVE_P (b) ? b : NULL; } /* Internal function to set MARKER in BUFFER at POSITION. Non-zero |