comparison lisp/utils/edmacro.el @ 163:0132846995bd r20-3b8

Import from CVS: tag r20-3b8
author cvs
date Mon, 13 Aug 2007 09:43:35 +0200
parents 43dd3413c7c7
children 8eaf7971accc
comparison
equal deleted inserted replaced
162:4de2936b4e77 163:0132846995bd
3 ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. 3 ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
4 4
5 ;; Author: Dave Gillespie <daveg@synaptics.com> 5 ;; Author: Dave Gillespie <daveg@synaptics.com>
6 ;; Hrvoje Niksic <hniksic@srce.hr> -- XEmacs port 6 ;; Hrvoje Niksic <hniksic@srce.hr> -- XEmacs port
7 ;; Maintainer: Hrvoje Niksic <hniksic@srce.hr> 7 ;; Maintainer: Hrvoje Niksic <hniksic@srce.hr>
8 ;; Version: 3.15 8 ;; Version: 3.16
9 ;; Keywords: abbrev 9 ;; Keywords: abbrev
10 10
11 ;; This file is part of XEmacs. 11 ;; This file is part of XEmacs.
12 12
13 ;; XEmacs is free software; you can redistribute it and/or modify 13 ;; XEmacs is free software; you can redistribute it and/or modify
536 ((string-match "^\\^" word) 536 ((string-match "^\\^" word)
537 ;; ^X == C-x 537 ;; ^X == C-x
538 (if (/= (length word) 2) 538 (if (/= (length word) 2)
539 (error "^ must be followed by one character")) 539 (error "^ must be followed by one character"))
540 `((control ,(aref word 1)))) 540 `((control ,(aref word 1))))
541 ((string-match "^M--?[0-9]+$" word)
542 ;; Special case: M- followed by an optional hyphen and
543 ;; one or more digits
544 (mapcar (lambda (digit)
545 (list 'meta digit))
546 (substring word 2)))
541 ((string-match "^\\([MCSsAH]\\|Sh\\)-" word) 547 ((string-match "^\\([MCSsAH]\\|Sh\\)-" word)
542 ;; Parse C-* and stuff 548 ;; Parse C-* and stuff
543 (list 549 (list
544 (let ((pos1 0) 550 (let ((pos1 0)
545 (r1 nil) 551 (r1 nil)