From 6ac22bc00cbdd8b42269af79c2dca4e89e001ff9 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 12 Aug 2020 18:35:29 +0200 Subject: [PATCH] Remove some compat code from allout.el * lisp/allout.el (allout-numbered-bullet) (allout-file-xref-bullet): string-or-null-p is always defined. --- lisp/allout.el | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lisp/allout.el b/lisp/allout.el index f52fa05ef68..05d9153a31d 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -722,10 +722,7 @@ disables numbering maintenance." :group 'allout) (make-variable-buffer-local 'allout-numbered-bullet) ;;;###autoload -(put 'allout-numbered-bullet 'safe-local-variable - (if (fboundp 'string-or-null-p) - 'string-or-null-p - (lambda (x) (or (stringp x) (null x))))) +(put 'allout-numbered-bullet 'safe-local-variable 'string-or-null-p) ;;;_ = allout-file-xref-bullet (defcustom allout-file-xref-bullet "@" "Bullet signifying file cross-references, for `allout-resolve-xref'. @@ -734,10 +731,7 @@ Set this var to the bullet you want to use for file cross-references." :type '(choice (const nil) string) :group 'allout) ;;;###autoload -(put 'allout-file-xref-bullet 'safe-local-variable - (if (fboundp 'string-or-null-p) - 'string-or-null-p - (lambda (x) (or (stringp x) (null x))))) +(put 'allout-file-xref-bullet 'safe-local-variable 'string-or-null-p) ;;;_ = allout-presentation-padding (defcustom allout-presentation-padding 2 "Presentation-format white-space padding factor, for greater indent." -- 2.39.5