From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 May 2005 15:43:48 +0000 (+0000)
Subject: (event-basic-type): Don't get an error.
X-Git-Tag: ttn-vms-21-2-B4~141
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9aca24765f2629c43f6097fa1d78f8ffd01a02be;p=emacs.git

(event-basic-type): Don't get an error.
(left-fringe-p): Function deleted.
---

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."
       (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)))))
+    (let* ((base (logand event (1- ?\A-\^@)))
+	   (uncontrolled (if (< base 32) (logior base 64) base)))
+      ;; There are some numbers that are invalid characters and
+      ;; cause `downcase' to get an error.
+      (condition-case ()
+	  (downcase uncontrolled)
+	(error uncontrolled)))))
 
 (defsubst mouse-movement-p (object)
   "Return non-nil if OBJECT is a mouse movement event."
@@ -2289,9 +2294,6 @@ configuration."
   (and (consp object)
        (eq (car object) 'frame-configuration)))
 
-(defsubst left-fringe-p ()
-  (equal (car (window-fringes)) 0))
-
 (defun functionp (object)
   "Non-nil if OBJECT is any kind of function or a special form.
 Also non-nil if OBJECT is a symbol and its function definition is