[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b5621dbe2f 1/2: Delete some compat code for very old Emacs versio
From: |
Stefan Kangas |
Subject: |
master b5621dbe2f 1/2: Delete some compat code for very old Emacs versions |
Date: |
Sat, 14 May 2022 19:10:36 -0400 (EDT) |
branch: master
commit b5621dbe2f4289d69c5fae57d9870de9fc413e87
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Delete some compat code for very old Emacs versions
* lisp/apropos.el (apropos-local-value):
* lisp/ido.el (ido-buffer-internal):
* lisp/leim/quail/ipa.el (ipa-x-sampa-prepend-to-keymap-entry):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/speedbar.el (speedbar-create-tag-hierarchy): Delete compat code
for very old versions of Emacs.
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Avoid using
obsolete name.
---
lisp/apropos.el | 2 +-
lisp/gnus/nnmail.el | 4 +---
lisp/ido.el | 3 +--
lisp/leim/quail/ipa.el | 2 +-
lisp/obsolete/iswitchb.el | 3 +--
lisp/speedbar.el | 4 +---
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/lisp/apropos.el b/lisp/apropos.el
index c57ca37e68..9970667179 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -874,7 +874,7 @@ Optional arg BUFFER (default: current buffer) is the buffer
to check."
apropos-all-words apropos-accumulator))
(setq var (apropos-value-internal #'local-variable-if-set-p symb
#'symbol-value)))
- (when (and (fboundp 'apropos-false-hit-str) (apropos-false-hit-str
var))
+ (when (apropos-false-hit-str var)
(setq var nil))
(when var
(setq apropos-accumulator (cons (list symb (apropos-score-str var)
nil var)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index c71627f83a..bde0de9892 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1937,9 +1937,7 @@ If TIME is nil, then return the cutoff time for oldness
instead."
(and (string-match (cadr regexp-target-pair) to)
(let ((mail-dont-reply-to-names
(message-dont-reply-to-names)))
- (equal (if (fboundp 'rmail-dont-reply-to)
- (rmail-dont-reply-to from)
- (mail-dont-reply-to from)) "")))))
+ (equal (mail-dont-reply-to from) "")))))
(setq target (format-time-string (caddr regexp-target-pair) date)))
((and (not (equal header 'to-from))
(string-match (cadr regexp-target-pair)
diff --git a/lisp/ido.el b/lisp/ido.el
index e068028d91..e5717d6e53 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2238,8 +2238,7 @@ If cursor is not at the end of the user input, move to
end of input."
(t
(add-to-history 'buffer-name-history buf)
(setq buf (get-buffer-create buf))
- (if (fboundp 'set-buffer-major-mode)
- (set-buffer-major-mode buf))
+ (set-buffer-major-mode buf)
(ido-visit-buffer buf method t))))))
(defun ido-record-work-directory (&optional dir)
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el
index 1eb2255f6c..773dc31f9b 100644
--- a/lisp/leim/quail/ipa.el
+++ b/lisp/leim/quail/ipa.el
@@ -269,7 +269,7 @@ QUAIL-KEYMAP is a cons that satisfies `quail-map-p';
TO-PREPEND is a
string."
(when (consp quail-keymap) (setq quail-keymap (cdr quail-keymap)))
(if (or (integerp quail-keymap)
- (and (fboundp 'characterp) (characterp quail-keymap)))
+ (characterp quail-keymap))
(setq quail-keymap (list (string quail-keymap)))
(if (stringp quail-keymap)
(setq quail-keymap (list quail-keymap))
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index 2825ea1136..1929d1994e 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -1064,8 +1064,7 @@ Return the modified list with the last element prepended
to it."
;; then create a new buffer
(progn
(setq newbufcreated (get-buffer-create buf))
- (if (fboundp 'set-buffer-major-mode)
- (set-buffer-major-mode newbufcreated))
+ (set-buffer-major-mode newbufcreated)
(iswitchb-visit-buffer newbufcreated))
;; else won't create new buffer
(message "no buffer matching `%s'" buf))))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index b2e7be1505..5fe7e7ea34 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2276,9 +2276,7 @@ the list."
(with-current-buffer (get-file-buffer f)
speedbar-tag-hierarchy-method)
speedbar-tag-hierarchy-method))
- (lst (if (fboundp 'copy-tree)
- (copy-tree lst)
- lst)))
+ (lst (copy-tree lst)))
(while methods
(setq lst (funcall (car methods) lst)
methods (cdr methods)))