Mercurial > emacs
comparison lisp/calc/calc-yank.el @ 101001:14b421290b2f
Replace last-command-char with last-command-event.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 09 Jan 2009 03:57:12 +0000 |
parents | a9dc0e7c3f2b |
children | 2c12fbae77c2 |
comparison
equal
deleted
inserted
replaced
101000:ee5456efd63c | 101001:14b421290b2f |
---|---|
487 (progn | 487 (progn |
488 (delete-region (point) (match-end 0)) | 488 (delete-region (point) (match-end 0)) |
489 (insert str)) | 489 (insert str)) |
490 (let ((i 0)) | 490 (let ((i 0)) |
491 (while (< i (length str)) | 491 (while (< i (length str)) |
492 (if (= (setq last-command-char (aref str i)) ?\n) | 492 (if (= (setq last-command-event (aref str i)) ?\n) |
493 (or (= i (1- (length str))) | 493 (or (= i (1- (length str))) |
494 (let ((pt (point))) | 494 (let ((pt (point))) |
495 (end-of-line) | 495 (end-of-line) |
496 (delete-region pt (point)) | 496 (delete-region pt (point)) |
497 (if (eobp) | 497 (if (eobp) |
700 (set num (car vals)) | 700 (set num (car vals)) |
701 (calc-refresh-evaltos num)) | 701 (calc-refresh-evaltos num)) |
702 (if calc-edit-disp-trail | 702 (if calc-edit-disp-trail |
703 (calc-trail-display 1 t)) | 703 (calc-trail-display 1 t)) |
704 (and vals | 704 (and vals |
705 (let ((calc-simplify-mode (if (eq last-command-char ?\C-j) | 705 (let ((calc-simplify-mode (if (eq last-command-event ?\C-j) |
706 'none | 706 'none |
707 calc-simplify-mode))) | 707 calc-simplify-mode))) |
708 (if (>= num 0) | 708 (if (>= num 0) |
709 (calc-enter-result num "edit" vals) | 709 (calc-enter-result num "edit" vals) |
710 (calc-enter-result 1 "edit" vals (- num)))))))))) | 710 (calc-enter-result 1 "edit" vals (- num)))))))))) |