(follow-generic-filter): Simply bind deactivate-mark.

Bind inhibit-read-only; don't mess with buffer-read-only.

1 files changed, 3 insertions, 12 deletions

diff --git a/lisp/follow.el b/lisp/follow.el
index 0e2d04068d4..7f4f5a67df4 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -2038,24 +2038,15 @@ report this using the `follow-submit-feedback' function."
         (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)
+              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 (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 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