[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a6db8464e1 2/4: ; Fix byte-compilation warnings in admin/*.el
From: |
Mattias Engdegård |
Subject: |
master a6db8464e1 2/4: ; Fix byte-compilation warnings in admin/*.el |
Date: |
Thu, 29 Dec 2022 06:44:03 -0500 (EST) |
branch: master
commit a6db8464e150c49724c71c5969b97f205ee2dec5
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>
; Fix byte-compilation warnings in admin/*.el
---
admin/admin.el | 3 +++
admin/find-gc.el | 2 +-
admin/gitmerge.el | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/admin/admin.el b/admin/admin.el
index 6a67f172e2..12c9c10b1a 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -843,8 +843,11 @@ $Date: %s $
(package-install pkg)
(require pkg nil t))))
+(declare-function org-html-export-as-html "ox-html.el")
(defvar org-html-postamble)
(defvar org-html-mathjax-template)
+(defvar htmlize-output-type)
+
(defun make-news-html-file (root version)
"Convert the NEWS file into an HTML file."
(interactive (let ((root
diff --git a/admin/find-gc.el b/admin/find-gc.el
index 1c3c419c56..6b0e2a3d80 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -100,7 +100,7 @@ Also store it in `find-gc-unsafe-list'."
-(defun trace-call-tree (&optional ignored)
+(defun trace-call-tree (&optional _ignored)
(message "Setting up directories...")
(setq find-gc-subrs-called nil)
(let ((case-fold-search nil)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index ddd3e18442..1ff8137e15 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -293,7 +293,7 @@ should not be skipped."
"Try to resolve conflicts in FILE with smerge.
Returns non-nil if conflicts remain."
(unless (file-exists-p file) (error "Gitmerge-resolve: Can't find %s" file))
- (with-demoted-errors
+ (with-demoted-errors "Error: %S"
(let ((exists (find-buffer-visiting file)))
(with-current-buffer (let ((enable-local-variables :safe)
(enable-local-eval nil))