comparison lisp/prim/cmdloop.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 56c54cf7c5b6
children 7d55a9ba150c
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 ;; General Public License for more details. 15 ;; General Public License for more details.
16 16
17 ;; You should have received a copy of the GNU General Public License 17 ;; You should have received a copy of the GNU General Public License
18 ;; along with XEmacs; see the file COPYING. If not, write to the 18 ;; along with XEmacs; see the file COPYING. If not, write to the
19 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19 ;; Free Software Foundation, 59 Temple Place - Suite 330,
20 ;; Boston, MA 02111-1307, USA. 20 ;; Boston, MA 02111-1307, USA.
21 21
22 ;;; Synched up with: FSF 19.30. (Some of the stuff below is in FSF's subr.el.) 22 ;;; Synched up with: FSF 19.30. (Some of the stuff below is in FSF's subr.el.)
23 23
24 ;; Written by Richard Mlynarik 8-Jul-92 24 ;; Written by Richard Mlynarik 8-Jul-92
339 (while (stringp yn) 339 (while (stringp yn)
340 (if (let ((cursor-in-echo-area t) 340 (if (let ((cursor-in-echo-area t)
341 (inhibit-quit t)) 341 (inhibit-quit t))
342 (message "%s%s%s" pre prompt yn) 342 (message "%s%s%s" pre prompt yn)
343 (setq event (next-command-event event)) 343 (setq event (next-command-event event))
344 (condition-case nil 344 (prog1
345 (prog1 345 (or quit-flag (eq 'keyboard-quit (key-binding event)))
346 (or quit-flag (eq 'keyboard-quit (key-binding event))) 346 (setq quit-flag nil)))
347 (setq quit-flag nil))
348 (wrong-type-argument t)))
349 (progn 347 (progn
350 (message "%s%s%s%s" pre prompt yn (single-key-description event)) 348 (message "%s%s%s%s" pre prompt yn (single-key-description event))
351 (setq quit-flag nil) 349 (setq quit-flag nil)
352 (signal 'quit '()))) 350 (signal 'quit '())))
353 (let* ((keys (events-to-keys (vector event))) 351 (let* ((keys (events-to-keys (vector event)))