procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-29

Browse source 
01ebc95114 Fix 'help-quick-toggle'
afe49c7e2a ; * admin/authors.el (authors-aliases): Fix last change.
8b1f10f8cf ; Normalize Morgan Smith's attributions.
70cf4b694b ; * etc/PROBLEMS: Describe input lags due to GTK IM (bug#...
f28a557c7d * doc/lispref/modes.texi (Tabulated List Mode): Update.
d6131b5902 * lisp/net/tramp.el (tramp-methods): Fix typo in docstrin...
2eb85a9de1 ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Ano...
4c6653f23a ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Doc...
5a64d2c759 java-ts-mode: Indentation for opening brace on a separate...
9e56bd5ed8 Removed decommissioned PGP keyservers
e56f0ef51b org: Fix security prompt for downloading remote resource
65ba327465 Revert "Update to Org 9.6.19"
07a392f445 Update to Org 9.6.19
This commit is contained in:
Eli Zaretskii 2024-02-24 06:35:16 -05:00
commit 229b3edb07
11 changed files with 82 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.mailmap
View file

@ -129,7 +129,7 @@ Maxim Nikulin <manikulin@gmail.com>
Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
Michalis V <mvar.40k@gmail.com>
Miha Rihtaršič <miha@kamnitnik.top>
Morgan J. Smith <Morgan.J.Smith@outlook.com>
Morgan Smith <Morgan.J.Smith@outlook.com>
Nick Drozd <nicholasdrozd@gmail.com>
Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
Nitish Chandra <nitishchandrachinta@gmail.com>

3
admin/authors.el
View file

@ -175,6 +175,9 @@ files.")
("Michalis V" "^mvar")
("Miha Rihtaršič" "Miha Rihtarsic")
("Mikio Nakajima" "Nakajima Mikio")
(nil "montag451@laposte\\.net")
(nil "na@aisrntairetnraoitn")
("Morgan Smith" "Morgan J\\. Smith")
("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
("Noah Peart" "noah\\.v\\.peart@gmail\\.com")
("Noorul Islam" "Noorul Islam K M")

9
doc/lispref/modes.texi
View file

@ -1189,7 +1189,7 @@ column is sorted in the descending order.
This buffer-local variable specifies the format of the Tabulated List
data. Its value should be a vector. Each element of the vector
represents a data column, and should be a list @code{(@var{name}
@var{width} @var{sort})}, where
@var{width} @var{sort} . @var{props})}, where
@itemize
@item
@ -1206,6 +1206,13 @@ sorted by comparing string values. Otherwise, this should be a
predicate function for @code{sort} (@pxref{Rearrangement}), which
accepts two arguments with the same form as the elements of
@code{tabulated-list-entries} (see below).
@item
@var{props} is a plist (@pxref{Property Lists}) of additional column
properties. If the value of the property @code{:right-align} is
non-@code{nil} then the column should be right-aligned. And the
property @code{:pad-right} specifies the number of additional padding
spaces to the right of the column (by default 1 if omitted).
@end itemize
@end defvar

15
etc/PROBLEMS
View file

@ -432,7 +432,7 @@ than the corresponding .el file.
Alternatively, if you set the option 'load-prefer-newer' non-nil,
Emacs will load whichever version of a file is the newest.
*** Watch out for the EMACSLOADPATH environment variable
*** Watch out for the EMACSLOADPATH environment variable.
EMACSLOADPATH overrides which directories the function "load" will search.
@ -441,7 +441,7 @@ environment.
** Keyboard problems
*** PGTK build of Emacs running on Wayland doesn't recognize Hyper modifier
*** PGTK build of Emacs running on Wayland doesn't recognize Hyper modifier.
If you arrange for the Wayland compositor to send the Hyper key
modifier (e.g., via XKB customizations), the Hyper modifier will still
@ -452,6 +452,17 @@ Since GDK 3.x is no longer developed, this bug in GDK will probably
never be solved. And the Emacs PGTK build cannot yet support GTK4,
where this problem is reportedly solved.
*** Emacs built with GTK lags in its response to keyboard input.
This can happen when input methods are used. It happens because Emacs
behaves in an unconventional way with respect to GTK input methods: it
registers to receive keyboard input as unprocessed key events with
metadata (as opposed to receiving them as text strings). Most GTK
programs use the latter approach, so some modern input methods have
bugs and misbehave when faced with the way Emacs does it.
A workaround is to set GTK_IM_MODULE=none in the environment, or maybe
find a different input method without these problems.
*** Unable to enter the M-| key on some German keyboards.
Some users have reported that M-| suffers from "keyboard ghosting".
This can't be fixed by Emacs, as the keypress never gets passed to it

8
lisp/emacs-lisp/pcase.el
View file

