(Fother_buffer): Don't call Fset_buffer_major_mode

for *scratch* if it already existed.

diff --git a/src/buffer.c b/src/buffer.c
index 871a152484eadea9790f880e6e511f85fd77561e..2fb9fefd5e9df40b03244448fce0982ec0394f54 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -961,8 +961,12 @@ If BUFFER is omitted or nil, some interesting buffer is returned.")
     }
   if (!NILP (notsogood))
     return notsogood;
-  buf = Fget_buffer_create (build_string ("*scratch*"));
-  Fset_buffer_major_mode (buf);
+  buf = Fget_buffer (build_string ("*scratch*"));
+  if (NILP (buf))
+    {
+      buf = Fget_buffer_create (build_string ("*scratch*"));
+      Fset_buffer_major_mode (buf);
+    }
   return buf;
 }
 \f