[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/subr.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/subr.el [emacs-unicode-2] |
Date: |
Tue, 21 Sep 2004 06:15:57 -0400 |
Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.360.2.9 emacs/lisp/subr.el:1.360.2.10
*** emacs/lisp/subr.el:1.360.2.9 Thu Sep 9 09:36:32 2004
--- emacs/lisp/subr.el Tue Sep 21 09:34:08 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
***************
*** 683,689 ****
(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)
--- 683,689 ----
(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)
***************
*** 1937,1945 ****
--- 1937,1951 ----
(make-variable-buffer-local 'delayed-mode-hooks)
(put 'delay-mode-hooks 'permanent-local t)
+ (defvar after-change-major-mode-hook nil
+ "Mode independent hook run at the end of major mode functions.
+ This is run just before the mode dependent hooks.")
+
(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.
***************
*** 1948,1954 ****
;; 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'.
--- 1954,1961 ----
;; 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'.
***************
*** 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
--- 2651,2655 ----
(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