mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Merge from origin/emacs-30

Browse Source 
78e6328faf ; (select-safe-coding-system-interactively): Say "safely ...
c5eba443ae ; * lisp/icomplete.el (icomplete-in-buffer): Doc fix (bug...
569186c36e ; * doc/lispref/display.texi (Face Attributes): Fix typo ...
d5723fc4f0 * lisp/progmodes/c-ts-mode.el (treesit-node-eq): Declare ...
0085e48f91 * admin/notes/emba: Docker builds do not run in a worktree.
3d30905b02 * lisp/calc/calc-ext.el (math-approx-sqrt-e): Doc fix (bu...
94d0e9c401 : Revert a mistaken change
4d90a1d820 ; * doc/emacs/search.texi (Word Search): Spelling fixes.
c154047c46 Fix c-ts-mode--anchor-prev-sibling (bug#73661)
b87fda63dd Fix formatting of long keyboard macros by 'list-keyboard-...
ae75ea6232 ; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (...
b120397868 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
de54d922b5 * doc/emacs/mini.texi (Passwords): Mention password visib...
0f8f077318 ; * doc/emacs/search.texi (Word Search): Document 'dictio...
fb155bcfb6 ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix.
6dbe4e99ac ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve...
d664227f81 ; More accurate documentation of 'file-newer-than-file-p'
e49b479f86 Fix c-ts-mode indentation for initializer lists (bug#73661)
f520008744 Avoid segfaults in Rmail-MIME
6a5c2edd84 Eglot: use :immediate t when resolving completions (bug#7...
cd36e070c2 Eglot: minor changes to doc and docstrings
1ea0d9b891 Revert "Set treesit-primary-parser for tree-sitter modes"
52746ceb62 Remove duplicate indent rules in elixir-ts-mode
ed57faafc7 Set treesit-primary-parser for tree-sitter modes
37a6c859b0 ; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capita...
2d4d6dc43a Delete XIE X extension from TODO
b68b9f291c ; * lisp/progmodes/csharp-mode.el (treesit-query-compile)...
688201ef18 ; * lisp/window.el (switch-to-prev-buffer-skip-regexp): D...
ba44fc9a44 Restore comment/string check for 'electric-layout-mode'
5a462948e1 Update Arni Magnusson's email address
6b1271b169 Fix python-ts-mode-map docstring
aaaafddc94 Normalize "Commentary" section in eudc.el
d656be9794 Expand email abbrevs in X-Debbugs-Cc header.
e9dcf0c57d Fix 'list-tags' when invoked from a non-file buffer
51ef05f684 count-windows: Fix reference to walk-windows
5eaf0c784b * lisp/info-look.el (mapc): Add use-package manual's index.
705a5a1a9e ; * ChangeLog.4: Fix attribution of one change.
bf26ff0dc8 Update csharp-ts-mode font-lock (bug#73369)
4c866abab9 ; * doc/lispref/variables.texi (Creating Buffer-Local): F...
d42d7d474f ; * lisp/doc-view.el (doc-view-svg-face): Copy-edit docst...
f46f476bb8 ; * admin/MAINTAINERS: Take VC subsystem, add note about ...
d68e6d2689 ; rcirc-update-activity-string: Justify some existing beh...
e6a37869c8 Fix inconsistency in value of rcirc-activity-string
108b3179bd Revert "; Minor clarification in variables.texi"
44156c2140 ; Minor clarification in variables.texi
63058e1153 Tag interactive commands in 'lua-ts-mode'
84bea20eba ; * lisp/info-look.el: Add two more links.
96b87ad536 Mention LSP acronym in eglot defgroup docstring
9c904e8cea Change :group of 'eglot' defgroup to 'tools'
fd1a1b0780 Remove out-of-date documentation from python.el
11e3e0cadd Fix executing commands in Eshell using "env" with no loca...
c0ef8a9a1b Fix a typo in the calendar manual
36ff7138fe ; Fix a thinko in sieve-manage.el
7abecbcd63 ; * nt/INSTALL: Update MinGW notes URL.  (Bug#73528)
e2b01d164c ; Fix last changes in php-ts-mode.el
e8830015b0 Require ert-x for use by 'ert-font-lock-deftest-file'
a1841b4d8e ; * admin/authors.el (authors-aliases): Don't ignore "one...
69d8f9d1b7 Fix php-ts-mode font-lock for latest PHP grammar (bug#73516)
68f53e4348 eieio.texi: Fix bug#73505
53c887fdf6 ; cperl-mode.el: Fix an invalid face specification
f5cd5585f4 ; Recommend GNU Find for 'find-dired'
65e589698e ; * lisp/filesets.el (filesets-homepage): Fix URL.
1f243a9780 Delete duplicated line in Viper refcard
This commit is contained in:
Michael Albinus 2024-10-18 17:56:08 +02:00
commit 674ad2ba7f
11 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/notes/emba
View File

@ -89,7 +89,7 @@ As usual in GitLab, the tests run in containers, which could be
applied also locally. Unfortunately, the Emba container registry,
emba.gnu.org:5050, is not accessible publicly. Instead, the container
images must be build locally. Change the current directory to a
recent Emacs branch, and apply the command
recent Emacs branch (not a worktree), and apply the command
docker build --target emacs-inotify --tag emacs-inotify \
-f test/infra/Dockerfile.emba .

12
doc/emacs/mini.texi
View File

@ -981,10 +981,14 @@ action with Emacs until you have submitted the password.
backwards, removing the last character entered. @kbd{C-u} deletes
everything you have typed so far. @kbd{C-g} quits the password prompt
(@pxref{Quitting}). @kbd{C-y} inserts the current kill into the
password (@pxref{Killing}). You may type either @key{RET} or
@key{ESC} to submit the password. Any other self-inserting character
key inserts the associated character into the password, and all other
input is ignored.
password (@pxref{Killing}). @key{TAB} toggles the visibility of the
password. You may type either @key{RET} or @key{ESC} to submit the
password. Any other self-inserting character key inserts the associated
character into the password, and all other input is ignored.
There is also an icon at the front of the mode line indicating the
password visibility. Clicking @kbd{mouse-1} on it toggles the password
visibility as well.
@node Yes or No Prompts
@section Yes or No Prompts

8
doc/emacs/search.texi
View File

@ -807,21 +807,21 @@ look up, using the word at point as the default, then asks the @sc{dict}
server to provide the definitions of that word in one or more
dictionaries. By default, the command first tries to connect to the
@sc{dict} server installed on the local host, and if that fails, it
tries @file{dict.org} after your confirmation; customize the variable
tries @file{dict.org} after asking for confirmation; customize the variable
@code{dictionary-server} to specify, as a string, the URL of a single
server to use (use @samp{localhost} if you want to query only the local
server). Normally, @code{dictionary-search} tells the server to look up
the word in all the dictionaries available to the server, but if you
invoke the command with a prefix argument, it will prompt for a single
dictionary to look. The list of dictionaries available to a server can
dictionary to use. The list of dictionaries available to a server can
be displayed by pressing the @samp{Select dictionary} button shown in
the @file{*Dictionary*} buffer, described below.
First time you use @code{dictionary-search}, it creates a new
The first time you use @code{dictionary-search}, it creates a new
@file{*Dictionary*} buffer and turns on a special mode in it. The
buffer shows buttons for selecting a dictionary, searching a definition
of another word, etc. Subsequent @code{dictionary-search} commands
reuse this buffer. To create another such buffer (e.g., too look up
reuse this buffer. To create another such buffer (e.g., to look up
other words, perhaps in another dictionary), type @w{@kbd{M-x dictionary
@key{RET}}}.

2
doc/lispref/display.texi
View File

@ -2769,7 +2769,7 @@ Draw a box with lines of width 1, in the foreground color.
Draw a box with lines of width 1, in color @var{color}.
@item @code{(:line-width (@var{vwidth} . @var{hwidth}) :color @var{color} :style @var{style})}
You can explicitly specify all aspects of the box with a plist on this
You can explicitly specify all aspects of the box with a plist of this
form. Any element in this plist can be omitted.
The values of @var{vwidth} and @var{hwidth} specify respectively the

2
lisp/calc/calc-ext.el
View File

@ -2069,7 +2069,7 @@ calc-kill calc-kill-region calc-yank))))
(defconst math-approx-sqrt-e
(math-read-number-simple "1.648721270700128146849")
"An approximation for sqrt(3).")
"An approximation for sqrt(e).")
(math-defcache math-sqrt-e math-approx-sqrt-e
(math-add-float '(float 1 0) (math-exp-minus-1-raw '(float 5 -1))))

12
lisp/icomplete.el
View File

@ -139,9 +139,17 @@ See `icomplete-delay-completions-threshold'."
:type 'integer)
(defcustom icomplete-in-buffer nil
"If non-nil, also use Icomplete when completing in non-mini buffers.
"If non-nil, use Icomplete when completing in buffers other than minibuffer.
This affects commands like `completion-in-region', but not commands
that use their own completions setup."
that use their own completions setup.
If you would prefer to see only Icomplete's in-buffer display, but do
not want the \"*Completions*\" buffer to pop up in those cases, add
this advice to your init file:
(advice-add \\='completion-at-point
:after #\\='minibuffer-hide-completions)
"
:type 'boolean)
(defcustom icomplete-minibuffer-setup-hook nil

6
lisp/international/mule-cmds.el
View File

@ -737,7 +737,7 @@ DEFAULT is the coding system to use by default in the query."
(format "string \"%s\"." from)
(format-message "buffer `%s'." bufname)))
(insert
"These default coding systems were tried to encode"
"These default coding systems were tried to safely encode"
(if (stringp from)
(concat " \"" (if (> (length from) 10)
(concat (substring from 0 10) "...\"")
@ -758,9 +758,9 @@ e.g., for sending an email message.\n ")
(insert (if rejected "The other coding systems"
"However, each of them")
(substitute-command-keys
" encountered characters it couldn't encode:\n"))
" encountered characters it couldn't encode safely:\n"))
(dolist (coding unsafe)
(insert (format " %s cannot encode these:" (car coding)))
(insert (format " %s cannot safely encode these:" (car coding)))
(let ((i 0)
(func1
(lambda (bufname pos)

2
lisp/kmacro.el
View File

@ -1576,7 +1576,7 @@ To customize possible responses, change the \"bindings\" in
,(format "%d" cnt)
,fmt
,(format fmt cnt)
,(format-kbd-macro (kmacro--keys km))])))
,(format-kbd-macro (kmacro--keys km) 1)])))
(kmacro-menu--kmacros))
kmacro-menu--deletion-flags nil
kmacro-menu--marks nil)

18
lisp/progmodes/c-ts-mode.el
View File

@ -85,6 +85,7 @@
(declare-function treesit-node-prev-sibling "treesit.c")
(declare-function treesit-node-first-child-for-pos "treesit.c")
(declare-function treesit-node-next-sibling "treesit.c")
(declare-function treesit-node-eq "treesit.c")
(declare-function treesit-query-compile "treesit.c")
;;; Custom variables
@ -335,16 +336,17 @@ characters of the current line."
((or "#elif" "#else")
(setq prev-sibling (treesit-node-prev-sibling
(treesit-node-parent prev-sibling) t)))
;; If the start of the previous sibling isn't at the
;; beginning of a line, something's probably not quite
;; right, go a step further. (E.g., comment after a
;; statement.) If the previous sibling is the first named
;; node then anchor to that, e.g. when returning an aggregate
;; and starting the items on the same line as {.
;; If the start of the previous sibling isn't at the beginning
;; of a line, something's probably not quite right, go a step
;; further. (E.g., comment after a statement.) If the
;; previous sibling is the first named node, then anchor to
;; that, e.g. when returning an aggregate and starting the
;; items on the same line as {.
(_ (goto-char (treesit-node-start prev-sibling))
(if (or (looking-back (rx bol (* whitespace))
(line-beginning-position)))
(null (treesit-node-prev-sibling prev-sibling t))
(line-beginning-position))
(treesit-node-eq (treesit-node-child parent 0 t)
prev-sibling))
(setq continue nil)
(setq prev-sibling
(treesit-node-prev-sibling prev-sibling)))))))

4
src/fileio.c
View File

@ -3787,8 +3787,8 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
doc: /* Return t if file FILE1 is newer than file FILE2.
If FILE1 does not exist, the answer is nil;
otherwise, if FILE2 does not exist, the answer is t.
If FILE1 does not exist, the return value is nil;
if FILE2 does not exist, the return value is t.
For existing files, this compares their last-modified times. */)
(Lisp_Object file1, Lisp_Object file2)
{

2
test/lisp/progmodes/c-ts-mode-resources/indent.erts
View File

@ -214,7 +214,7 @@ Name: Return Compund Literal
struct pair { int fst, snd; };
struct pair
make_pair(int long_identifier_a[], int long_identifier_b[],
int offset_a, int offset_b)
int offset_a, int offset_b)
{
int base_offset = 10;
return (struct pair) { long_identifier_a[base_offset + offset_b],