[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/subr.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/subr.el |
Date: |
Fri, 04 Apr 2003 01:23:03 -0500 |
Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.346 emacs/lisp/subr.el:1.347
*** emacs/lisp/subr.el:1.346 Wed Apr 2 21:49:16 2003
--- emacs/lisp/subr.el Thu Apr 3 18:13:38 2003
***************
*** 1104,1110 ****
The optional argument PROMPT specifies a string to use to prompt the user.
The variable `read-quoted-char-radix' controls which radix to use
for numeric input."
! (let ((message-log-max nil) done (first t) (code 0) char)
(while (not done)
(let ((inhibit-quit first)
;; Don't let C-h get the help message--only help function keys.
--- 1104,1110 ----
The optional argument PROMPT specifies a string to use to prompt the user.
The variable `read-quoted-char-radix' controls which radix to use
for numeric input."
! (let ((message-log-max nil) done (first t) (code 0) char translated)
(while (not done)
(let ((inhibit-quit first)
;; Don't let C-h get the help message--only help function keys.
***************
*** 1121,1152 ****
;; We could try and use read-key-sequence instead, but then C-q ESC
;; or C-q C-x might not return immediately since ESC or C-x might be
;; bound to some prefix in function-key-map or key-translation-map.
! (and char
! (let ((translated (lookup-key function-key-map (vector char))))
! (if (arrayp translated)
! (setq char (aref translated 0)))))
! (cond ((null char))
! ((not (integerp char))
! (setq unread-command-events (listify-key-sequence
(this-single-command-raw-keys))
done t))
! ((/= (logand char ?\M-\^@) 0)
;; Turn a meta-character into a character with the 0200 bit set.
! (setq code (logior (logand char (lognot ?\M-\^@)) 128)
done t))
! ((and (<= ?0 char) (< char (+ ?0 (min 10 read-quoted-char-radix))))
! (setq code (+ (* code read-quoted-char-radix) (- char ?0)))
! (and prompt (setq prompt (message "%s %c" prompt char))))
! ((and (<= ?a (downcase char))
! (< (downcase char) (+ ?a -10 (min 26
read-quoted-char-radix))))
(setq code (+ (* code read-quoted-char-radix)
! (+ 10 (- (downcase char) ?a))))
! (and prompt (setq prompt (message "%s %c" prompt char))))
! ((and (not first) (eq char ?\C-m))
(setq done t))
((not first)
! (setq unread-command-events (listify-key-sequence
(this-single-command-raw-keys))
done t))
! (t (setq code char
done t)))
(setq first nil))
code))
--- 1121,1152 ----
;; We could try and use read-key-sequence instead, but then C-q ESC
;; or C-q C-x might not return immediately since ESC or C-x might be
;; bound to some prefix in function-key-map or key-translation-map.
! (setq translated char)
! (let ((translation (lookup-key function-key-map (vector char))))
! (if (arrayp translation)
! (setq translated (aref translation 0))))
! (cond ((null translated))
! ((not (integerp translated))
! (setq unread-command-events (list char)
done t))
! ((/= (logand translated ?\M-\^@) 0)
;; Turn a meta-character into a character with the 0200 bit set.
! (setq code (logior (logand translated (lognot ?\M-\^@)) 128)
done t))
! ((and (<= ?0 translated) (< translated (+ ?0 (min 10
read-quoted-char-radix))))
! (setq code (+ (* code read-quoted-char-radix) (- translated ?0)))
! (and prompt (setq prompt (message "%s %c" prompt translated))))
! ((and (<= ?a (downcase translated))
! (< (downcase translated) (+ ?a -10 (min 26
read-quoted-char-radix))))
(setq code (+ (* code read-quoted-char-radix)
! (+ 10 (- (downcase translated) ?a))))
! (and prompt (setq prompt (message "%s %c" prompt translated))))
! ((and (not first) (eq translated ?\C-m))
(setq done t))
((not first)
! (setq unread-command-events (list char)
done t))
! (t (setq code translated
done t)))
(setq first nil))
code))
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Kenichi Handa, 2003/04/02
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Kenichi Handa, 2003/04/02
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Richard M. Stallman, 2003/04/03
- [Emacs-diffs] Changes to emacs/lisp/subr.el,
Miles Bader <=
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Vinicius Jose Latorre, 2003/04/04
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Richard M. Stallman, 2003/04/08
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Richard M. Stallman, 2003/04/24