[Emacs-diffs] Changes to emacs/lisp/subr.el [lexbind]

[Miles Bader]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.307.2.23 emacs/lisp/subr.el:1.307.2.24
*** emacs/lisp/subr.el:1.307.2.23       Thu Sep 16 00:12:21 2004
--- emacs/lisp/subr.el  Wed Oct  6 05:21:51 2004
***************
*** 1,7 ****
  ;;; subr.el --- basic lisp subroutines for Emacs
  
! ;; Copyright (C) 1985, 86, 92, 94, 95, 99, 2000, 2001, 2002, 03, 2004
! ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal
--- 1,7 ----
  ;;; subr.el --- basic lisp subroutines for Emacs
  
! ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
! ;;   2004  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal
***************
*** 689,695 ****
        (setq event (car event)))
    (if (symbolp event)
        (car (get event 'event-symbol-elements))
!     (let ((base (logand event (1- (lsh 1 18)))))
        (downcase (if (< base 32) (logior base 64) base)))))
  
  (defsubst mouse-movement-p (object)
--- 689,695 ----
        (setq event (car event)))
    (if (symbolp event)
        (car (get event 'event-symbol-elements))
!     (let ((base (logand event (1- ?\A-\^@))))
        (downcase (if (< base 32) (logior base 64) base)))))
  
  (defsubst mouse-movement-p (object)
***************
*** 1943,1951 ****
--- 1943,1956 ----
  (make-variable-buffer-local 'delayed-mode-hooks)
  (put 'delay-mode-hooks 'permanent-local t)
  
+ (defvar after-change-major-mode-hook nil
+   "Normal hook run at the very end of major mode functions.")
+ 
  (defun run-mode-hooks (&rest hooks)
    "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
  Execution is delayed if `delay-mode-hooks' is non-nil.
+ If `delay-mode-hooks' is nil, run `after-change-major-mode-hook'
+ after running the mode hooks.
  Major mode functions should use this."
    (if delay-mode-hooks
        ;; Delaying case.
***************
*** 1954,1963 ****
      ;; Normal case, just run the hook as before plus any delayed hooks.
      (setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
      (setq delayed-mode-hooks nil)
!     (apply 'run-hooks hooks)))
  
  (defmacro delay-mode-hooks (&rest body)
    "Execute BODY, but delay any `run-mode-hooks'.
  Only affects hooks run in the current buffer."
    (declare (debug t))
    `(progn
--- 1959,1971 ----
      ;; Normal case, just run the hook as before plus any delayed hooks.
      (setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
      (setq delayed-mode-hooks nil)
!     (apply 'run-hooks hooks)
!     (run-hooks 'after-change-major-mode-hook)))
  
  (defmacro delay-mode-hooks (&rest body)
    "Execute BODY, but delay any `run-mode-hooks'.
+ These hooks will be executed by the first following call to
+ `run-mode-hooks' that occurs outside any `delayed-mode-hooks' form.
  Only affects hooks run in the current buffer."
    (declare (debug t))
    `(progn
***************
*** 2636,2640 ****
    (put symbol 'abortfunc (or abortfunc 'kill-buffer))
    (put symbol 'hookvar (or hookvar 'mail-send-hook)))
  
! ;;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc
  ;;; subr.el ends here
--- 2644,2648 ----
    (put symbol 'abortfunc (or abortfunc 'kill-buffer))
    (put symbol 'hookvar (or hookvar 'mail-send-hook)))
  
! ;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc
  ;;; subr.el ends here