diff options
| author | Richard M. Stallman | 2005-05-19 15:43:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-05-19 15:43:48 +0000 |
| commit | 9aca24765f2629c43f6097fa1d78f8ffd01a02be (patch) | |
| tree | 9c3d11f061f232237d8d4a65ce56728c242b8d52 | |
| parent | 7e829de9c2922667ef6458268956bd435f83e73b (diff) | |
| download | emacs-9aca24765f2629c43f6097fa1d78f8ffd01a02be.tar.gz emacs-9aca24765f2629c43f6097fa1d78f8ffd01a02be.zip | |
(event-basic-type): Don't get an error.
(left-fringe-p): Function deleted.
| -rw-r--r-- | lisp/subr.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 7c10c3762dd..fe14efcb484 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -603,8 +603,13 @@ in the current Emacs session, then this function may return nil." | |||
| 603 | (setq event (car event))) | 603 | (setq event (car event))) |
| 604 | (if (symbolp event) | 604 | (if (symbolp event) |
| 605 | (car (get event 'event-symbol-elements)) | 605 | (car (get event 'event-symbol-elements)) |
| 606 | (let ((base (logand event (1- ?\A-\^@)))) | 606 | (let* ((base (logand event (1- ?\A-\^@))) |
| 607 | (downcase (if (< base 32) (logior base 64) base))))) | 607 | (uncontrolled (if (< base 32) (logior base 64) base))) |
| 608 | ;; There are some numbers that are invalid characters and | ||
| 609 | ;; cause `downcase' to get an error. | ||
| 610 | (condition-case () | ||
| 611 | (downcase uncontrolled) | ||
| 612 | (error uncontrolled))))) | ||
| 608 | 613 | ||
| 609 | (defsubst mouse-movement-p (object) | 614 | (defsubst mouse-movement-p (object) |
| 610 | "Return non-nil if OBJECT is a mouse movement event." | 615 | "Return non-nil if OBJECT is a mouse movement event." |
| @@ -2289,9 +2294,6 @@ configuration." | |||
| 2289 | (and (consp object) | 2294 | (and (consp object) |
| 2290 | (eq (car object) 'frame-configuration))) | 2295 | (eq (car object) 'frame-configuration))) |
| 2291 | 2296 | ||
| 2292 | (defsubst left-fringe-p () | ||
| 2293 | (equal (car (window-fringes)) 0)) | ||
| 2294 | |||
| 2295 | (defun functionp (object) | 2297 | (defun functionp (object) |
| 2296 | "Non-nil if OBJECT is any kind of function or a special form. | 2298 | "Non-nil if OBJECT is any kind of function or a special form. |
| 2297 | Also non-nil if OBJECT is a symbol and its function definition is | 2299 | Also non-nil if OBJECT is a symbol and its function definition is |