From 0383937a7014934e7a9b3cf0c33c2d1f46e83901 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 4 Mar 2025 16:01:32 +0200 Subject: [PATCH 1/4] ; Improve documentation of 'shortdoc' * lisp/emacs-lisp/shortdoc.el (shortdoc-display-group): Fix doc string and wording of prompt. (Bug#76723) --- lisp/emacs-lisp/shortdoc.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el index 230df47821c..e74167cb1c7 100644 --- a/lisp/emacs-lisp/shortdoc.el +++ b/lisp/emacs-lisp/shortdoc.el @@ -1468,10 +1468,12 @@ A FUNC form can have any number of `:no-eval' (or `:no-value'), ;;;###autoload (defun shortdoc-display-group (group &optional function same-window) "Pop to a buffer with short documentation summary for functions in GROUP. +Interactively, prompt for GROUP. If FUNCTION is non-nil, place point on the entry for FUNCTION (if any). If SAME-WINDOW, don't pop to a new window." - (interactive (list (completing-read "Show summary for functions in: " - (mapcar #'car shortdoc--groups)))) + (interactive (list (completing-read + "Group of functions for which to show summary: " + (mapcar #'car shortdoc--groups)))) (when (stringp group) (setq group (intern group))) (unless (assq group shortdoc--groups) From 59fcb2aa1b2a827f1822b3bc2c9024f5a47338e7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 4 Mar 2025 17:23:16 +0200 Subject: [PATCH 2/4] ; * lisp/register.el (register-use-preview): Doc fix (bug#76739). --- lisp/register.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/register.el b/lisp/register.el index 31214ae3ba0..b0ee759ec5b 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -146,7 +146,10 @@ all; the preview buffer is still accessible with `help-char' (\\`C-h'). When set to `traditional' (the default), provide a more basic preview according to `register-preview-delay'; this preserves the traditional -behavior of Emacs 29 and before." +behavior of Emacs 29 and before. + +Setting this variable with `setq' has no effect; use either `setopt' +or `customize-option' to change its value." :type '(choice (const :tag "Use preview" t) (const :tag "Use preview and exit by pressing register name" insist) From 8099dc6e3aeae5bfd8a4115deed88022500362e1 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 27 Jan 2025 10:59:19 +0000 Subject: [PATCH 3/4] Provide an Android version code derived from the Emacs version The version code is intended to be an integer that increments for each Android package release (https://developer.android.com/studio/publish/versioning#versioningsettings). If we keep this updated under version control, then F-Droid (a third-party Android package repository), can watch for that, and use it to automatically build Emacs packages for Android each time a new Emacs release is tagged (https://f-droid.org/en/docs/Build_Metadata_Reference/#UpdateCheckData). * admin/admin.el (set-version): Update version code in java/incrementing-version-code * java/incrementing-version-code: New file containing an Android version code corresponding to the current Emacs version. (bug#75809) --- admin/admin.el | 7 +++++++ java/incrementing-version-code | 12 ++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 java/incrementing-version-code diff --git a/admin/admin.el b/admin/admin.el index 8fc970ed430..12891bc8c48 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -122,6 +122,13 @@ Root must be the root of an Emacs source tree." (rx (and "AC_INIT" (1+ (not (in ?,))) ?, (0+ space) ?\[ (submatch (1+ (in "0-9.")))))) + (set-version-in-file root "java/incrementing-version-code" + (apply #'format "%02d%02d%02d000" + (mapcar #'string-to-number + (split-string version "\\."))) + (rx (and line-start + (submatch (1+ (in digit))) + line-end))) (set-version-in-file root "nt/README.W32" version (rx (and "version" (1+ space) (submatch (1+ (in "0-9.")))))) diff --git a/java/incrementing-version-code b/java/incrementing-version-code new file mode 100644 index 00000000000..fed5b627275 --- /dev/null +++ b/java/incrementing-version-code @@ -0,0 +1,12 @@ +; This file contains an Android version code +; (https://developer.android.com/studio/publish/versioning#versioningsettings) +; corresponding to the current Emacs version. +; +; The version code in AndroidManifest.xml.in is hard-coded to a fixed +; value, to make package downgrades possible. Where an incrementing +; version code is required (for example, for automated F-Droid package +; builds (https://f-droid.org/packages/org.gnu.emacs/)), the version +; code in this file should be referred to and patched in to +; AndroidManifest.xml. + +300093000 From 121371a706491fde8c06d95b13c16703d53f6fa3 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 5 Mar 2025 14:59:19 +0800 Subject: [PATCH 4/4] Move java/incrementing-version-code to AndroidManifest.xml.in * admin/admin.el (admin-android-version-code-regexp): New variable. (set-version): Modify AndroidManifest.xml.in instead. * java/AndroidManifest.xml.in (Version-code): Define version code. * java/incrementing-version-code: Delete file. --- admin/admin.el | 10 ++++++---- java/AndroidManifest.xml.in | 15 +++++++++++++++ java/incrementing-version-code | 12 ------------ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/admin/admin.el b/admin/admin.el index 12891bc8c48..0f02ac8d9b1 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -98,6 +98,10 @@ Optional argument DATE is the release date, default today." (defvar admin-git-command (executable-find "git") "The `git' program to use.") +(defvar admin-android-version-code-regexp + "\\bAuto-incrementing version code\\(?:.\\|\n\\)*\\([[:digit:]]\\{9\\}\\)$" + "Regexp with which to detect the version code in AndroidManifest.xml.") + (defun set-version (root version) "Set Emacs version to VERSION in relevant files under ROOT. Root must be the root of an Emacs source tree." @@ -122,13 +126,11 @@ Root must be the root of an Emacs source tree." (rx (and "AC_INIT" (1+ (not (in ?,))) ?, (0+ space) ?\[ (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "java/incrementing-version-code" + (set-version-in-file root "java/AndroidManifest.xml.in" (apply #'format "%02d%02d%02d000" (mapcar #'string-to-number (split-string version "\\."))) - (rx (and line-start - (submatch (1+ (in digit))) - line-end))) + admin-android-version-code-regexp) (set-version-in-file root "nt/README.W32" version (rx (and "version" (1+ space) (submatch (1+ (in "0-9.")))))) diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index 6243c5e13ba..92b63925ef4 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in @@ -338,3 +338,18 @@ along with GNU Emacs. If not, see . --> android:label="GNU Emacs service"/> + + diff --git a/java/incrementing-version-code b/java/incrementing-version-code index fed5b627275..e69de29bb2d 100644 --- a/java/incrementing-version-code +++ b/java/incrementing-version-code @@ -1,12 +0,0 @@ -; This file contains an Android version code -; (https://developer.android.com/studio/publish/versioning#versioningsettings) -; corresponding to the current Emacs version. -; -; The version code in AndroidManifest.xml.in is hard-coded to a fixed -; value, to make package downgrades possible. Where an incrementing -; version code is required (for example, for automated F-Droid package -; builds (https://f-droid.org/packages/org.gnu.emacs/)), the version -; code in this file should be referred to and patched in to -; AndroidManifest.xml. - -300093000