7 files changed, 22 insertions, 44 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 4d2bbead518..821c96e36b5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -551,7 +551,8 @@ frame-update-face-colors, x-frob-font-weight, x-frob-font-slant,
 x-make-font-bold, x-make-font-demibold, x-make-font-unbold
 x-make-font-italic, x-make-font-oblique, x-make-font-unitalic
 x-make-font-bold-italic, mldrag-drag-mode-line, mldrag-drag-vertical-line,
-iswitchb-default-keybindings, char-bytes, isearch-return-char
+iswitchb-default-keybindings, char-bytes, isearch-return-char,
+make-local-hook
 
 ** The following variables and aliases, obsolete since at least Emacs 21.1,
 have been removed:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4e1ab16ce1..d31abc287e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
+        * subr.el (make-local-hook): Remove function obsolete since 21.1.
+        * progmodes/cc-mode.el (make-local-hook): Don't do cc-bytecomp stuff.
+        (c-basic-common-init, c-font-lock-init): Only call make-local-hook on
+        XEmacs.
+        * progmodes/cc-styles.el (make-local-hook): Don't do cc-bytecomp stuff.
+        (c-make-styles-buffer-local): Only call make-local-hook on XEmacs.
+
         * ps-def.el (leading-code-private-22, charset-bytes, charset-id)
         (charset-width, find-charset-region, chars-in-region, forward-point)
         (encode-coding-string, coding-system-p, ccl-execute-on-string)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8d227906aca..3a8f3dac83c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-03  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-util.el (gnus-make-local-hook): Simplify.
+
 2010-10-02  Julien Danjou  <julien@danjou.info>
 
         * gnus-util.el (gnus-iswitchb-completing-read): New function.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 0bf5b66a71d..8a6d9241f07 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -149,11 +149,9 @@ This is a compatibility function for different Emacsen."
 ;; XEmacs.  In Emacs we don't need to call `make-local-hook' first.
 ;; It's harmless, though, so the main purpose of this alias is to shut
 ;; up the byte compiler.
-(defalias 'gnus-make-local-hook
-  (if (eq (get 'make-local-hook 'byte-compile)
-          'byte-compile-obsolete)
-      'ignore                           ; Emacs
-    'make-local-hook))                  ; XEmacs
+(defalias 'gnus-make-local-hook (if (featurep 'xemacs)
+                                    'make-local-hook
+                                  'ignore)
 
 (defun gnus-delete-first (elt list)
   "Delete by side effect the first occurrence of ELT as a member of LIST."
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 6a76a657829..505a5663ebc 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -100,7 +100,6 @@
 (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs
 (cc-bytecomp-defun set-keymap-parents)  ; XEmacs
 (cc-bytecomp-defun run-mode-hooks)      ; Emacs 21.1
-(cc-bytecomp-obsolete-fun make-local-hook) ; Marked obsolete in Emacs 21.1.
 
 ;; We set these variables during mode init, yet we don't require
 ;; font-lock.
@@ -600,9 +599,10 @@ that requires a literal mode spec at compile time."
 
   ;; Install the functions that ensure that various internal caches
   ;; don't become invalid due to buffer changes.
-  (make-local-hook 'before-change-functions)
+  (when (featurep 'xemacs)
+    (make-local-hook 'before-change-functions)
+    (make-local-hook 'after-change-functions))
   (add-hook 'before-change-functions 'c-before-change nil t)
-  (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions 'c-after-change nil t)
   (set (make-local-variable 'font-lock-extend-after-change-region-function)
         'c-extend-after-change-region)) ; Currently (2009-05) used by all
@@ -1113,8 +1113,8 @@ This does not load the font-lock package.  Use after
           c-beginning-of-syntax
           (font-lock-mark-block-function
            . c-mark-function)))
-
-  (make-local-hook 'font-lock-mode-hook)
+  (if (featurep 'xemacs)
+      (make-local-hook 'font-lock-mode-hook))
   (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
 
 (defun c-extend-after-change-region (beg end old-len)
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 48120563b29..15d44f6538a 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -50,7 +50,6 @@
 
 ;; Silence the compiler.
 (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs
-(cc-bytecomp-obsolete-fun make-local-hook) ; Marked obsolete in Emacs 21.1.
 
 
 (defvar c-style-alist
@@ -649,7 +648,7 @@ any reason to call this function directly."
     (mapc func varsyms)
     ;; Hooks must be handled specially
     (if this-buf-only-p
-        (make-local-hook 'c-special-indent-hook)
+        (if (featurep 'xemacs) (make-local-hook 'c-special-indent-hook))
       (with-no-warnings (make-variable-buffer-local 'c-special-indent-hook))
       (setq c-style-variables-are-local-p t))
     ))
diff --git a/lisp/subr.el b/lisp/subr.el
index 82e1988156a..2dcc37863c7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1163,37 +1163,6 @@ to reread, so it now uses nil to mean `no event', instead of -1."
 
 ;;;; Hook manipulation functions.
 
-(defun make-local-hook (hook)
-  "Make the hook HOOK local to the current buffer.
-The return value is HOOK.
-
-You never need to call this function now that `add-hook' does it for you
-if its LOCAL argument is non-nil.
-
-When a hook is local, its local and global values
-work in concert: running the hook actually runs all the hook
-functions listed in *either* the local value *or* the global value
-of the hook variable.
-
-This function works by making t a member of the buffer-local value,
-which acts as a flag to run the hook functions in the default value as
-well.  This works for all normal hooks, but does not work for most
-non-normal hooks yet.  We will be changing the callers of non-normal
-hooks so that they can handle localness; this has to be done one by
-one.
-
-This function does nothing if HOOK is already local in the current
-buffer.
-
-Do not use `make-local-variable' to make a hook variable buffer-local."
-  (if (local-variable-p hook)
-      nil
-    (or (boundp hook) (set hook nil))
-    (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.
 FUNCTION is not added if already present.