Mercurial > emacs
comparison lisp/emulation/viper-macs.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 19 Sep 2005 10:20:33 +0000 |
| parents | edf295560b5a 0670efd1e2df |
| children | ee12d75eb214 |
comparison
equal
deleted
inserted
replaced
| 90227:10fe5fadaf89 | 90228:fa0da9b57058 |
|---|---|
| 184 (format | 184 (format |
| 185 ":map%s %s" | 185 ":map%s %s" |
| 186 variant (if (> (length key-seq) 0) | 186 variant (if (> (length key-seq) 0) |
| 187 (prin1-to-string (viper-display-macro key-seq)) | 187 (prin1-to-string (viper-display-macro key-seq)) |
| 188 ""))) | 188 ""))) |
| 189 (message message) | 189 (message "%s" message) |
| 190 (setq event (viper-read-key)) | 190 (setq event (viper-read-key)) |
| 191 ;;(setq event (viper-read-event)) | 191 ;;(setq event (viper-read-event)) |
| 192 (setq key | 192 (setq key |
| 193 (if (viper-mouse-event-p event) | 193 (if (viper-mouse-event-p event) |
| 194 (progn | 194 (progn |
| 261 ":unmap%s %s" | 261 ":unmap%s %s" |
| 262 variant (if (> (length key-seq) 0) | 262 variant (if (> (length key-seq) 0) |
| 263 (prin1-to-string | 263 (prin1-to-string |
| 264 (viper-display-macro key-seq)) | 264 (viper-display-macro key-seq)) |
| 265 ""))) | 265 ""))) |
| 266 (message message) | 266 (message "%s" message) |
| 267 (setq event (viper-read-key)) | 267 (setq event (viper-read-key)) |
| 268 ;;(setq event (viper-read-event)) | 268 ;;(setq event (viper-read-event)) |
| 269 (setq key | 269 (setq key |
| 270 (if (viper-mouse-event-p event) | 270 (if (viper-mouse-event-p event) |
| 271 (progn | 271 (progn |
| 440 (format "%S" macro-body) | 440 (format "%S" macro-body) |
| 441 macro-body) | 441 macro-body) |
| 442 scope) | 442 scope) |
| 443 viper-custom-file-name)) | 443 viper-custom-file-name)) |
| 444 | 444 |
| 445 (message msg) | 445 ;; 2005-09-18 T06:41:22-0400 (Sunday) D. Goel |
| 446 ;; From careful parsing of the above code, it looks like msg | |
| 447 ;; couldn't be nil when we reach here. Since it is a string, | |
| 448 ;; and a complicated one too, we might as well provide it a "%s" | |
| 449 (message "%s" msg) | |
| 446 )) | 450 )) |
| 447 | 451 |
| 448 (setq new-elt | 452 (setq new-elt |
| 449 (cons macro-name | 453 (cons macro-name |
| 450 (cond ((eq scope t) (list nil nil (cons t nil))) | 454 (cond ((eq scope t) (list nil nil (cons t nil))) |