[Emacs-diffs] Changes to emacs/lisp/follow.el

[Juanma Barranquero]

Index: emacs/lisp/follow.el
diff -c emacs/lisp/follow.el:1.16 emacs/lisp/follow.el:1.17
*** emacs/lisp/follow.el:1.16   Mon Jan 21 11:09:55 2002
--- emacs/lisp/follow.el        Thu Sep 26 17:57:17 2002
***************
*** 2038,2061 ****
        (if (not (marker-buffer (process-mark proc)))
            (set-marker (process-mark proc) (point-max)))
        (let ((moving (= (point) (process-mark proc)))
!             (odeactivate (and (boundp 'deactivate-mark)
!                               (symbol-value 'deactivate-mark)))
!             (old-buffer-read-only buffer-read-only))
!         (setq buffer-read-only nil)
          (save-excursion
            (goto-char (process-mark proc))
            ;; `insert-before-markers' just in case the users next
            ;; command is M-y.
            (insert-before-markers output)
            (set-marker (process-mark proc) (point)))
!         (if moving (goto-char (process-mark proc)))
!         (if (boundp 'deactivate-mark)
!             ;; This could really be
!             ;;    (setq deactivate-mark odeactivate)
!             ;; but this raises an error when compiling on XEmacs.
!             (funcall (symbol-function 'set)
!                      'deactivate-mark odeactivate))
!         (setq buffer-read-only old-buffer-read-only)))))
  
      ;; If we're in follow mode, do our stuff.  Select a new window and
      ;; redisplay.  (Actually, it is redundant to check `buf', but I
--- 2038,2052 ----
        (if (not (marker-buffer (process-mark proc)))
            (set-marker (process-mark proc) (point-max)))
        (let ((moving (= (point) (process-mark proc)))
!             deactivate-mark
!             (inhibit-read-only t))
          (save-excursion
            (goto-char (process-mark proc))
            ;; `insert-before-markers' just in case the users next
            ;; command is M-y.
            (insert-before-markers output)
            (set-marker (process-mark proc) (point)))
!         (if moving (goto-char (process-mark proc)))))))
  
      ;; If we're in follow mode, do our stuff.  Select a new window and
      ;; redisplay.  (Actually, it is redundant to check `buf', but I