[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: |
Mon, 02 Aug 2004 20:25:21 -0400 |
Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.360.2.4 emacs/lisp/subr.el:1.360.2.5
*** emacs/lisp/subr.el:1.360.2.4 Wed Jul 28 07:05:50 2004
--- emacs/lisp/subr.el Tue Aug 3 00:02:59 2004
***************
*** 644,650 ****
"Return a list of symbols representing the modifier keys in event EVENT.
The elements of the list may include `meta', `control',
`shift', `hyper', `super', `alt', `click', `double', `triple', `drag',
! and `down'."
(let ((type event))
(if (listp type)
(setq type (car type)))
--- 644,654 ----
"Return a list of symbols representing the modifier keys in event EVENT.
The elements of the list may include `meta', `control',
`shift', `hyper', `super', `alt', `click', `double', `triple', `drag',
! and `down'.
! EVENT may be an event or an event type. If EVENT is a symbol
! that has never been used in an event that has been read as input
! in the current Emacs session, then this function can return nil,
! even when EVENT actually has modifiers."
(let ((type event))
(if (listp type)
(setq type (car type)))
***************
*** 671,677 ****
(defun event-basic-type (event)
"Return the basic type of the given event (all modifiers removed).
! The value is a printing character (not upper case) or a symbol."
(if (consp event)
(setq event (car event)))
(if (symbolp event)
--- 675,684 ----
(defun event-basic-type (event)
"Return the basic type of the given event (all modifiers removed).
! The value is a printing character (not upper case) or a symbol.
! EVENT may be an event or an event type. If EVENT is a symbol
! that has never been used in an event that has been read as input
! in the current Emacs session, then this function may return nil."
(if (consp event)
(setq event (car event)))
(if (symbolp event)
***************
*** 1894,1900 ****
(kill-buffer nil)))))
(defmacro with-local-quit (&rest body)
! "Execute BODY with `inhibit-quit' temporarily bound to nil."
(declare (debug t) (indent 0))
`(condition-case nil
(let ((inhibit-quit nil))
--- 1901,1910 ----
(kill-buffer nil)))))
(defmacro with-local-quit (&rest body)
! "Execute BODY, allowing quits to terminate BODY but not escape further.
! When a quit terminates BODY, `with-local-quit' requests another quit when
! it finishes. That quit will be processed in turn, the next time quitting
! is again allowed."
(declare (debug t) (indent 0))
`(condition-case nil
(let ((inhibit-quit nil))
- [Emacs-diffs] Changes to emacs/lisp/subr.el [emacs-unicode-2],
Miles Bader <=