diff options
| author | Glenn Morris | 2015-04-30 20:00:23 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-04-30 20:00:23 -0400 |
| commit | e0d0ad2acce8a153f10ecbb84c51c6e0981e3c0c (patch) | |
| tree | 9132aadef63d74f2d6057fd6cce88ef75745ce21 | |
| parent | 4d2ffa0eedd9c7ec0b4f94b545368efd4cc51ae1 (diff) | |
| download | emacs-e0d0ad2acce8a153f10ecbb84c51c6e0981e3c0c.tar.gz emacs-e0d0ad2acce8a153f10ecbb84c51c6e0981e3c0c.zip | |
Remove compatibility code for 20-year old function renaming
* lisp/progmodes/idlw-shell.el (idlwave-shell-comint-filter):
Make it an obsolete alias.
(idlwave-shell-filter): Change all uses to comint-output-filter.
| -rw-r--r-- | lisp/progmodes/idlw-shell.el | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 40c40eef302..02a8ec8a560 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el | |||
| @@ -1445,12 +1445,8 @@ Otherwise just move the line. Move down unless UP is non-nil." | |||
| 1445 | (interactive "p") | 1445 | (interactive "p") |
| 1446 | (idlwave-shell-move-or-history nil arg)) | 1446 | (idlwave-shell-move-or-history nil arg)) |
| 1447 | 1447 | ||
| 1448 | ;; Newer versions of comint.el changed the name of comint-filter to | 1448 | (define-obsolete-function-alias 'idlwave-shell-comint-filter |
| 1449 | ;; comint-output-filter. | 1449 | 'comint-output-filter "25.1") |
| 1450 | (defalias 'idlwave-shell-comint-filter | ||
| 1451 | (if (fboundp 'comint-output-filter) | ||
| 1452 | #'comint-output-filter | ||
| 1453 | #'comint-filter)) | ||
| 1454 | 1450 | ||
| 1455 | (defun idlwave-shell-is-running () | 1451 | (defun idlwave-shell-is-running () |
| 1456 | "Return t if the shell process is running." | 1452 | "Return t if the shell process is running." |
| @@ -1496,7 +1492,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." | |||
| 1496 | (get-buffer-create idlwave-shell-hidden-output-buffer)) | 1492 | (get-buffer-create idlwave-shell-hidden-output-buffer)) |
| 1497 | (goto-char (point-max)) | 1493 | (goto-char (point-max)) |
| 1498 | (insert string)) | 1494 | (insert string)) |
| 1499 | (idlwave-shell-comint-filter proc string)) | 1495 | (comint-output-filter proc string)) |
| 1500 | ;; Watch for magic - need to accumulate the current line | 1496 | ;; Watch for magic - need to accumulate the current line |
| 1501 | ;; since it may not be sent all at once. | 1497 | ;; since it may not be sent all at once. |
| 1502 | (if (string-match "\n" string) | 1498 | (if (string-match "\n" string) |
| @@ -1552,7 +1548,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." | |||
| 1552 | (if idlwave-shell-hide-output | 1548 | (if idlwave-shell-hide-output |
| 1553 | (if (and idlwave-shell-show-if-error | 1549 | (if (and idlwave-shell-show-if-error |
| 1554 | (eq idlwave-shell-current-state 'error)) | 1550 | (eq idlwave-shell-current-state 'error)) |
| 1555 | (idlwave-shell-comint-filter proc full-output) | 1551 | (comint-output-filter proc full-output) |
| 1556 | ;; If it's only *mostly* hidden, filter % lines, | 1552 | ;; If it's only *mostly* hidden, filter % lines, |
| 1557 | ;; and show anything that remains | 1553 | ;; and show anything that remains |
| 1558 | (if (eq idlwave-shell-hide-output 'mostly) | 1554 | (if (eq idlwave-shell-hide-output 'mostly) |
| @@ -1560,7 +1556,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." | |||
| 1560 | (idlwave-shell-filter-hidden-output | 1556 | (idlwave-shell-filter-hidden-output |
| 1561 | full-output))) | 1557 | full-output))) |
| 1562 | (if filtered | 1558 | (if filtered |
| 1563 | (idlwave-shell-comint-filter | 1559 | (comint-output-filter |
| 1564 | proc filtered)))))) | 1560 | proc filtered)))))) |
| 1565 | 1561 | ||
| 1566 | ;; Call the post-command hook | 1562 | ;; Call the post-command hook |