(gomoku-mode-map): Use command remapping instead of

[gnu-emacs] / lisp / follow.el

diff --git a/lisp/follow.el b/lisp/follow.el
index 0e2d04068d44ac12115bf5bbef7203f023651376..4480ba6b8491ad196c5c19338fd98b2f88915ec6 100644 (file)
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -129,7 +129,7 @@
 ;;
 ;; When `Follow' mode is activated, functions stored in the hook
 ;; `follow-mode-hook' are called.  When it is deactivated
-;; `follow-mode-off-hook' is runed.
+;; `follow-mode-off-hook' is run.
 ;;
 ;; The keymap `follow-key-map' contains key bindings activated by
 ;; `follow-mode'.
@@ -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