diff options
| author | Richard M. Stallman | 1997-07-24 04:28:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-24 04:28:05 +0000 |
| commit | 1ea0c057d38279190023c5584f12bb42989e3e28 (patch) | |
| tree | fc1579e29db4e7cf139b7afb823723e80281418c | |
| parent | 2be5fefb8655a1349c9c6a0b03a8bf2da0df1d07 (diff) | |
| download | emacs-1ea0c057d38279190023c5584f12bb42989e3e28.tar.gz emacs-1ea0c057d38279190023c5584f12bb42989e3e28.zip | |
(te-newline): Change eql to eq.
(te-insert-lines, te-delete-lines, te-process-output): Likewise.
(te-parse-program-and-args, te-get-char): Likewise.
| -rw-r--r-- | lisp/terminal.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/terminal.el b/lisp/terminal.el index d6138aa8ea2..04f98302ecc 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el | |||
| @@ -673,7 +673,7 @@ move to start of new line, clear to end of line." | |||
| 673 | (cond ((not terminal-more-processing)) | 673 | (cond ((not terminal-more-processing)) |
| 674 | ((< (setq te-more-count (1- te-more-count)) 0) | 674 | ((< (setq te-more-count (1- te-more-count)) 0) |
| 675 | (te-set-more-count t)) | 675 | (te-set-more-count t)) |
| 676 | ((eql te-more-count 0) | 676 | ((eq te-more-count 0) |
| 677 | ;; this doesn't return | 677 | ;; this doesn't return |
| 678 | (te-more-break))) | 678 | (te-more-break))) |
| 679 | (if (eobp) | 679 | (if (eobp) |
| @@ -746,11 +746,11 @@ move to start of new line, clear to end of line." | |||
| 746 | (n (min (- (te-get-char) ?\ ) line)) | 746 | (n (min (- (te-get-char) ?\ ) line)) |
| 747 | (i 0)) | 747 | (i 0)) |
| 748 | (delete-region (- (point-max) (* n (1+ te-width))) (point-max)) | 748 | (delete-region (- (point-max) (* n (1+ te-width))) (point-max)) |
| 749 | (if (eql (point) (point-max)) (insert ?\n)) | 749 | (if (eq (point) (point-max)) (insert ?\n)) |
| 750 | (while (< i n) | 750 | (while (< i n) |
| 751 | (setq i (1+ i)) | 751 | (setq i (1+ i)) |
| 752 | (insert-char ?\ te-width) | 752 | (insert-char ?\ te-width) |
| 753 | (or (eql i line) (insert ?\n)))))) | 753 | (or (eq i line) (insert ?\n)))))) |
| 754 | (setq te-more-count -1)) | 754 | (setq te-more-count -1)) |
| 755 | 755 | ||
| 756 | 756 | ||
| @@ -768,7 +768,7 @@ move to start of new line, clear to end of line." | |||
| 768 | (while (< i n) | 768 | (while (< i n) |
| 769 | (setq i (1+ i)) | 769 | (setq i (1+ i)) |
| 770 | (insert-char ?\ te-width) | 770 | (insert-char ?\ te-width) |
| 771 | (or (eql i line) (insert ?\n)))))) | 771 | (or (eq i line) (insert ?\n)))))) |
| 772 | (setq te-more-count -1)) | 772 | (setq te-more-count -1)) |
| 773 | 773 | ||
| 774 | ;; ^p ^a | 774 | ;; ^p ^a |
| @@ -905,7 +905,7 @@ move to start of new line, clear to end of line." | |||
| 905 | start (car te-pending-output) | 905 | start (car te-pending-output) |
| 906 | string (car (cdr te-pending-output)) | 906 | string (car (cdr te-pending-output)) |
| 907 | char (aref string start)) | 907 | char (aref string start)) |
| 908 | (if (eql (setq start (1+ start)) (length string)) | 908 | (if (eq (setq start (1+ start)) (length string)) |
| 909 | (progn (setq te-pending-output | 909 | (progn (setq te-pending-output |
| 910 | (cons 0 (cdr (cdr te-pending-output))) | 910 | (cons 0 (cdr (cdr te-pending-output))) |
| 911 | start 0 | 911 | start 0 |
| @@ -915,7 +915,7 @@ move to start of new line, clear to end of line." | |||
| 915 | (if (and (> char ?\037) (< char ?\377)) | 915 | (if (and (> char ?\037) (< char ?\377)) |
| 916 | (cond ((eolp) | 916 | (cond ((eolp) |
| 917 | ;; unread char | 917 | ;; unread char |
| 918 | (if (eql start 0) | 918 | (if (eq start 0) |
| 919 | (setq te-pending-output | 919 | (setq te-pending-output |
| 920 | (cons 0 (cons (make-string 1 char) | 920 | (cons 0 (cons (make-string 1 char) |
| 921 | (cdr te-pending-output)))) | 921 | (cdr te-pending-output)))) |
| @@ -934,13 +934,13 @@ move to start of new line, clear to end of line." | |||
| 934 | (setq char (point)) (end-of-line) | 934 | (setq char (point)) (end-of-line) |
| 935 | (setq end (min end (+ start (- (point) char)))) | 935 | (setq end (min end (+ start (- (point) char)))) |
| 936 | (goto-char char) | 936 | (goto-char char) |
| 937 | (if (eql end matchpos) (setq matchpos nil)) | 937 | (if (eq end matchpos) (setq matchpos nil)) |
| 938 | (delete-region (point) (+ (point) (- end start))) | 938 | (delete-region (point) (+ (point) (- end start))) |
| 939 | (insert (if (and (eql start 0) | 939 | (insert (if (and (eq start 0) |
| 940 | (eql end (length string))) | 940 | (eq end (length string))) |
| 941 | string | 941 | string |
| 942 | (substring string start end))) | 942 | (substring string start end))) |
| 943 | (if (eql end (length string)) | 943 | (if (eq end (length string)) |
| 944 | (setq te-pending-output | 944 | (setq te-pending-output |
| 945 | (cons 0 (cdr (cdr te-pending-output)))) | 945 | (cons 0 (cdr (cdr te-pending-output)))) |
| 946 | (setcar te-pending-output end)) | 946 | (setcar te-pending-output end)) |
| @@ -949,7 +949,7 @@ move to start of new line, clear to end of line." | |||
| 949 | ;; function we could trivially emulate different terminals | 949 | ;; function we could trivially emulate different terminals |
| 950 | ;; Who cares in any case? (Apart from stupid losers using rlogin) | 950 | ;; Who cares in any case? (Apart from stupid losers using rlogin) |
| 951 | (funcall | 951 | (funcall |
| 952 | (if (eql char ?\^p) | 952 | (if (eq char ?\^p) |
| 953 | (or (cdr (assq (te-get-char) | 953 | (or (cdr (assq (te-get-char) |
| 954 | '((?= . te-move-to-position) | 954 | '((?= . te-move-to-position) |
| 955 | (?c . te-clear-rest-of-line) | 955 | (?c . te-clear-rest-of-line) |
| @@ -1000,7 +1000,7 @@ move to start of new line, clear to end of line." | |||
| 1000 | (let ((start (car te-pending-output)) | 1000 | (let ((start (car te-pending-output)) |
| 1001 | (string (car (cdr te-pending-output)))) | 1001 | (string (car (cdr te-pending-output)))) |
| 1002 | (prog1 (aref string start) | 1002 | (prog1 (aref string start) |
| 1003 | (if (eql (setq start (1+ start)) (length string)) | 1003 | (if (eq (setq start (1+ start)) (length string)) |
| 1004 | (setq te-pending-output (cons 0 (cdr (cdr te-pending-output)))) | 1004 | (setq te-pending-output (cons 0 (cdr (cdr te-pending-output)))) |
| 1005 | (setcar te-pending-output start)))) | 1005 | (setcar te-pending-output start)))) |
| 1006 | (catch 'char | 1006 | (catch 'char |
| @@ -1009,7 +1009,7 @@ move to start of new line, clear to end of line." | |||
| 1009 | (progn | 1009 | (progn |
| 1010 | (set-process-filter te-process | 1010 | (set-process-filter te-process |
| 1011 | (function (lambda (p s) | 1011 | (function (lambda (p s) |
| 1012 | (or (eql (length s) 1) | 1012 | (or (eq (length s) 1) |
| 1013 | (setq te-pending-output (list 1 s))) | 1013 | (setq te-pending-output (list 1 s))) |
| 1014 | (throw 'char (aref s 0))))) | 1014 | (throw 'char (aref s 0))))) |
| 1015 | (accept-process-output te-process)) | 1015 | (accept-process-output te-process)) |
| @@ -1171,7 +1171,7 @@ subprocess started." | |||
| 1171 | s p) | 1171 | s p) |
| 1172 | (prog1 (substring s p (match-end 1)) | 1172 | (prog1 (substring s p (match-end 1)) |
| 1173 | (setq p (match-end 0)) | 1173 | (setq p (match-end 0)) |
| 1174 | (if (eql p (length s)) (setq p nil))) | 1174 | (if (eq p (length s)) (setq p nil))) |
| 1175 | (prog1 (substring s p) | 1175 | (prog1 (substring s p) |
| 1176 | (setq p nil))) | 1176 | (setq p nil))) |
| 1177 | l))) | 1177 | l))) |