Always use set_buffer_if_live to restore original buffer at unwind.

* buffer.h (record_unwind_current_buffer): New function.
* bytecode.c, dispnew.c, editfns.c, fileio.c, fns.c, insdel.c:
* keyboard.c, keymap.c, minibuf.c, print.c, process.c, textprop.c:
* undo.c, window.c: Adjust users.
* buffer.c (set_buffer_if_live): Fix comment.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 21f7dcb5d37..4031091501c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1570,9 +1570,7 @@ like in the respective argument of `key-binding'. */)
              would not be a problem here, but it is easier to keep
              things the same.
           */
-
-          record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-
+          record_unwind_current_buffer ();
           set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
         }
     }