diff options
| author | Juanma Barranquero | 2006-11-27 14:09:01 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-11-27 14:09:01 +0000 |
| commit | 37437fb503e8a50d2b74a5a0714f7227f007b72a (patch) | |
| tree | 81455e78ce5af0b2cbab444109b8a14f5077c97e | |
| parent | e5d56b61a05b4fb8ac844422efe9ebdd7ef70198 (diff) | |
| download | emacs-37437fb503e8a50d2b74a5a0714f7227f007b72a.tar.gz emacs-37437fb503e8a50d2b74a5a0714f7227f007b72a.zip | |
(terminal-cease-edit, te-more-break-unwind, te-newline, te-clear-rest-of-line,
te-clear-rest-of-screen, te-clear-screen, te-insert-lines, te-delete-lines,
te-delete, te-insert-spaces, te-delete-char, te-down-vertically-or-scroll):
"?\ " -> "?\s".
| -rw-r--r-- | lisp/terminal.el | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lisp/terminal.el b/lisp/terminal.el index 51f2b37509b..323ddcd1153 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el | |||
| @@ -567,10 +567,10 @@ together with a command \\<terminal-edit-map>to return to terminal emulation: \\ | |||
| 567 | (let ((p (point))) | 567 | (let ((p (point))) |
| 568 | (cond ((search-forward "\n" (+ p width) 'move) | 568 | (cond ((search-forward "\n" (+ p width) 'move) |
| 569 | (forward-char -1) | 569 | (forward-char -1) |
| 570 | (insert-char ?\ (- width (- (point) p))) | 570 | (insert-char ?\s (- width (- (point) p))) |
| 571 | (forward-char 1)) | 571 | (forward-char 1)) |
| 572 | ((eobp) | 572 | ((eobp) |
| 573 | (insert-char ?\ (- width (- (point) p)))) | 573 | (insert-char ?\s (- width (- (point) p)))) |
| 574 | ((= (following-char) ?\n) | 574 | ((= (following-char) ?\n) |
| 575 | (forward-char 1)) | 575 | (forward-char 1)) |
| 576 | (t | 576 | (t |
| @@ -642,7 +642,7 @@ together with a command \\<terminal-edit-map>to return to terminal emulation: \\ | |||
| 642 | (forward-char 1) | 642 | (forward-char 1) |
| 643 | (delete-region (point) | 643 | (delete-region (point) |
| 644 | (+ (point) (length terminal-more-break-insertion))) | 644 | (+ (point) (length terminal-more-break-insertion))) |
| 645 | (insert-char ?\ te-width) | 645 | (insert-char ?\s te-width) |
| 646 | (goto-char te-more-old-point))) | 646 | (goto-char te-more-old-point))) |
| 647 | (setq te-more-old-point nil) | 647 | (setq te-more-old-point nil) |
| 648 | (let ((te-more-count 259259)) | 648 | (let ((te-more-count 259259)) |
| @@ -693,7 +693,7 @@ move to start of new line, clear to end of line." | |||
| 693 | (insert ?\n)))) | 693 | (insert ?\n)))) |
| 694 | (forward-char 1) | 694 | (forward-char 1) |
| 695 | (delete-region (point) (+ (point) te-width))) | 695 | (delete-region (point) (+ (point) te-width))) |
| 696 | (insert-char ?\ te-width) | 696 | (insert-char ?\s te-width) |
| 697 | (beginning-of-line) | 697 | (beginning-of-line) |
| 698 | (te-set-window-start)) | 698 | (te-set-window-start)) |
| 699 | 699 | ||
| @@ -717,7 +717,7 @@ move to start of new line, clear to end of line." | |||
| 717 | (save-excursion | 717 | (save-excursion |
| 718 | (let ((n (- (point) (progn (end-of-line) (point))))) | 718 | (let ((n (- (point) (progn (end-of-line) (point))))) |
| 719 | (delete-region (point) (+ (point) n)) | 719 | (delete-region (point) (+ (point) n)) |
| 720 | (insert-char ?\ (- n))))) | 720 | (insert-char ?\s (- n))))) |
| 721 | 721 | ||
| 722 | 722 | ||
| 723 | ;; ^p C | 723 | ;; ^p C |
| @@ -727,7 +727,7 @@ move to start of new line, clear to end of line." | |||
| 727 | (while (progn (end-of-line) (not (eobp))) | 727 | (while (progn (end-of-line) (not (eobp))) |
| 728 | (forward-char 1) (end-of-line) | 728 | (forward-char 1) (end-of-line) |
| 729 | (delete-region (- (point) te-width) (point)) | 729 | (delete-region (- (point) te-width) (point)) |
| 730 | (insert-char ?\ te-width)))) | 730 | (insert-char ?\s te-width)))) |
| 731 | 731 | ||
| 732 | 732 | ||
| 733 | ;; ^p ^l | 733 | ;; ^p ^l |
| @@ -737,7 +737,7 @@ move to start of new line, clear to end of line." | |||
| 737 | (let ((i 0)) | 737 | (let ((i 0)) |
| 738 | (while (< i te-height) | 738 | (while (< i te-height) |
| 739 | (setq i (1+ i)) | 739 | (setq i (1+ i)) |
| 740 | (insert-char ?\ te-width) | 740 | (insert-char ?\s te-width) |
| 741 | (insert ?\n))) | 741 | (insert ?\n))) |
| 742 | (delete-region (1- (point-max)) (point-max)) | 742 | (delete-region (1- (point-max)) (point-max)) |
| 743 | (goto-char (point-min)) | 743 | (goto-char (point-min)) |
| @@ -750,13 +750,13 @@ move to start of new line, clear to end of line." | |||
| 750 | ();(error "fooI") | 750 | ();(error "fooI") |
| 751 | (save-excursion | 751 | (save-excursion |
| 752 | (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1)) | 752 | (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1)) |
| 753 | (n (min (- (te-get-char) ?\ ) line)) | 753 | (n (min (- (te-get-char) ?\s) line)) |
| 754 | (i 0)) | 754 | (i 0)) |
| 755 | (delete-region (- (point-max) (* n (1+ te-width))) (point-max)) | 755 | (delete-region (- (point-max) (* n (1+ te-width))) (point-max)) |
| 756 | (if (eq (point) (point-max)) (insert ?\n)) | 756 | (if (eq (point) (point-max)) (insert ?\n)) |
| 757 | (while (< i n) | 757 | (while (< i n) |
| 758 | (setq i (1+ i)) | 758 | (setq i (1+ i)) |
| 759 | (insert-char ?\ te-width) | 759 | (insert-char ?\s te-width) |
| 760 | (or (eq i line) (insert ?\n)))))) | 760 | (or (eq i line) (insert ?\n)))))) |
| 761 | (setq te-more-count -1)) | 761 | (setq te-more-count -1)) |
| 762 | 762 | ||
| @@ -766,7 +766,7 @@ move to start of new line, clear to end of line." | |||
| 766 | (if (not (bolp)) | 766 | (if (not (bolp)) |
| 767 | ();(error "fooD") | 767 | ();(error "fooD") |
| 768 | (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1)) | 768 | (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1)) |
| 769 | (n (min (- (te-get-char) ?\ ) line)) | 769 | (n (min (- (te-get-char) ?\s) line)) |
| 770 | (i 0)) | 770 | (i 0)) |
| 771 | (delete-region (point) | 771 | (delete-region (point) |
| 772 | (min (+ (point) (* n (1+ te-width))) (point-max))) | 772 | (min (+ (point) (* n (1+ te-width))) (point-max))) |
| @@ -774,7 +774,7 @@ move to start of new line, clear to end of line." | |||
| 774 | (goto-char (point-max)) | 774 | (goto-char (point-max)) |
| 775 | (while (< i n) | 775 | (while (< i n) |
| 776 | (setq i (1+ i)) | 776 | (setq i (1+ i)) |
| 777 | (insert-char ?\ te-width) | 777 | (insert-char ?\s te-width) |
| 778 | (or (eq i line) (insert ?\n)))))) | 778 | (or (eq i line) (insert ?\n)))))) |
| 779 | (setq te-more-count -1)) | 779 | (setq te-more-count -1)) |
| 780 | 780 | ||
| @@ -798,7 +798,7 @@ move to start of new line, clear to end of line." | |||
| 798 | (if (bolp) | 798 | (if (bolp) |
| 799 | () | 799 | () |
| 800 | (delete-region (1- (point)) (point)) | 800 | (delete-region (1- (point)) (point)) |
| 801 | (insert ?\ ) | 801 | (insert ?\s) |
| 802 | (forward-char -1))) | 802 | (forward-char -1))) |
| 803 | 803 | ||
| 804 | ;; ^p ^g | 804 | ;; ^p ^g |
| @@ -815,7 +815,7 @@ move to start of new line, clear to end of line." | |||
| 815 | nil | 815 | nil |
| 816 | (delete-char (- n)) | 816 | (delete-char (- n)) |
| 817 | (goto-char p) | 817 | (goto-char p) |
| 818 | (insert-char ?\ n)) | 818 | (insert-char ?\s n)) |
| 819 | (goto-char p))) | 819 | (goto-char p))) |
| 820 | 820 | ||
| 821 | ;; ^p d count+32 (should be ^p ^d but cretinous un*x won't send ^d chars!!!) | 821 | ;; ^p d count+32 (should be ^p ^d but cretinous un*x won't send ^d chars!!!) |
| @@ -825,7 +825,7 @@ move to start of new line, clear to end of line." | |||
| 825 | (- (progn (end-of-line) (point)) p)))) | 825 | (- (progn (end-of-line) (point)) p)))) |
| 826 | (if (<= n 0) | 826 | (if (<= n 0) |
| 827 | nil | 827 | nil |
| 828 | (insert-char ?\ n) | 828 | (insert-char ?\s n) |
| 829 | (goto-char p) | 829 | (goto-char p) |
| 830 | (delete-char n)) | 830 | (delete-char n)) |
| 831 | (goto-char p))) | 831 | (goto-char p))) |
| @@ -862,7 +862,7 @@ move to start of new line, clear to end of line." | |||
| 862 | (delete-char 1) | 862 | (delete-char 1) |
| 863 | (goto-char (point-max)) | 863 | (goto-char (point-max)) |
| 864 | (insert ?\n) | 864 | (insert ?\n) |
| 865 | (insert-char ?\ te-width) | 865 | (insert-char ?\s te-width) |
| 866 | (beginning-of-line)) | 866 | (beginning-of-line)) |
| 867 | (forward-line 1)) | 867 | (forward-line 1)) |
| 868 | (move-to-column column)) | 868 | (move-to-column column)) |