commit bc0202bc8867024a0ddbecf171ed7e9a5341238f (HEAD, refs/remotes/origin/master) Author: Harald Jörg Date: Fri Aug 22 14:59:59 2025 +0200 ; cperl-mode.el: Do not warn with valid character escapes See https://github.com/emacs-mirror/emacs/pull/41. This is a one-liner, safely exempt from copyright paperwork. * lisp/progmodes/cperl-mode.el (cperl-find-pods-heres): delete valid character escapes from the list which causes warning-face to be applied diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index be8f36def58..23ff955f389 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -5065,7 +5065,7 @@ recursive calls in starting lines of here-documents." (cperl-postpone-fontification (- (point) 2) (- (point) 1) 'face (if (memq qtag - (append "ghijkmoqvFHIJKMORTVY" nil)) + (append "gijkmoqFIJKMOTY" nil)) 'font-lock-warning-face my-cperl-REx-0length-face)) (if (and (eq (char-after b) qtag) commit ce9def14c6df39a94958b48250adeda9f50421e5 Author: Michael Albinus Date: Fri Aug 22 14:08:52 2025 +0200 Minor tramp.texi changes * doc/misc/tramp.texi (File name syntax): Describe port for IPv6 address. (Traces and Profiles): Fix default value of tramp-debug-buffer-limit. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 182323d0f25..2944978f8ee 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3661,6 +3661,8 @@ behavior: @file{@trampfn{method,user@@host,path/to/file}}. For specifying port numbers, affix @file{#} to the host name. For example: @file{@trampfn{ssh,daniel@@melancholia#42,.emacs}}. +If the host is an IPv6 address, the port is appended like this: +@file{@trampfn{ssh,@value{ipv6prefix}::1@value{ipv6postfix}#42,.emacs}}. All method, user name, host name, port number and local name parts are optional, @xref{Default Method}, @xref{Default User}, @xref{Default Host}. @@ -6924,7 +6926,7 @@ maintainers, analyzing the remote commands for performance analysis. The debug buffer can be very large, if @code{tramp-verbose} is high, and @value{tramp} runs for a long time. If the buffer size exceeds -@code{tramp-debug-buffer-limit} (3GB by default), a warning will be +@code{tramp-debug-buffer-limit} (100MB by default), a warning will be raised. This user option can be adapted to your needs; a value of 0 means that there is no limit (no warning). commit 64bb65c7d8897a861d103f609abaa0b8de317a8e Author: Michael Albinus Date: Fri Aug 22 14:08:26 2025 +0200 ; * admin/MAINTAINERS: Add myself for connection-local variables. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index b942fb3ba38..c8388f74577 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -327,12 +327,14 @@ Michael Albinus lisp/autorevert.el lisp/eshell/em-tramp.el lisp/files.el (file-name-non-special) + lisp/files-x.el (connection-local variables) lisp/net/ange-ftp.el lisp/notifications.el lisp/shadowfile.el test/infra/* test/lisp/autorevert-tests.el test/lisp/files-tests.el (file-name-non-special) + test/lisp/files-x-tests.el (connection-local variables) test/lisp/shadowfile-tests.el test/src/inotify-test.el commit 7658f4c30a2d0f42a7e1c95962236f183c50c967 Author: Michael Albinus Date: Fri Aug 22 13:18:08 2025 +0200 Skip eglot-test-rust-completion-exit-function on emba diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el index 2b98da4134b..7fd4f0f0491 100644 --- a/test/lisp/progmodes/eglot-tests.el +++ b/test/lisp/progmodes/eglot-tests.el @@ -710,6 +710,7 @@ directory hierarchy." ;; This originally appeared in github#1339 (skip-unless (executable-find "rust-analyzer")) (skip-unless (executable-find "cargo")) + (skip-when (getenv "EMACS_EMBA_CI")) (eglot--with-fixture '(("cmpl-project" . (("main.rs" . commit 384483e26368137bc6d0ffc962235277b886eae3 Author: Harald Jörg Date: Fri Aug 22 12:42:00 2025 +0200 ; cperl-mode.el: Indent labels only in code (Bug#79271) * lisp/progmodes/cperl-mode.el (cperl-indent-line): Make sure that labels are indented in code only * test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts: Two new testcases for non-indentable "labels" in a regex pattern and a qw list diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index fdb841cfffd..be8f36def58 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -2726,6 +2726,7 @@ PARSE-DATA is used to save status between calls in a loop." (if (listp indent) (setq indent (car indent))) (cond ((and (looking-at (rx (sequence (eval cperl--label-rx) (not (in ":"))))) + (null (get-text-property (point) 'syntax-type)) (not (looking-at (rx (eval cperl--false-label-rx))))) (and (> indent 0) (setq indent (max cperl-min-label-indent diff --git a/test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts b/test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts index 3a779442a8a..65ce757d048 100644 --- a/test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts +++ b/test/lisp/progmodes/cperl-mode-resources/cperl-indents.erts @@ -123,3 +123,25 @@ sub foo ( return $a + $b + $in1; } =-=-= + +Name: cperl-false-label-in-regex + +=-= +# -*- mode: cperl -*- +# John Ciolfi reported as Bug#79271 +my $str =~ s/^ + (Field1: [^\n]+) \s* + Field2: \s* (\S+) \s* + //xsm; +=-=-= + +Name: cperl-false-label-in-qw + +=-= +# Related to cperl-false-label-in-regex / Bug#79271 +my @chunks = qw( + sub + LABEL: + more words + ); +=-=-=