diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/MAINTAINERS | 4 | ||||
| -rw-r--r-- | admin/admin.el | 5 | ||||
| -rw-r--r-- | admin/find-gc.el | 2 | ||||
| -rw-r--r-- | admin/gitmerge.el | 2 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 11 | ||||
| -rw-r--r-- | admin/notes/elpa | 2 | ||||
| -rw-r--r-- | admin/notes/git-workflow | 10 |
7 files changed, 20 insertions, 16 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 6e080d1f5bb..1273e9a976b 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -294,7 +294,7 @@ Po Lu Tramp Maintainer: Michael Albinus - Repository: git://git.savannah.gnu.org/tramp.git + Repository: https://git.savannah.gnu.org/git/tramp.git Mailing List: tramp-devel@gnu.org Bug Reports: M-x tramp-bug Notes: For backward compatibility requirements, see @@ -316,7 +316,7 @@ Modus themes Org Mode Home Page: https://orgmode.org/ Maintainer: Org Mode developers - Repository: git://git.sv.gnu.org/emacs/org-mode.git + Repository: https://git.savannah.gnu.org/git/emacs/org-mode.git Mailing list: emacs-orgmode@gnu.org Bug Reports: M-x org-submit-bug-report Notes: Org Mode is maintained as a separate project that is diff --git a/admin/admin.el b/admin/admin.el index 735d426b09b..90f810b79c6 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -110,7 +110,7 @@ Root must be the root of an Emacs source tree." (submatch (1+ (in "0-9.")))))) (set-version-in-file root "configure.ac" version (rx (and "AC_INIT" (1+ (not (in ?,))) - ?, (0+ space) ?\[ + ?, (0+ space) (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/README.W32" version (rx (and "version" (1+ space) @@ -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 cce4a8402a7..7cb319d867a 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 a172fa2bc9b..396d2fe2ac5 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)) diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 6aa52bc7539..04e3e34b9f9 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -23,27 +23,28 @@ # written by Paul Eggert -GNULIB_URL=git://git.savannah.gnu.org/gnulib.git +GNULIB_URL=https://git.savannah.gnu.org/git/gnulib.git GNULIB_MODULES=' - alloca-opt binary-io byteswap c-ctype c-strcase + alignasof alloca-opt binary-io byteswap c-ctype c-strcase canonicalize-lgpl careadlinkat close-stream copy-file-range count-leading-zeros count-one-bits count-trailing-zeros crypto/md5 crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer d-type diffseq double-slash-root dtoastr dtotimespec dup2 - environ execinfo explicit_bzero faccessat + environ execinfo faccessat fchmodat fcntl fcntl-h fdopendir file-has-acl filemode filename filevercmp flexmember fpieee free-posix fstatat fsusage fsync futimens getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog ieee754-h ignore-value intprops largefile libgmp lstat - manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime + manywarnings memmem-simple mempcpy memrchr memset_explicit + minmax mkostemp mktime nanosleep nproc nstrftime pathmax pipe2 pselect pthread_sigmask qcopy-acl readlink readlinkat regex - sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stdbool stddef stdio + sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio stpcpy strnlen strtoimax symlink sys_stat sys_time tempname time time_r time_rz timegm timer-time timespec-add timespec-sub update-copyright unlocked-io utimensat diff --git a/admin/notes/elpa b/admin/notes/elpa index 1e9e7a9f52b..afcda71d1dd 100644 --- a/admin/notes/elpa +++ b/admin/notes/elpa @@ -3,7 +3,7 @@ NOTES ON THE EMACS PACKAGE ARCHIVE The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git repository named "elpa", hosted on Savannah. To check it out: - git clone git://git.sv.gnu.org/emacs/elpa + git clone https://git.savannah.gnu.org/git/emacs/elpa cd elpa make setup diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index 717fc550776..d33f49a1aca 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -16,14 +16,14 @@ Initial setup Then we want to clone the repository. We normally want to have both the current master and (if there is one) the active release branch -(eg emacs-28). +(eg emacs-29). mkdir ~/emacs cd ~/emacs git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master cd master git config push.default current -git worktree add ../emacs-28 emacs-28 +git worktree add ../emacs-29 emacs-29 You now have both branches conveniently accessible, and you can do "git pull" in them once in a while to keep updated. @@ -67,10 +67,10 @@ which will look like commit 958b768a6534ae6e77a8547a56fc31b46b63710b -cd ~/emacs/emacs-28 +cd ~/emacs/emacs-29 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b -and optionally add "Backport:" to the commit string. Then +and add "Backport:" to the commit string. Then git push @@ -109,7 +109,7 @@ up-to-date by doing a pull. Then start Emacs with emacs -l admin/gitmerge.el -f gitmerge You'll be asked for the branch to merge, which will default to -(eg) 'origin/emacs-28', which you should accept. Merging a local tracking +(eg) 'origin/emacs-29', which you should accept. Merging a local tracking branch is discouraged, since it might not be up-to-date, or worse, contain commits from you which are not yet pushed upstream. |