From c68d2581d5d30bb52c3d244030d47939b4b8d4cc Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 20 Aug 2023 14:29:27 +0200 Subject: [PATCH] Delete some Emacs 19/21 compat code * lisp/erc/erc-goodies.el (erc-occur): * lisp/net/newst-plainview.el (newsticker--buffer-redraw): Delete Emacs 21 compat code. * lisp/progmodes/sql.el (sql-accumulate-and-indent): Delete Emacs 19 compat code. --- lisp/erc/erc-goodies.el | 4 +--- lisp/net/newst-plainview.el | 4 +--- lisp/progmodes/sql.el | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index d9ededa8e68..b37855cbecc 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el @@ -800,9 +800,7 @@ servers. If called from a program, PROC specifies the server process." (list (read-string "Search for: ") (if current-prefix-arg nil erc-server-process))) - (if (fboundp 'multi-occur) - (multi-occur (erc-buffer-list nil proc) string) - (error "`multi-occur' is not defined as a function"))) + (multi-occur (erc-buffer-list nil proc) string)) (provide 'erc-goodies) diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index b284ca84bfc..55fa19cbf2a 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -1175,9 +1175,7 @@ The mode-line is changed accordingly." (defun newsticker--buffer-redraw () "Redraw the newsticker window." - (if (fboundp 'force-window-update) - (force-window-update (current-buffer)) - (redraw-frame)) + (force-window-update (current-buffer)) (run-hooks 'newsticker-buffer-change-hook) (sit-for 0)) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 279285b9326..61c8525b77a 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -3096,9 +3096,7 @@ displayed." (defun sql-accumulate-and-indent () "Continue SQL statement on the next line." (interactive) - (if (fboundp 'comint-accumulate) - (comint-accumulate) - (newline)) + (comint-accumulate) (indent-according-to-mode)) (defun sql-help-list-products (indent freep) -- 2.39.2