@ -285,8 +285,8 @@ As with `pcase-let', BINDINGS are of the form (PATTERN EXP), but the
EXP in each binding in BINDINGS can use the results of the destructuring
bindings that precede it in BINDINGS' order.
Each EXP should match (i.e. be of compatible structure) to its
respective PATTERN; a mismatch may signal an error or may go
Each EXP should match its respective PATTERN (i.e. be of structure
compatible to PATTERN); a mismatch may signal an error or may go
undetected, binding variables to arbitrary values, such as nil."
(declare (indent 1)
(debug ((&rest (pcase-PAT &optional form)) body)))
@ -307,8 +307,8 @@ All EXPs are evaluated first, and then used to perform destructuring
bindings by matching each EXP against its respective PATTERN. Then
BODY is evaluated with those bindings in effect.
Each EXP should match (i.e. be of compatible structure) to its
respective PATTERN; a mismatch may signal an error or may go
Each EXP should match its respective PATTERN (i.e. be of structure
compatible to PATTERN); a mismatch may signal an error or may go
undetected, binding variables to arbitrary values, such as nil."
(declare (indent 1) (debug pcase-let*))
(if (null (cdr bindings))

3
lisp/epa-ks.el
View file

@ -47,11 +47,8 @@ This is used by `epa-search-keys', for looking up public keys."
(repeat :tag "Random pool"
(string :tag "Keyserver address"))
(const "keyring.debian.org")
(const "keys.gnupg.net")
(const "keyserver.ubuntu.com")
(const "pgp.mit.edu")
(const "pool.sks-keyservers.net")
(const "zimmermann.mayfirst.org")
(string :tag "Custom keyserver"))
:version "28.1")

12
lisp/help.el
View file

@ -151,7 +151,7 @@ buffer.")
("Mark & Kill"
(set-mark-command . "mark")
(kill-line . "kill line")
(kill-ring-save . "kill region")
(kill-region . "kill region")
(yank . "yank")
(exchange-point-and-mark . "swap"))
("Projects"
@ -165,7 +165,15 @@ buffer.")
(isearch-forward . "search")
(isearch-backward . "reverse search")
(query-replace . "search & replace")
(fill-paragraph . "reformat"))))
(fill-paragraph . "reformat")))
"Data structure for `help-quick'.
Value should be a list of elements, each element should of the form
(GROUP-NAME (COMMAND . DESCRIPTION) (COMMAND . DESCRIPTION)...)
where GROUP-NAME is the name of the group of the commands,
COMMAND is the symbol of a command and DESCRIPTION is its short
description, 10 to 15 char5acters at most.")
(declare-function prop-match-value "text-property-search" (match))

4
lisp/net/tramp.el
View file

@ -324,8 +324,8 @@ pair of the form (KEY VALUE). The following KEYs are defined:
chosen port for the remote listener.
* `tramp-copy-keep-date'
This specifies whether the copying program when the preserves the
timestamp of the original file.
This specifies whether the copying program preserves the timestamp
of the original file.
* `tramp-copy-keep-tmpfile'
This specifies whether a temporary local file shall be kept

2
lisp/org/org.el
View file

@ -4685,7 +4685,7 @@ returns non-nil if any of them match."
(if (and (= char ?f) current-file)
(concat "file://" current-file) uri))
"\\'")))))
(prog1 (memq char '(?y ?n ?! ?d ?\s ?f))
(prog1 (memq char '(?y ?! ?d ?\s ?f))
(quit-window t)))))))
(defun org-extract-log-state-settings (x)

13
lisp/progmodes/java-ts-mode.el
View file

@ -74,7 +74,12 @@
((parent-is "program") column-0 0)
((match "}" "element_value_array_initializer")
parent-bol 0)
((node-is "}") column-0 c-ts-common-statement-offset)
((node-is
,(format "\\`%s\\'"
(regexp-opt '("constructor_body" "class_body" "interface_body"
"block" "switch_block" "array_initializer"))))
parent-bol 0)
((node-is "}") standalone-parent 0)
((node-is ")") parent-bol 0)
((node-is "else") parent-bol 0)
((node-is "]") parent-bol 0)
@ -86,10 +91,10 @@
((parent-is "array_initializer") parent-bol java-ts-mode-indent-offset)
((parent-is "annotation_type_body") column-0 c-ts-common-statement-offset)
((parent-is "interface_body") column-0 c-ts-common-statement-offset)
((parent-is "constructor_body") column-0 c-ts-common-statement-offset)
((parent-is "constructor_body") standalone-parent java-ts-mode-indent-offset)
((parent-is "enum_body_declarations") parent-bol 0)
((parent-is "enum_body") column-0 c-ts-common-statement-offset)
((parent-is "switch_block") column-0 c-ts-common-statement-offset)
((parent-is "switch_block") standalone-parent java-ts-mode-indent-offset)
((parent-is "record_declaration_body") column-0 c-ts-common-statement-offset)
((query "(method_declaration (block _ @indent))") parent-bol java-ts-mode-indent-offset)
((query "(method_declaration (block (_) @indent))") parent-bol java-ts-mode-indent-offset)
@ -125,7 +130,7 @@
((parent-is "case_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "labeled_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "do_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "block") column-0 c-ts-common-statement-offset)))
((parent-is "block") standalone-parent java-ts-mode-indent-offset)))
"Tree-sitter indent rules.")
(defvar java-ts-mode--keywords

31
test/lisp/progmodes/java-ts-mode-resources/indent.erts
View file

@ -110,3 +110,34 @@ public class Java {
}
}
=-=-=
Name: Opening bracket on separate line (bug#67556)
=-=
public class Java {
void foo(
String foo)
{
for (var f : rs)
return new String[]
{
"foo",
"bar"
};
if (a == 0)
{
return 0;
} else if (a == 1)
{
return 1;
}
switch(expr)
{
case x:
// code block
break;
}
}
}
=-=-=