emacs/test, branch scratch/tty-child-frames Emacs is the extensible, customizable, self-documenting real-time display editor. Use helper to get erc-networks--id symbol as string 2024-11-15T19:26:07+00:00 F. Jason Park 2024-11-14T08:28:35+00:00 7fc048ca7781f9ba04d953f79fb29646c92cf35d * lisp/erc/erc-networks.el (erc-networks--id-string): New function. (erc-networks--construct-target-buffer-name) (erc-networks--ensure-unique-server-buffer-name) (erc-networks--rename-server-buffer): Use it. * lisp/erc/erc-nicks.el (erc-nicks-list-faces): Use it. * lisp/erc/erc-status-sidebar.el (erc-status-sidebar-pad-hierarchy): Use it. * lisp/erc/erc.el (erc-generate-new-buffer-name) (erc-log-irc-protocol) (erc--auth-source-determine-params-defaults) (erc-format-target-and/or-network): Use it. * test/lisp/erc/erc-networks-tests.el (erc-networks--id-string): New test. 
* lisp/erc/erc-networks.el (erc-networks--id-string): New function.
(erc-networks--construct-target-buffer-name)
(erc-networks--ensure-unique-server-buffer-name)
(erc-networks--rename-server-buffer): Use it.
* lisp/erc/erc-nicks.el (erc-nicks-list-faces): Use it.
* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-pad-hierarchy): Use it.
* lisp/erc/erc.el (erc-generate-new-buffer-name)
(erc-log-irc-protocol)
(erc--auth-source-determine-params-defaults)
(erc-format-target-and/or-network): Use it.
* test/lisp/erc/erc-networks-tests.el (erc-networks--id-string): New test.
Remove Tramp temp files if advised during tests 2024-11-15T13:28:08+00:00 Michael Albinus 2024-11-15T13:28:08+00:00 310ce93d02c5317be589803fbde96fd20b96e496 * lisp/net/tramp-fuse.el (tramp-fuse-name-prefix): New defconst. (tramp-fuse-mount-point): Use it. * test/lisp/net/tramp-tests.el (tramp-test-name-prefix): New defconst. (tramp--test-make-temp-name, tramp-test40-make-nearby-temp-file) (tramp-test47-read-password, tramp-test47-read-otp-password): Use it. (tramp--test-enabled-checked): Move down. (tramp--test-enabled): Delete all Tramp temp files when environment variable $TRAMP_TEST_CLEANUP_TEMP_FILES is set. (tramp-test02-file-name-dissect-separate): Adapt `tramp-crypt-directories' according to syntax. (tramp-test47-read-password): Let-bind `tramp-connection-properties' instead of modifying `tramp-methods'. 
* lisp/net/tramp-fuse.el (tramp-fuse-name-prefix): New defconst.
(tramp-fuse-mount-point): Use it.

