From 5cb01ac5d78e52d276857b45cd1f17e5d53b7899 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 8 Jan 2023 12:43:56 +0200 Subject: ; * src/callint.c (Finteractive): Fix the doc string (bug#60645). --- src/callint.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/callint.c b/src/callint.c index c60a376b958..04bd64535c9 100644 --- a/src/callint.c +++ b/src/callint.c @@ -107,9 +107,12 @@ You may use `@', `*', and `^' together. They are processed in the If MODES is present, it should be a list of mode names (symbols) that this command is applicable for. The main effect of this is that -`M-x TAB' (by default) won't list this command if the current buffer's -mode doesn't match the list. That is, if either the major mode isn't -derived from them, or (when it's a minor mode) the mode isn't in effect. +`M-x TAB' will be able to exclude this command from the list of +completion candidates if the current buffer's mode doesn't match the list. +That is, if either the major mode isn't derived from them, or (when it's +a minor mode) the mode isn't in effect. Which commands are excluded +from the list of completion candidates is controlled by the value +of `read-extended-command-predicate', which see. usage: (interactive &optional ARG-DESCRIPTOR &rest MODES) */ attributes: const) -- cgit v1.2.1 From 1469aac20d8ebcd3c5cca898b814c305278d4c27 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 4 Jan 2023 13:40:17 -0800 Subject: ; * src/pgtkfns.c (parse_resource_key): Use recursive schema lookup XDG_DATA_DIRS may consist of multiple directories, and g_settings_schema_source_get_default composes these into a recursive schema source. One must pass TRUE to g_settings_schema_source_lookup, otherwise only the first directory in XDG_DATA_DIRS is searched. It follows that in the case that the directory containing the compiled GSettings schema for Emacs is not the first in XDG_DATA_DIRS, parse_resource_key will not accept any resource key, which causes pgtk_get_defaults_value and pgtk_set_defaults_value to fail. This impacts systems that compose multiple GSettings schema sources via XDG_DATA_DIRS, such Flatpak and NixOS. Supporting GIO documentation for g_settings_schema_source_get_default: > The returned source may actually consist of multiple schema sources > from different directories, depending on which directories were given > in `XDG_DATA_DIRS` and `GSETTINGS_SCHEMA_DIR`. For this reason, all > lookups performed against the default source should probably be done > recursively. Bug#60565 Copyright-paperwork-exempt: yes --- src/pgtkfns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 6b3a0459d36..6e5bb22375a 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -1902,7 +1902,7 @@ parse_resource_key (const char *res_key, char *setting_key) /* check existence of setting_key */ GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default (); - GSettingsSchema *scm = g_settings_schema_source_lookup (ssrc, SCHEMA_ID, FALSE); + GSettingsSchema *scm = g_settings_schema_source_lookup (ssrc, SCHEMA_ID, TRUE); if (!scm) return NULL; /* *.schema.xml is not installed. */ if (!g_settings_schema_has_key (scm, setting_key)) -- cgit v1.2.1 From ebc5263667b17af30d8e91b47aba0cdd67a389d4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2023 14:03:04 +0200 Subject: ; * src/callint.c (Finteractive): Doc string clarification. --- src/callint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/callint.c b/src/callint.c index 04bd64535c9..d8d2b278458 100644 --- a/src/callint.c +++ b/src/callint.c @@ -105,13 +105,12 @@ If the string begins with `^' and `shift-select-mode' is non-nil, You may use `@', `*', and `^' together. They are processed in the order that they appear, before reading any arguments. -If MODES is present, it should be a list of mode names (symbols) that -this command is applicable for. The main effect of this is that -`M-x TAB' will be able to exclude this command from the list of -completion candidates if the current buffer's mode doesn't match the list. -That is, if either the major mode isn't derived from them, or (when it's -a minor mode) the mode isn't in effect. Which commands are excluded -from the list of completion candidates is controlled by the value +If MODES is present, it should be one or more mode names (symbols) +for which this command is applicable. This is so that `M-x TAB' +will be able to exclude this command from the list of completion +candidates if the current buffer's mode doesn't match the list. +Which commands are excluded from the list of completion +candidates based on this information is controlled by the value of `read-extended-command-predicate', which see. usage: (interactive &optional ARG-DESCRIPTOR &rest MODES) */ -- cgit v1.2.1 From 5259f144d95d92dbda3d8db06b4f870bcfbb4a93 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2023 22:05:40 +0200 Subject: Remove unneeded restriction in using AEAD ciphers with GnuTLS * src/gnutls.c (gnutls_symmetric_aead): Disable the enforcement of block size on input data. (Bug#60693) --- src/gnutls.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/gnutls.c b/src/gnutls.c index e8528381efd..ca7e9fc4c73 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -2405,6 +2405,9 @@ gnutls_symmetric_aead (bool encrypting, gnutls_cipher_algorithm_t gca, aead_auth_size = aend_byte - astart_byte; } + /* Only block ciphers require that ISIZE be a multiple of the block + size, and AEAD ciphers are not block ciphers. */ +#if 0 ptrdiff_t expected_remainder = encrypting ? 0 : cipher_tag_size; ptrdiff_t cipher_block_size = gnutls_cipher_get_block_size (gca); @@ -2414,6 +2417,7 @@ gnutls_symmetric_aead (bool encrypting, gnutls_cipher_algorithm_t gca, "is not %"pD"d greater than a multiple of the required %"pD"d"), gnutls_cipher_get_name (gca), desc, isize, expected_remainder, cipher_block_size); +#endif ret = ((encrypting ? gnutls_aead_cipher_encrypt : gnutls_aead_cipher_decrypt) (acipher, vdata, vsize, aead_auth_data, aead_auth_size, -- cgit v1.2.1 From aa9df1260c3fe5e872bef926288ce345bedbe1bb Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Mon, 9 Jan 2023 20:15:12 -0800 Subject: Don't print named tree-sitter nodes with parenthesizes (bug#60696) * src/print.c (print_vectorlike): Use empty string as delimiters if the node is named. --- src/print.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/print.c b/src/print.c index d4a9ff89246..e65b4c40b0e 100644 --- a/src/print.c +++ b/src/print.c @@ -2034,8 +2034,13 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, /* Now the node must be up-to-date, and calling functions like Ftreesit_node_start will not signal. */ bool named = treesit_named_node_p (XTS_NODE (obj)->node); - const char *delim1 = named ? "(" : "\""; - const char *delim2 = named ? ")" : "\""; + /* We used to use () as delimiters for named nodes, but that + confuses pretty-printing a tad bit. There might be more + little breakages here and there if we print parenthesizes + inside an object, so I guess better not do it. + (bug#60696) */ + const char *delim1 = named ? "" : "\""; + const char *delim2 = named ? "" : "\""; print_c_string (delim1, printcharfun); print_string (Ftreesit_node_type (obj), printcharfun); print_c_string (delim2, printcharfun); -- cgit v1.2.1