(rlogin): If using make-local-hook, pass the 4th arg t to add-hook also to

modify the new local value.

diff --git a/lisp/rlogin.el b/lisp/rlogin.el
index 04cea26cdfc8b812dd7ace46652c04668f1657ca..6d9409868019420d184703a782274fbcfdcd87e7 100644 (file)
--- a/lisp/rlogin.el
+++ b/lisp/rlogin.el
@@ -1,12 +1,12 @@
 ;;; rlogin.el --- remote login interface
 
-;; Copyright (C) 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1995, 1997, 1998 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
-;; Maintainer: Noah Friedman <friedman@prep.ai.mit.edu>
+;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: unix, comm
 
-;; $Id: rlogin.el,v 1.41 1998/03/14 04:46:55 rms Exp $
+;; $Id: rlogin.el,v 1.42 1998/06/24 09:23:00 schwab Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -47,7 +47,6 @@
   :group 'processes
   :group 'unix)
 
-
 (defcustom rlogin-program "rlogin"
   "*Name of program to invoke rlogin"
   :type 'string
@@ -215,15 +214,19 @@ variable."
       ;; buffer from a previous exited process.
       (set-marker (process-mark proc) (point-max))
 
-      ;; comint-output-filter-functions is just like a hook, except that the
-      ;; functions in that list are passed arguments.  add-hook serves well
-      ;; enough for modifying it.
+      ;; comint-output-filter-functions is treated like a hook: it is
+      ;; processed via run-hooks or run-hooks-with-args in later versions
+      ;; of emacs.
       ;; comint-output-filter-functions should already have a
       ;; permanent-local property, at least in emacs 19.27 or later.
-      (if (fboundp 'make-local-hook)
-          (make-local-hook 'comint-output-filter-functions)
-        (make-local-variable 'comint-output-filter-functions))
-      (add-hook 'comint-output-filter-functions 'rlogin-carriage-filter)
+      (cond
+       ((fboundp 'make-local-hook)
+        (make-local-hook 'comint-output-filter-functions)
+        (add-hook 'comint-output-filter-functions 'rlogin-carriage-filter
+                  nil t))
+       (t
+        (make-local-variable 'comint-output-filter-functions)
+        (add-hook 'comint-output-filter-functions 'rlogin-carriage-filter)))
 
       (rlogin-mode)