comparison lisp/subr.el @ 298:70ad99077275 r21-0b47

Import from CVS: tag r21-0b47
author cvs
date Mon, 13 Aug 2007 10:39:40 +0200
parents 558f606b08ae
children 8429d81ab209
comparison
equal deleted inserted replaced
297:deca3c1083ac 298:70ad99077275
192 ;; Detect the case where make-local-variable was used on a hook 192 ;; Detect the case where make-local-variable was used on a hook
193 ;; and do what we used to do. 193 ;; and do what we used to do.
194 (and (local-variable-p hook (current-buffer)) 194 (and (local-variable-p hook (current-buffer))
195 (not (memq t (symbol-value hook))))) 195 (not (memq t (symbol-value hook)))))
196 (let ((hook-value (symbol-value hook))) 196 (let ((hook-value (symbol-value hook)))
197 (if (consp hook-value) 197 (if (and (consp hook-value) (not (functionp hook-value)))
198 (if (member function hook-value) 198 (if (member function hook-value)
199 (setq hook-value (delete function (copy-sequence hook-value)))) 199 (setq hook-value (delete function (copy-sequence hook-value))))
200 (if (equal hook-value function) 200 (if (equal hook-value function)
201 (setq hook-value nil))) 201 (setq hook-value nil)))
202 (set hook hook-value)) 202 (set hook hook-value))
203 (let ((hook-value (default-value hook))) 203 (let ((hook-value (default-value hook)))
204 (if (consp hook-value) 204 (if (and (consp hook-value) (not (functionp hook-value)))
205 (if (member function hook-value) 205 (if (member function hook-value)
206 (setq hook-value (delete function (copy-sequence hook-value)))) 206 (setq hook-value (delete function (copy-sequence hook-value))))
207 (if (equal hook-value function) 207 (if (equal hook-value function)
208 (setq hook-value nil))) 208 (setq hook-value nil)))
209 (set-default hook hook-value))))) 209 (set-default hook hook-value)))))