From c2e0f1982f886a9c269fed50a3fc904ca2e1655a Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Sun, 3 Jan 2021 16:07:16 -0500
Subject: * src/buffer.c (Fset_buffer_multibyte): Remove dead code

---
 src/buffer.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index 81f7d922fdb..0a7ff6e6752 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2602,8 +2602,6 @@ current buffer is cleared.  */)
 	      p += bytes, pos += bytes;
 	    }
 	}
-      if (narrowed)
-	Fnarrow_to_region (make_fixnum (begv), make_fixnum (zv));
     }
   else
     {
@@ -2682,9 +2680,6 @@ current buffer is cleared.  */)
       if (pt != PT)
 	TEMP_SET_PT (pt);
 
-      if (narrowed)
-	Fnarrow_to_region (make_fixnum (begv), make_fixnum (zv));
-
       /* Do this first, so that chars_in_text asks the right question.
 	 set_intervals_multibyte needs it too.  */
       bset_enable_multibyte_characters (current_buffer, Qt);
-- 
cgit v1.2.1


From 5bddc097385c1d9088748ed92abc2370857b2202 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Mon, 4 Jan 2021 23:11:07 -0500
Subject: * lisp/subr.el (ctl-x-map): Initialize inside the declaration.

* src/command.h (control_x_map):
* src/keymap.c (control_x_map): Delete variable.
(syms_of_keymap):
* src/keyboard.c (keys_of_keyboard):
* src/casefiddle.c (keys_of_casefiddle):
* src/window.c (keys_of_window): Move initialization of ctl-x-map to
subr.el.

* src/lisp.h (syms_of_buffer):
* src/buffer.c (keys_of_buffer): Delete function.
* src/emacs.c (main): Don't call it.
---
 src/buffer.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index 0a7ff6e6752..71ad5edd527 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6380,10 +6380,3 @@ nil NORECORD argument since it may lead to infinite recursion.  */);
 
   Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt);
 }
-
-void
-keys_of_buffer (void)
-{
-  initial_define_key (control_x_map, 'b', "switch-to-buffer");
-  initial_define_key (control_x_map, 'k', "kill-buffer");
-}
-- 
cgit v1.2.1