* test/lisp/net/tramp-tests.el (tramp-test-name-prefix): New defconst.
(tramp--test-make-temp-name, tramp-test40-make-nearby-temp-file)
(tramp-test47-read-password, tramp-test47-read-otp-password):
Use it.
(tramp--test-enabled-checked): Move down.
(tramp--test-enabled): Delete all Tramp temp files when
environment variable $TRAMP_TEST_CLEANUP_TEMP_FILES is set.
(tramp-test02-file-name-dissect-separate):
Adapt `tramp-crypt-directories' according to syntax.
(tramp-test47-read-password):
Let-bind `tramp-connection-properties' instead of modifying
`tramp-methods'.
Don't clobber stickiness text properties when printing Eshell prompt 2024-11-14T17:19:31+00:00 Jim Porter 2024-11-07T18:08:33+00:00 df288d2e4148e6e72f21752a510f98536e7705ac * lisp/eshell/em-prompt.el (eshell--append-text-property): New function... (eshell-emit-prompt): ... use it. * test/lisp/eshell/em-prompt-tests.el (em-prompt-test/field-properties/merge-stickiness): New test. (em-prompt-test/field-properties, em-prompt-test/after-failure): Reorder stickiness values (bug#74230). 
* lisp/eshell/em-prompt.el (eshell--append-text-property): New
function...
(eshell-emit-prompt): ... use it.

* test/lisp/eshell/em-prompt-tests.el
(em-prompt-test/field-properties/merge-stickiness): New test.
(em-prompt-test/field-properties, em-prompt-test/after-failure): Reorder
stickiness values (bug#74230).
Merge from origin/emacs-30 2024-11-14T15:51:20+00:00 Michael Albinus 2024-11-14T15:51:20+00:00 3e86231b54ffed7f242c334f96923cff376a197f f69f54c454e Improve font-locking and indentation in 'php-ts-mode' 27aacbd172f Fix some 'lua-ts-mode' options (Bug#74235) a0613372a7b ; Update the xwidgets-on-NS text due to fixing bug#60703 d5928325045 Improve comment indenting in 'lua-ts-mode' 6bc44ccf287 Update 'xref-num-matches-found' when reverting *xref* buffer 8afcfed825a * lisp/files.el (require-with-check): Fix last fix (bug#7... 3496234c8ed lisp/files.el (require-with-check): Fix bug#74091. 90c97d3fac9 Fix handling of permanent-local variables in 'kill-all-lo... c96e5760907 Precise password cache in Tramp 3954e8d9bbe Fix picture-mode with full-width characters 7dabfe9465c Fix movement to the left in picture-mode # Conflicts: # lisp/net/tramp.el 
f69f54c454e Improve font-locking and indentation in 'php-ts-mode'
27aacbd172f Fix some 'lua-ts-mode' options (Bug#74235)
a0613372a7b ; Update the xwidgets-on-NS text due to fixing bug#60703
d5928325045 Improve comment indenting in 'lua-ts-mode'
6bc44ccf287 Update 'xref-num-matches-found' when reverting *xref* buffer
8afcfed825a * lisp/files.el (require-with-check): Fix last fix (bug#7...
3496234c8ed lisp/files.el (require-with-check): Fix bug#74091.
90c97d3fac9 Fix handling of permanent-local variables in 'kill-all-lo...
c96e5760907 Precise password cache in Tramp
3954e8d9bbe Fix picture-mode with full-width characters
7dabfe9465c Fix movement to the left in picture-mode

# Conflicts:
#	lisp/net/tramp.el
Improve comment indenting in 'lua-ts-mode' 2024-11-14T08:14:46+00:00 john muhl 2024-11-10T17:26:33+00:00 d592832504554c6ee30bea263e55dc84feaec18d * lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules): Align single line comments with the surrounding context. (lua-ts--comment-first-sibling-matcher): Check that comment is the first sibling. (lua-ts--multi-line-comment-start): New function. * test/lisp/progmodes/lua-ts-mode-resources/indent.erts: Add tests. (Bug#74298) 
* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
Align single line comments with the surrounding context.
(lua-ts--comment-first-sibling-matcher): Check that comment is
the first sibling.
(lua-ts--multi-line-comment-start): New function.
* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
Add tests.  (Bug#74298)
(cl-labels): Add support for (FUNC EXP) bindings (bug#59786) 2024-11-13T03:58:53+00:00 Stefan Monnier 2024-11-13T03:58:53+00:00 79400f4f18b80cdde72eda86023e41a81d09a164 Allow `cl-labels` to use the same (FUNC EXP) bindings as were already added to `cl-flet` in Emacs-25. The Info doc (mistakenly) already documented this new feature. * lisp/emacs-lisp/cl-macs.el (cl--self-tco-on-form): New function. (cl-labels): Use it to add support for (FUNC EXP) bindings. * test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--labels): Add test for tail-recursive (FUNC EXP) bindings. 
Allow `cl-labels` to use the same (FUNC EXP) bindings as were already added
to `cl-flet` in Emacs-25.  The Info doc (mistakenly) already documented this
new feature.

* lisp/emacs-lisp/cl-macs.el (cl--self-tco-on-form): New function.
(cl-labels): Use it to add support for (FUNC EXP) bindings.

* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--labels): Add test for
tail-recursive (FUNC EXP) bindings.
Merge from origin/emacs-30 2024-11-09T12:34:57+00:00 Eli Zaretskii 2024-11-09T12:34:57+00:00 96beaeab06312f51f2dfe3bf310ea17ae32cae74 3231af3727b Improve 'open-network-stream' documentation. fb55431c44e ; Fix typos in case-conversion descriptions 83f095d1fd4 ; Fix typo and indexing in the ELisp manual 37b1799c9e5 ; Instrument proced-tests.el further 03fa832b4dc Improve Tramp documentation on direct async processes # Conflicts: # etc/NEWS 
3231af3727b Improve 'open-network-stream' documentation.
fb55431c44e ; Fix typos in case-conversion descriptions
83f095d1fd4 ; Fix typo and indexing in the ELisp manual
37b1799c9e5 ; Instrument proced-tests.el further
03fa832b4dc Improve Tramp documentation on direct async processes

# Conflicts:
#	etc/NEWS
Add color-blend to blend two RGB lists 2024-11-09T10:40:18+00:00 Joseph Turner 2024-11-02T04:58:07+00:00 bf312529def48bc6fdf72d43d5be158d125f52f6 * lisp/color.el (color-blend): Blend two RGB lists. * test/lisp/color-tests.el (color-tests-blend): Test color-blend. * etc/NEWS: Announce color-blend. 
* lisp/color.el (color-blend): Blend two RGB lists.
* test/lisp/color-tests.el (color-tests-blend): Test color-blend.
* etc/NEWS: Announce color-blend.
time-stamp: minor adjustments to %P and modifier characters 2024-11-08T18:45:55+00:00 Stephen Gildea 2024-11-08T18:42:30+00:00 766ec1f9e08e6f2c7c22b514a6f2e65f79341023 * lisp/time-stamp.el (time-stamp-string-preprocess): %P variations; allow (and ignore) "*", "E", and "O" as modifier characters. (time-stamp-inserts-lines): safe-local-variable only if booleanp 
* lisp/time-stamp.el (time-stamp-string-preprocess): %P variations;
allow (and ignore) "*", "E", and "O" as modifier characters.
(time-stamp-inserts-lines): safe-local-variable only if booleanp
Fix wrong value of `when` and `unless` with empty body (bug#74215) 2024-11-06T13:27:33+00:00 Mattias Engdegård 2024-11-06T12:29:23+00:00 e88309eef30abca327c845fe4133d758d33cfb6b * lisp/subr.el (when, unless): Return nil when the body is empty. Reported by Brennan Vincent. * test/lisp/subr-tests.el (subr-test-when): Add test cases. (cherry picked from commit 9ee9154247454c18f9f75d0d32592b817d7e977a) 
* lisp/subr.el (when, unless): Return nil when the body is empty.
Reported by Brennan Vincent.
* test/lisp/subr-tests.el (subr-test-when): Add test cases.

(cherry picked from commit 9ee9154247454c18f9f75d0d32592b817d7e977a)