1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Commit graph

173751 commits

Author SHA1 Message Date
Michael Albinus
ce4f56caf7 Extend treesitter tests on emba
* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
grammar.

* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
(tree-sitter-files): Rename from tree-sitter-files-template.
Generate .tree-sitter-files.

* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.
2024-06-24 20:02:07 +02:00
Robert Pluim
7e8a97ac78 Show entries from key-translation-map in which-key mode
* lisp/which-key.el (which-key-extra-keymaps): New user option.
(which-key--get-current-bindings): Consult it.

(Bug#71648)
2024-06-24 19:17:38 +02:00
Juri Linkov
4a0958642d * lisp/tab-bar.el (tab-bar-tab-group-face-function): Improve doc (bug#71733). 2024-06-24 19:57:57 +03:00
Ulrich Müller
a769f171e7 ; Fix flymake tests with GCC 14.
* test/lisp/progmodes/flymake-tests.el (included-c-header-files):
Fix test failure with GCC 14.  (Bug#71749)
2024-06-24 15:45:42 +02:00
Robert Pluim
96e27c2ecf Don't show char name for multi-char translations
I forgot about shift-translation when implementing this originally, so
this code was being triggered for things like 'C-S-<up>'.

* lisp/help.el (help-key-description): Check if the translation result
is a single char.

(Bug#71411)
2024-06-24 14:39:03 +02:00
Robert Pluim
0715abfa86 Reset ls-lisp-use-string-collate when ls-lisp-emulation changes
* lisp/ls-lisp.el (ls-lisp-set-options): Add ls-lisp-use-string-collate
to the list of custom options that are reset when ls-lisp-emulation
changes.

https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00135.html
2024-06-24 14:39:03 +02:00
Jonas Bernoulli
4fcc38966b
Update to Transient v0.7.2-1-gf273c0c8
This fixes two bugs, one of them restoring compatibility with the
version that ships with Emacs 29, making emoji-insert usable again.
The other changes are of cosmetic nature.  The only exception is a new
command, whose creation lead to the discovery of one of the bugs, and
remains unused until a package author actually binds it in a prefix.
I.e., unless someone actually uses this, the risk of a regression is
close to zero, and even if it is used, it can only affect the prefix
that binds it.
2024-06-24 13:38:35 +02:00
Andreas Schwab
b7d5ca3a8f * doc/misc/calc.texi (Musical Notes): Fix typo. 2024-06-24 13:23:07 +02:00
Robert Pluim
164f75822b ; Fix typos
* ChangeLog.3: It's "its", not "it's", for the possessive.
* ChangeLog.4: And here.
2024-06-24 11:19:28 +02:00
Philip Kaludercic
768e92b9c0
Update options that depend on 'which-key-dont-use-unicode'
* lisp/which-key.el (which-key-dont-use-unicode): Add a custom setter
that re-evaluates a manual list of options use
'which-key-dont-use-unicode' to determine their default value.

https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00130.html
2024-06-24 09:46:09 +02:00
Eshel Yaron
4b2682b17c
; Remove debugging message in Completion Preview test
* test/lisp/completion-preview-tests.el
(completion-preview-complete): Remove leftover debug message.
2024-06-24 08:22:12 +02:00
Po Lu
73a58329a6 Fix omission of updates to child frames on Android
* java/org/gnu/emacs/EmacsView.java (onAttachedFromWindow):
Force a layout cycle rather than report exposure immediately.
(prepareForLayout): Delete function.

* java/org/gnu/emacs/EmacsWindow.java (mapWindow): Remove
redundant calls to prepareForLayout.

* src/androidterm.c (handle_one_android_event): Do not swap
buffers when exposure is registered by a frame only partially
updated.
2024-06-24 12:04:05 +08:00
Damien Cassou
0edacf2aa7 Add jsdoc support to js-ts-mode
* lisp/progmodes/js.el (js--treesit-font-lock-settings): Add jsdoc
font-lock settings.
(js--treesit-jsdoc-beginning-regexp): New variable to match the
beginning of a jsdoc block.
(js-ts-mode): Add jsdoc support. Save the 'javascript parser to
`treesit-primary-parser'. Configure `treesit-range-settings' to
use a jsdoc parser within a JavaScript file.
(js-ts-language-at-point): New function to return either 'jsdoc or
'javascript depending on where the point is.
2024-06-24 01:31:03 +03:00
Eli Zaretskii
cace0cbee9 ; Restore inadvertently removed line. 2024-06-23 22:22:12 +03:00
Eli Zaretskii
2b04effb13 ; * test/lisp/net/shr-tests.el (shr-test--rendering-check): Use UTF-8. 2024-06-23 22:17:37 +03:00
Jim Porter
6619aec6bc ; Don't run new 'shr-test/zoom-image' when built without image support
* test/lisp/net/shr-tests.el (shr-test/zoom-image): Skip when
'image-types' is unbound.
2024-06-23 11:40:30 -07:00
Eli Zaretskii
5d19bfda32 ; * admin/release-branch.txt: Update and fix typo. 2024-06-23 20:57:26 +03:00
Stefan Kangas
fb11294d41 ; Fix typos 2024-06-23 16:40:06 +02:00
Michael Albinus
d9bd1718f9 Backport: Minor changes in tramp-tests.el
* test/lisp/net/tramp-tests.el (tramp--test-shell-file-name):
Use connection-local value.
(tramp--test-shell-command-switch): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name): Use it.
(tramp--test-supports-processes-p): Simplify.
(tramp--test-check-files): Use `tramp-compat-seq-keep'.
(tramp-test45-asynchronous-requests): Don't let-bind `shell-file-name'.
(tramp-test45-asynchronous-requests): Adjust timer.
(tramp-test45-asynchronous-requests): Add another test message.

(cherry picked from commit c95caade15)
2024-06-23 14:00:57 +02:00
Michael Albinus
1728de5a77 Backport: Tramp: Fix bug#71709, and other minor changes
* lisp/net/tramp-message.el (tramp-backtrace): Print also in batch mode.

* lisp/net/tramp.el (tramp-skeleton-file-exists-p): Check for
property only.
(tramp-skeleton-make-process): Don't set `default-directory'.
(tramp-handle-make-process): Set it.  (Bug#71709)

(cherry picked from commit 8456cb9b69)
2024-06-23 13:59:57 +02:00
Eli Zaretskii
dd0fc6aff6 New branch emacs-30
* README:
* configure.ac:
* nt/README.W32:
* etc/refcards/ru-refcard.tex:
* msdos/sed2v2.inp:
* lisp/cus-edit.el (customize-changed-options-previous-release):
Cut the emacs-30 release branch.
2024-06-23 06:48:54 -04:00
Eli Zaretskii
bc72c33ac3 * admin/admin.el: (set-version): Fix regexp for configure.ac. 2024-06-23 06:42:29 -04:00
Po Lu
60475a73d1 Disable Ffile_system_info for Android special directories
* src/fileio.c (Ffile_system_info): Return Qnil if FILENAME
refers to a special directory.
2024-06-23 16:43:35 +08:00
Martin Rudalics
5f8a9cd4b6 Fix a bug in 'switch-to-buffer'
* lisp/window.el (switch-to-buffer): When asked to switch to the
buffer of the selected window,
'switch-to-buffer-obey-display-actions' is non-nil and
'pop-to-buffer' uses the selected window, don't try to restore
window start and point from 'window-prev-buffers' (Bug#71616).
2024-06-23 10:26:57 +02:00
Jim Porter
5f9b5803be Fix zooming images in SHR
Previously, for images with no alt-text, the zoomed image wouldn't get
properly inserted.  For images with alt-text, both the zoomed and
unzoomed image would be displayed at once (bug#71666).

* lisp/net/shr.el (shr-sliced-image): New face.
(shr-zoom-image): Reimplement using
'next/previous-single-property-change', and don't bother deleting any of
the text.
(shr-image-fetched): Clean up any overlays when deleting the old region.
(shr-put-image): Ensure we always have a non-empty string to put the
image on.  For sliced images, just use "*", since we'll repeat it, so we
can't preserve the original buffer text exactly anyway.  Apply an
overlay to sliced images to prevent unsightly text decorations.
(shr-tag-img): Move the placeholder space insertion where it should be
and explain what it's doing.

* test/lisp/net/shr-tests.el (shr-test--max-wait-time)
(shr-test-wait-for): New helper functions.
(shr-test/zoom-image): New test.
2024-06-22 23:09:00 -07:00
Eli Zaretskii
6f2036243f ; Doc fix in 'php-ts-mode'.
* lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors):
Doc fix.
2024-06-23 08:01:28 +03:00
Vincenzo Pupillo
2f1c882a16 Colorize CSS property value like `css--fontify-region'
If the value of a property is text representing a CSS color,
it will be fontified such that its background is the color
itself. 'php-ts-mode-css-fontify-colors' can be used to
disable this behaviour.
* lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors):
New custom var.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--colorize-css-value):
New function.
* lisp/progmodes/php-ts-mode.el (php-ts-mode): Use the new
function.  (Bug#71724)
2024-06-23 07:57:52 +03:00
Eli Zaretskii
dd0994aa36 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs 2024-06-23 07:57:22 +03:00
Po Lu
486ea8ef5a * configure.ac: Disable kqueue on Haiku. 2024-06-23 12:52:55 +08:00
Vincenzo Pupillo
737fa7c529 Fix 'Customize' menu entry for 'php-ts-mode'
* lisp/progmodes/php-ts-mode.el (php-ts-mode-menu):
Replace menu entry with 'php-ts-mode' group.  (Bug#71723)
2024-06-23 07:50:55 +03:00
Po Lu
cb7be6035e Fix compilation on prerelease versions of Haiku
* src/kqueue.c (Fkqueue_add_watch): Don't specify EV_ENABLE
unless it is defined.
2024-06-23 12:49:45 +08:00
Paul Eggert
2b848a4e50 Fix FIXME in comment
* src/timefns.c (decode_float_time): Explain why the code
can use large precision here, removing a FIXME by updating
the containing comment.
2024-06-22 20:42:55 -04:00
Stefan Kangas
77e3a56507 Update SKK-JISYO.L from upstream
* leim/SKK-DIC/SKK-JISYO.L: Update from
https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.L
2024-06-23 00:27:04 +02:00
Stefan Kangas
e5bae78861 Update publicsuffix.txt from upstream
* etc/publicsuffix.txt: Update from
https://publicsuffix.org/list/public_suffix_list.dat
dated 2024-06-21 13:05:36 UTC.
2024-06-23 00:27:02 +02:00
Stefan Kangas
bf5f74288b Add assignment form as etc/copyright-assign.txt
This change was discussed in:
https://lists.gnu.org/r/emacs-devel/2023-12/msg00326.html

* etc/copyright-assign.txt: New file copied from
https://www.gnu.org/s/gnulib/Copyright/request-assign.future
* doc/emacs/trouble.texi (Copyright Assignment):
* etc/TODO: Point to above new file.
2024-06-23 00:24:31 +02:00
Stefan Kangas
fcd3798804 ; Merge from origin/emacs-29
The following commit was skipped:

0f01cb0ebd Bump Emacs version to 29.4.50
2024-06-22 23:46:46 +02:00
Stefan Kangas
0f01cb0ebd Bump Emacs version to 29.4.50
* README:
* configure.ac:
* etc/NEWS:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 29.4.50.
2024-06-22 23:43:55 +02:00
Vincenzo Pupillo
014aab9847 Fix for grammar change of keyword "virtual" in tree-sitter-cpp
The new rule works with both the new (>= 0.22.1) and the
old (<= 0.22.0) grammar libraries.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--keywords): Removed
the keyword "virtual".
* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
New font lock rule. (Bug#71518)
2024-06-22 21:13:43 +03:00
Stefan Kangas
fa364a0d46 Revert "; * etc/HISTORY: Delete never-released Emacs 28.3."
This reverts commit ea05713122.

Some GNU/Linux distros have offered Emacs 28.3 based on this tag, so
this entry should be kept.
2024-06-22 19:25:35 +02:00
Michael Albinus
a81417e576 Update Tramp version (don't merge to master)
* lisp/net/trampver.el (customize-package-emacs-version-alist):
Adapt Tramp version integrated in Emacs 29.4.
2024-06-22 19:11:13 +02:00
Stefan Kangas
ff389163ee Manually merge NEWS.29 from emacs-29
* etc/NEWS.29: Manually merge from etc/NEWS on the 'emacs-29' branch.
2024-06-22 18:51:46 +02:00
Stefan Kangas
ea05713122 ; * etc/HISTORY: Delete never-released Emacs 28.3. 2024-06-22 18:51:40 +02:00
Stefan Kangas
d3469978b8 Merge from origin/emacs-29
fd15d89ec5 Merge remote-tracking branch 'origin/emacs-29' into emacs-29
6a299b3cac Release Emacs 29.4
7f7b28a250 ; Wayland SECONDARY selection problem
2024-06-22 18:47:20 +02:00
Stefan Kangas
3739342a4e ; Merge from origin/emacs-29
The following commits were skipped:

c0bfe42948 List Andrea Corallo as co-maintainer in ack.texi
b3d6880512 * admin/MAINTAINERS: Add myself in (co-)maintainers.
2024-06-22 18:47:20 +02:00
Stefan Kangas
38e738a35e Merge from origin/emacs-29
7cc939bf27 ; * lisp/ldefs-boot.el: Regenerated for Emacs 29.4

# Conflicts:
#	lisp/ldefs-boot.el
2024-06-22 18:47:18 +02:00
Stefan Kangas
4c4c94fa10 ; Merge from origin/emacs-29
The following commit was skipped:

959eacc2a7 Bump Emacs version to 29.4
2024-06-22 18:47:18 +02:00
Stefan Kangas
1313b8966a Merge from origin/emacs-29
9a02fce714 Update files for Emacs 29.4
d96c54d388 * admin/authors.el: Update for Emacs 29.4
fd207432e5 * etc/NEWS: Update for Emacs 29.4
c645e1d820 org-link-expand-abbrev: Do not evaluate arbitrary unsafe ...
2024-06-22 18:44:19 +02:00
Stefan Kangas
4a76af51bb Replace literal whitespace with \s
* test/lisp/vc/log-edit-tests.el (log-edit-fill-entry-confinement)
(log-edit-fill-entry-space-substitution)
(log-edit-fill-entry-initial-wrapping): Replace literal space character
with '\s', to avoid tripping up merge scripts.
2024-06-22 18:42:06 +02:00
Stefan Kangas
e41dd2241f ; Merge from origin/emacs-29
The following commit was skipped:

50a237c468 Update Tramp version (don't merge to master)
2024-06-22 18:37:49 +02:00
Eli Zaretskii
8520ec829d ; * lisp/editorconfig.el (editorconfig-indentation-alist): Fix :type. 2024-06-22 19:39:37 +03:00