diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /admin | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 3 | ||||
| -rw-r--r-- | admin/find-gc.el | 2 | ||||
| -rwxr-xr-x | admin/git-bisect-start | 2 | ||||
| -rw-r--r-- | admin/gitmerge.el | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/admin/admin.el b/admin/admin.el index 6a67f172e2c..12c9c10b1a5 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 1c3c419c563..6b0e2a3d803 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/git-bisect-start b/admin/git-bisect-start index 945d4901c1b..227ea0ba059 100755 --- a/admin/git-bisect-start +++ b/admin/git-bisect-start @@ -66,7 +66,7 @@ $REAL_GIT bisect start "$@" ## already on master. In other words, it is the parent of the merge ## commit for which 'git rev-list --max-parents=0 <commit>' does not ## include ce5584125c44a1a2fbb46e810459c50b227a95e2 (which is the root -## commit of the Emacs respository). +## commit of the Emacs repository). for C in $(cat $0 | grep '^# SKIP-BRANCH ' | sed 's/^# SKIP-BRANCH //') do diff --git a/admin/gitmerge.el b/admin/gitmerge.el index ddd3e184424..1ff8137e154 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)) |