branch: scratch/hyperbole
commit 772e9e0119fe004aa873cb1d180a5dd76ca817b3
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* hyperbole.el (kotl-autoloads): Provide fallback for Emacs-27
---
hyperbole.el | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hyperbole.el b/hyperbole.el
index 8ce098ed28..088ddbfbb6 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -566,15 +566,15 @@ frame, those functions by default still return the prior
frame."
;; Autoload this form so that when `package.el' activates Hyperbole's autoloads
;; it also sets up Kotl's autoloads.
;;;###autoload
-(when (fboundp 'macroexp-file-name)
- (let ((us (macroexp-file-name)))
- (when us
- ;; FIXME: Contrary to the usual ELPA autoloads files, `kotl-autoloads'
- ;; does not add its directory to `load-path', so let's do it here by
- ;; hand.
- (add-to-list 'load-path
- (expand-file-name "kotl" (file-name-directory us)))
- (require 'kotl-autoloads nil t))))
+(let ((us (if (fboundp 'macroexp-file-name)
+ (macroexp-file-name) load-file-name)))
+ (when us
+ ;; FIXME: Contrary to the usual ELPA autoloads files, `kotl-autoloads'
+ ;; does not add its directory to `load-path', so let's do it here by
+ ;; hand.
+ (add-to-list 'load-path
+ (expand-file-name "kotl" (file-name-directory us)))
+ (require 'kotl-autoloads nil t)))
(provide 'hyperbole)
