[Emacs-diffs] Changes to emacs/lisp/pcvs.el,v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/07/25 04:50:33

Index: pcvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcvs.el,v
retrieving revision 1.98.2.5
retrieving revision 1.98.2.6
diff -u -b -r1.98.2.5 -r1.98.2.6
--- pcvs.el     25 Jul 2007 04:47:09 -0000      1.98.2.5
+++ pcvs.el     25 Jul 2007 04:50:33 -0000      1.98.2.6
@@ -392,17 +392,20 @@
     (with-current-buffer buf
       (setq buffer-read-only nil)
       (setq default-directory dir)
-      (unless nosetup (erase-buffer))
+      (unless nosetup
+        ;; Disable undo before calling erase-buffer since it may generate
+        ;; a very large and unwanted undo record.
+        (buffer-disable-undo)
+        (erase-buffer))
       (set (make-local-variable 'cvs-buffer) cvs-buf)
       ;;(cvs-minor-mode 1)
       (let ((lbd list-buffers-directory))
-       (if (fboundp mode) (funcall mode)
-          (fundamental-mode)
-          (buffer-disable-undo))
+       (if (fboundp mode) (funcall mode) (fundamental-mode))
        (when lbd (set (make-local-variable 'list-buffers-directory) lbd)))
       (cvs-minor-mode 1)
       ;;(set (make-local-variable 'cvs-buffer) cvs-buf)
-      (unless normal
+      (if normal
+          (buffer-enable-undo)
        (setq buffer-read-only t)
        (buffer-disable-undo))
       buf)))