diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-24 22:41:40 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-24 22:41:40 -0800 |
| commit | a89654f8f34114db543cb91363e8fded6d73e986 (patch) | |
| tree | 5ac508597ef2aa460308b4b26c244779e48cdb40 /src/buffer.c | |
| parent | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (diff) | |
| parent | 67b0de11479247cb8bd8491e10e0b464046f18be (diff) | |
| download | emacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 22ae522523a..acee3c45158 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -272,7 +272,11 @@ See also `find-buffer-visiting'. */) call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qget_file_buffer); if (!NILP (handler)) - return call2 (handler, Qget_file_buffer, filename); + { + Lisp_Object handled_buf = call2 (handler, Qget_file_buffer, + filename); + return BUFFERP (handled_buf) ? handled_buf : Qnil; + } for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) { |