# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 975020082 0
# Node ID 233f6f81744b488edbb884aa7038e25a32008156
# Parent  0594f24241333e23417d85b89713a331ca13c119
(add-hook, remove-hook): Don't call make-local-hook
if the variable is make-variable-buffer-local.

diff -r 0594f2424133 -r 233f6f81744b lisp/subr.el
--- a/lisp/subr.el	Thu Nov 23 20:56:49 2000 +0000
+++ b/lisp/subr.el	Thu Nov 23 22:54:42 2000 +0000
@@ -227,6 +227,15 @@
 	  (define-key map (char-to-string loop) 'digit-argument)
 	  (setq loop (1+ loop))))))
 
+(when (and (not (fboundp 'set-keymap-parents))
+	   (fboundp 'make-composed-keymap))
+  (defun set-keymap-parents (map parents)
+    "Set MAP to inherit from PARENTS.
+PARENTS can be either nil or a keymap or a list of keymaps."
+    (set-keymap-parent map
+		       (if (or (null parents) (keymapp parents)) parents
+			 (make-composed-keymap parents)))))
+
 ;Moved to keymap.c
 ;(defun copy-keymap (keymap)
 ;  "Return a copy of KEYMAP"  
@@ -697,6 +706,7 @@
     (make-local-variable hook)
     (set hook (list t)))
   hook)
+(make-obsolete 'make-local-hook "Not necessary any more." "21.1")
 
 (defun add-hook (hook function &optional append local)
   "Add to the value of HOOK the function FUNCTION.
@@ -716,7 +726,7 @@
 function, it is changed to a list of functions."
   (or (boundp hook) (set hook nil))
   (or (default-boundp hook) (set-default hook nil))
-  (if local (make-local-hook hook)
+  (if local (unless (local-variable-if-set-p hook) (make-local-hook hook))
     ;; Detect the case where make-local-variable was used on a hook
     ;; and do what we used to do.
     (unless (and (consp (symbol-value hook)) (memq t (symbol-value hook)))
@@ -747,7 +757,7 @@
 `make-local-hook', not `make-local-variable'."
   (or (boundp hook) (set hook nil))
   (or (default-boundp hook) (set-default hook nil))
-  (if local (make-local-hook hook)
+  (if local (unless (local-variable-if-set-p hook) (make-local-hook hook))
     ;; Detect the case where make-local-variable was used on a hook
     ;; and do what we used to do.
     (unless (and (consp (symbol-value hook)) (memq t (symbol-value hook)))
@@ -1245,13 +1255,9 @@
 (defun subst-char-in-string (fromchar tochar string &optional inplace)
   "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
 Unless optional argument INPLACE is non-nil, return a new string."
-  (let ((i (length string))
-	(newstr (if inplace string (copy-sequence string))))
-    (while (> i 0)
-      (setq i (1- i))
-      (if (eq (aref newstr i) fromchar)
-	  (aset newstr i tochar)))
-    newstr))
+  (if inplace (error "bouh!"))
+  (mapconcat (lambda (c) (char-to-string (if (equal c fromchar) tochar c)))
+	     string ""))
 
 (defun replace-regexp-in-string (regexp rep string &optional
 					fixedcase literal subexp start)