commit 5f9b5803bea0f360a91e00cd85d72ea7f56d6095 (HEAD, refs/remotes/origin/master) Author: Jim Porter Date: Wed Jun 19 20:59:59 2024 -0700 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. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 14b3f7aa163..3dadcb9a09b 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -282,6 +282,14 @@ temporarily blinks with this face." "Face used for elements." :version "29.1") +(defface shr-sliced-image + '((t :underline nil :overline nil)) + "Face used for sliced images. +This face should remove any unsightly decorations from sliced images. +Otherwise, decorations like underlines from links would normally show on +every slice." + :version "30.1") + (defcustom shr-inhibit-images nil "If non-nil, inhibit loading images." :version "28.1" @@ -600,38 +608,34 @@ the URL of the image to the kill buffer instead." t)))) (defun shr-zoom-image () - "Toggle the image size. -The size will be rotated between the default size, the original -size, and full-buffer size." + "Cycle the image size. +The size will cycle through the default size, the original size, and +full-buffer size." (interactive) - (let ((url (get-text-property (point) 'image-url)) - (size (get-text-property (point) 'image-size)) - (buffer-read-only nil)) + (let ((url (get-text-property (point) 'image-url))) (if (not url) (message "No image under point") - ;; Delete the old picture. - (while (get-text-property (point) 'image-url) - (forward-char -1)) - (forward-char 1) - (let ((start (point))) - (while (get-text-property (point) 'image-url) - (forward-char 1)) - (forward-char -1) - (put-text-property start (point) 'display nil) - (when (> (- (point) start) 2) - (delete-region start (1- (point))))) - (message "Inserting %s..." url) - (url-retrieve url #'shr-image-fetched - (list (current-buffer) (1- (point)) (point-marker) - (list (cons 'size - (cond ((or (eq size 'default) - (null size)) - 'original) - ((eq size 'original) - 'full) - ((eq size 'full) - 'default))))) - t)))) + (let* ((end (or (next-single-property-change (point) 'image-url) + (point-max))) + (start (or (previous-single-property-change end 'image-url) + (point-min))) + (size (get-text-property (point) 'image-size)) + (next-size (cond ((or (eq size 'default) + (null size)) + 'original) + ((eq size 'original) + 'full) + ((eq size 'full) + 'default))) + (buffer-read-only nil)) + ;; Delete the old picture. + (put-text-property start end 'display nil) + (message "Inserting %s..." url) + (url-retrieve url #'shr-image-fetched + `(,(current-buffer) ,start + ,(set-marker (make-marker) end) + ((size . ,next-size))) + t))))) ;;; Utility functions. @@ -1070,6 +1074,7 @@ the mouse click event." ;; We don't want to record these changes. (buffer-undo-list t) (inhibit-read-only t)) + (remove-overlays start end) (delete-region start end) (goto-char start) (funcall shr-put-image-function data alt flags) @@ -1144,7 +1149,8 @@ element is the data blob and the second element is the content-type." ;; putting any space after inline images. ;; ALT may be nil when visiting image URLs in eww ;; (bug#67764). - (setq alt (if alt (string-trim alt) "*")) + (setq alt (string-trim (or alt ""))) + (when (length= alt 0) (setq alt "*")) ;; When inserting big-ish pictures, put them at the ;; beginning of the line. (let ((inline (shr--inline-image-p image))) @@ -1153,7 +1159,16 @@ element is the data blob and the second element is the content-type." (insert "\n")) (let ((image-pos (point))) (if (eq size 'original) - (insert-sliced-image image alt nil 20 1) + ;; Normally, we try to keep the buffer text the same + ;; by preserving ALT. With a sliced image, we have to + ;; repeat the text for each line, so we can't do that. + ;; Just use "*" for the string to insert instead. + (progn + (insert-sliced-image image "*" nil 20 1) + (let ((overlay (make-overlay start (point)))) + ;; Avoid displaying unsightly decorations on the + ;; image slices. + (overlay-put overlay 'face 'shr-sliced-image))) (insert-image image alt)) (put-text-property start (point) 'image-size size) (when (and (not inline) shr-max-inline-image-size) @@ -1854,17 +1869,12 @@ The preference is a float determined from `shr-prefer-media-type'." (let ((file (url-cache-create-filename url))) (when (file-exists-p file) (delete-file file)))) - (when (image-type-available-p 'svg) - (insert-image - (shr-make-placeholder-image dom) - (or (string-trim alt) ""))) - ;; Paradoxically this space causes shr not to insert spaces after - ;; inline images. Since the image is temporary it seem like there - ;; should be no downside to not inserting it but since I don't - ;; understand the code well and for the sake of backward compatibility - ;; we preserve it unless user has set `shr-max-inline-image-size'. - (unless shr-max-inline-image-size - (insert " ")) + (if (image-type-available-p 'svg) + (insert-image + (shr-make-placeholder-image dom) + (or (string-trim alt) "")) + ;; No SVG support. Just use a space as our placeholder. + (insert " ")) (url-queue-retrieve url #'shr-image-fetched (list (current-buffer) start (set-marker (make-marker) (point)) diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el index 17138053450..b6552674b27 100644 --- a/test/lisp/net/shr-tests.el +++ b/test/lisp/net/shr-tests.el @@ -29,6 +29,22 @@ (declare-function libxml-parse-html-region "xml.c") +(defvar shr-test--max-wait-time 5 + "The maximum amount of time to wait for a condition to resolve, in seconds. +See `shr-test-wait-for'.") + +(defun shr-test-wait-for (predicate &optional message) + "Wait until PREDICATE returns non-nil. +If this takes longer than `shr-test--max-wait-time', raise an error. +MESSAGE is an optional message to use if this times out." + (let ((start (current-time)) + (message (or message "timed out waiting for condition"))) + (while (not (funcall predicate)) + (when (> (float-time (time-since start)) + shr-test--max-wait-time) + (error message)) + (sit-for 0.1)))) + (defun shr-test--rendering-check (name &optional context) "Render NAME.html and compare it to NAME.txt. Raise a test failure if the rendered buffer does not match NAME.txt. @@ -68,6 +84,8 @@ validate for the NAME testcase. The `rendering' testcase will test NAME once without altering any settings, then once more for each (OPTION . VALUE) pair.") +;;; Tests: + (ert-deftest rendering () (skip-unless (fboundp 'libxml-parse-html-region)) (dolist (file (directory-files (ert-resource-directory) nil "\\.html\\'")) @@ -114,6 +132,52 @@ settings, then once more for each (OPTION . VALUE) pair.") (should (equal (shr--parse-srcset "https://example.org/1,2\n\n 10w , https://example.org/2 20w ") '(("https://example.org/2" 20) ("https://example.org/1,2" 10))))) +(ert-deftest shr-test/zoom-image () + "Test that `shr-zoom-image' properly replaces the original image." + (let ((image (expand-file-name "data/image/blank-100x200.png" + (getenv "EMACS_TEST_DIRECTORY")))) + (dolist (alt '(nil "" "nothing to see here")) + (with-temp-buffer + (ert-info ((format "image with alt=%S" alt)) + (let ((attrs (if alt (format " alt=\"%s\"" alt) ""))) + (insert (format " slice-count 1))))))))) + (require 'shr) ;;; shr-tests.el ends here commit 6f2036243f24369b0b4c35c9b323eb19dad4e4cd Author: Eli Zaretskii Date: Sun Jun 23 08:01:28 2024 +0300 ; Doc fix in 'php-ts-mode'. * lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors): Doc fix. diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 6a94d4b7fb8..1f7d6f5b3ee 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -123,7 +123,7 @@ By default should have same value as `html-ts-mode-indent-offset'." (defcustom php-ts-mode-css-fontify-colors t "Whether CSS colors should be fontified using the color as the background. -When non-nil, a text representing CSS color will be fontified +If non-nil, text representing a CSS color will be fontified such that its background is the color itself. Works like `css--fontify-region'." :tag "PHP colors the CSS properties values." commit 2f1c882a16e5e5215da039af1b4c4a8f569db1a1 Author: Vincenzo Pupillo Date: Sat Jun 22 23:11:17 2024 +0200 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) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 4297876b707..6a94d4b7fb8 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -121,6 +121,16 @@ By default should have same value as `html-ts-mode-indent-offset'." :type 'integer :safe 'integerp) +(defcustom php-ts-mode-css-fontify-colors t + "Whether CSS colors should be fontified using the color as the background. +When non-nil, a text representing CSS color will be fontified +such that its background is the color itself. +Works like `css--fontify-region'." + :tag "PHP colors the CSS properties values." + :version "30.1" + :type 'boolean + :safe 'booleanp) + (defcustom php-ts-mode-php-executable (or (executable-find "php") "/usr/bin/php") "The location of PHP executable." :tag "PHP Executable" @@ -999,6 +1009,26 @@ characters of the current line." '((variable_name (name) @font-lock-variable-name-face))) "Tree-sitter font-lock settings for phpdoc.") +(defun php-ts-mode--colorize-css-value (node override start end &rest _) + "Colorize CSS property value like `css--fontify-region'. +For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'." + (if (and php-ts-mode-css-fontify-colors + (string-equal "plain_value" (treesit-node-type node))) + (let ((color (css--compute-color start (treesit-node-text node t)))) + (when color + (treesit-fontify-with-override + (treesit-node-start node) (treesit-node-end node) + (list 'face + (list :background color + :foreground (readable-foreground-color + color) + :box '(:line-width -1))) + override start end))) + (treesit-fontify-with-override + (treesit-node-start node) (treesit-node-end node) + 'font-lock-variable-name-face + override start end))) + (defun php-ts-mode--fontify-error (node override start end &rest _) "Fontify the error nodes. For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'." @@ -1393,12 +1423,20 @@ Depends on `c-ts-common-comment-setup'." ("Constant" "\\`const_element\\'" nil nil))) ;; Font-lock. - (setq-local treesit-font-lock-settings (php-ts-mode--font-lock-settings)) (setq-local treesit-font-lock-settings - (append treesit-font-lock-settings + (append (php-ts-mode--font-lock-settings) php-ts-mode--custom-html-font-lock-settings js--treesit-font-lock-settings - css--treesit-settings + (append + ;; Rule for coloring CSS property values. + ;; Placed before `css--treesit-settings' + ;; to win against the same rule contained therein. + (treesit-font-lock-rules + :language 'css + :override t + :feature 'variable + '((plain_value) @php-ts-mode--colorize-css-value)) + css--treesit-settings) php-ts-mode--phpdoc-font-lock-settings)) (setq-local treesit-font-lock-feature-list php-ts-mode--feature-list) commit dd0994aa36c3c7e0916c6d91b22edffbe530fb8d Merge: 737fa7c5292 486ea8ef5ac Author: Eli Zaretskii Date: Sun Jun 23 07:57:22 2024 +0300 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs commit 486ea8ef5ac6c01fb017475708b03aefe525a626 Author: Po Lu Date: Sun Jun 23 12:52:55 2024 +0800 * configure.ac: Disable kqueue on Haiku. diff --git a/configure.ac b/configure.ac index f75c0a98820..f56717f16a4 100644 --- a/configure.ac +++ b/configure.ac @@ -4129,26 +4129,28 @@ case $with_file_notification,$NOTIFY_OBJ in fi ;; esac -dnl kqueue is available on BSD-like systems. -case $with_file_notification,$NOTIFY_OBJ in - kqueue,* | yes,) - EMACS_CHECK_MODULES([KQUEUE], [libkqueue]) - if test "$HAVE_KQUEUE" = "yes"; then - AC_DEFINE([HAVE_KQUEUE], [1], [Define to 1 to use kqueue.]) - CPPFLAGS="$CPPFLAGS -I/usr/include/kqueue" - NOTIFY_CFLAGS=$KQUEUE_CFLAGS - NOTIFY_LIBS=$KQUEUE_LIBS - NOTIFY_OBJ=kqueue.o - NOTIFY_SUMMARY="yes -lkqueue" - else - AC_SEARCH_LIBS([kqueue], []) - if test "$ac_cv_search_kqueue" != no; then - AC_DEFINE([HAVE_KQUEUE], [1], [Define to 1 to use kqueue.]) - NOTIFY_OBJ=kqueue.o - NOTIFY_SUMMARY="yes (kqueue)" - fi - fi ;; -esac +AS_IF([test "$opsys" != "haiku"], [ + dnl kqueue is available on BSD-like systems and Haiku, but Haiku's + dnl implementation cannot monitor filesystem activity. + case $with_file_notification,$NOTIFY_OBJ in + kqueue,* | yes,) + EMACS_CHECK_MODULES([KQUEUE], [libkqueue]) + if test "$HAVE_KQUEUE" = "yes"; then + AC_DEFINE([HAVE_KQUEUE], [1], [Define to 1 to use kqueue.]) + CPPFLAGS="$CPPFLAGS -I/usr/include/kqueue" + NOTIFY_CFLAGS=$KQUEUE_CFLAGS + NOTIFY_LIBS=$KQUEUE_LIBS + NOTIFY_OBJ=kqueue.o + NOTIFY_SUMMARY="yes -lkqueue" + else + AC_SEARCH_LIBS([kqueue], []) + if test "$ac_cv_search_kqueue" != no; then + AC_DEFINE([HAVE_KQUEUE], [1], [Define to 1 to use kqueue.]) + NOTIFY_OBJ=kqueue.o + NOTIFY_SUMMARY="yes (kqueue)" + fi + fi ;; + esac]) dnl g_file_monitor exists since glib 2.18. G_FILE_MONITOR_EVENT_MOVED dnl has been added in glib 2.24. It has been tested under commit 737fa7c52925cfa578f49f277e0bdfa4e2f9fb4c Author: Vincenzo Pupillo Date: Sat Jun 22 22:36:54 2024 +0200 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) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 7171baf27c9..4297876b707 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -1232,7 +1232,7 @@ Depends on `c-ts-common-comment-setup'." ["Start built-in webserver" php-ts-mode-run-php-webserver :help "Run the built-in PHP webserver"] "--" - ["Customize" (lambda () (interactive) (customize-group "php-ts"))])) + ["Customize" (lambda () (interactive) (customize-group "php-ts-mode"))])) (defvar php-ts-mode--feature-list '((;; common commit cb7be6035eeb7165d6789bb62708a14607e84e5d Author: Po Lu Date: Sun Jun 23 12:49:45 2024 +0800 Fix compilation on prerelease versions of Haiku * src/kqueue.c (Fkqueue_add_watch): Don't specify EV_ENABLE unless it is defined. diff --git a/src/kqueue.c b/src/kqueue.c index 4693e130208..aabaab6c8c3 100644 --- a/src/kqueue.c +++ b/src/kqueue.c @@ -444,23 +444,29 @@ only when the upper directory of the renamed file is watched. */) if (! NILP (Fmember (Qrevoke, flags))) fflags |= NOTE_REVOKE; /* Register event. */ - EV_SET (&kev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, + EV_SET (&kev, fd, EVFILT_VNODE, (EV_ADD +#ifdef EV_ENABLE + | EV_ENABLE +#endif /* EV_ENABLE */ + | EV_CLEAR), fflags, 0, NULL); - if (kevent (kqueuefd, &kev, 1, NULL, 0, NULL) < 0) { - emacs_close (fd); - report_file_error ("Cannot watch file", file); - } + if (kevent (kqueuefd, &kev, 1, NULL, 0, NULL) < 0) + { + emacs_close (fd); + report_file_error ("Cannot watch file", file); + } /* Store watch object in watch list. */ Lisp_Object watch_descriptor = make_fixnum (fd); if (NILP (Ffile_directory_p (file))) watch_object = list4 (watch_descriptor, file, flags, callback); - else { - dir_list = directory_files_internal (file, Qnil, Qnil, Qnil, true, Qnil, - Qnil); - watch_object = list5 (watch_descriptor, file, flags, callback, dir_list); - } + else + { + dir_list = directory_files_internal (file, Qnil, Qnil, Qnil, true, Qnil, + Qnil); + watch_object = list5 (watch_descriptor, file, flags, callback, dir_list); + } watch_list = Fcons (watch_object, watch_list); return watch_descriptor; @@ -486,11 +492,12 @@ WATCH-DESCRIPTOR should be an object returned by `kqueue-add-watch'. */) /* Remove watch descriptor from watch list. */ watch_list = Fdelq (watch_object, watch_list); - if (NILP (watch_list) && (kqueuefd >= 0)) { - delete_read_fd (kqueuefd); - emacs_close (kqueuefd); - kqueuefd = -1; - } + if (NILP (watch_list) && (kqueuefd >= 0)) + { + delete_read_fd (kqueuefd); + emacs_close (kqueuefd); + kqueuefd = -1; + } return Qt; } commit 2b848a4e504319cce150000a2c3855f66d89714b Author: Paul Eggert Date: Sat Jun 22 20:42:04 2024 -0400 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. diff --git a/src/timefns.c b/src/timefns.c index 0ecbb6e6793..746e422ffb6 100644 --- a/src/timefns.c +++ b/src/timefns.c @@ -414,9 +414,11 @@ decode_float_time (double t, struct lisp_time *result) else { int scale = double_integer_scale (t); - /* FIXME: `double_integer_scale` often returns values that are - "pessimistic" (i.e. larger than necessary), so 3.5 gets converted - to (7881299347898368 . 2251799813685248) rather than (7 . 2). + /* Because SCALE treats trailing zeros in T as significant, + on typical platforms with IEEE floating point + (time-convert 3.5 t) yields (7881299347898368 . 2251799813685248), + a precision of 2**-51 s, not (7 . 2), a precision of 0.5 s. + Although numerically correct, this generates largish integers. On 64bit systems, this should not matter very much, tho. */ eassume (scale < flt_radix_power_size); commit 77e3a56507d0f06662d1be692194a4e40f6ffc68 Author: Stefan Kangas Date: Sun Jun 23 00:27:04 2024 +0200 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 diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L index 792f5318269..46a2e8a6239 100644 Binary files a/leim/SKK-DIC/SKK-JISYO.L and b/leim/SKK-DIC/SKK-JISYO.L differ commit e5bae788614cdf9367e245f55125d6b53b795197 Author: Stefan Kangas Date: Sun Jun 23 00:27:02 2024 +0200 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. diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt index 79248a73f04..3e8f934322a 100644 --- a/etc/publicsuffix.txt +++ b/etc/publicsuffix.txt @@ -675,7 +675,6 @@ mil.by // second-level domain, but it's being used as one (see www.google.com.by and // www.yahoo.com.by, for example), so we list it here for safety's sake. com.by - // http://hoster.by/ of.by @@ -6710,7 +6709,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-12-06T15:14:09Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-06-13T15:15:16Z // This list is auto-generated, don't edit it manually. // aaa : American Automobile Association, Inc. // https://www.iana.org/domains/root/db/aaa.html @@ -6896,7 +6895,7 @@ anquan // https://www.iana.org/domains/root/db/anz.html anz -// aol : Oath Inc. +// aol : Yahoo Inc. // https://www.iana.org/domains/root/db/aol.html aol @@ -6988,10 +6987,6 @@ auto // https://www.iana.org/domains/root/db/autos.html autos -// avianca : Avianca Inc. -// https://www.iana.org/domains/root/db/avianca.html -avianca - // aws : AWS Registry LLC // https://www.iana.org/domains/root/db/aws.html aws @@ -7016,10 +7011,6 @@ baidu // https://www.iana.org/domains/root/db/banamex.html banamex -// bananarepublic : The Gap, Inc. -// https://www.iana.org/domains/root/db/bananarepublic.html -bananarepublic - // band : Dog Beach, LLC // https://www.iana.org/domains/root/db/band.html band @@ -7544,10 +7535,6 @@ college // https://www.iana.org/domains/root/db/cologne.html cologne -// comcast : Comcast IP Holdings I, LLC -// https://www.iana.org/domains/root/db/comcast.html -comcast - // commbank : COMMONWEALTH BANK OF AUSTRALIA // https://www.iana.org/domains/root/db/commbank.html commbank @@ -8164,7 +8151,7 @@ ftr // https://www.iana.org/domains/root/db/fujitsu.html fujitsu -// fun : Radix FZC DMCC +// fun : Radix Technologies Inc. // https://www.iana.org/domains/root/db/fun.html fun @@ -8364,10 +8351,6 @@ grocery // https://www.iana.org/domains/root/db/group.html group -// guardian : The Guardian Life Insurance Company of America -// https://www.iana.org/domains/root/db/guardian.html -guardian - // gucci : Guccio Gucci S.p.a. // https://www.iana.org/domains/root/db/gucci.html gucci @@ -8500,7 +8483,7 @@ horse // https://www.iana.org/domains/root/db/hospital.html hospital -// host : Radix FZC DMCC +// host : Radix Technologies Inc. // https://www.iana.org/domains/root/db/host.html host @@ -8720,7 +8703,7 @@ jpmorgan // https://www.iana.org/domains/root/db/jprs.html jprs -// juegos : Internet Naming Company LLC +// juegos : Dog Beach, LLC // https://www.iana.org/domains/root/db/juegos.html juegos @@ -8992,7 +8975,7 @@ lotte // https://www.iana.org/domains/root/db/lotto.html lotto -// love : Merchant Law Group LLP +// love : Waterford Limited // https://www.iana.org/domains/root/db/love.html love @@ -9244,10 +9227,6 @@ nab // https://www.iana.org/domains/root/db/nagoya.html nagoya -// natura : NATURA COSMÉTICOS S.A. -// https://www.iana.org/domains/root/db/natura.html -natura - // navy : Dog Beach, LLC // https://www.iana.org/domains/root/db/navy.html navy @@ -9392,10 +9371,6 @@ olayan // https://www.iana.org/domains/root/db/olayangroup.html olayangroup -// oldnavy : The Gap, Inc. -// https://www.iana.org/domains/root/db/oldnavy.html -oldnavy - // ollo : Dish DBS Corporation // https://www.iana.org/domains/root/db/ollo.html ollo @@ -9416,7 +9391,7 @@ ong // https://www.iana.org/domains/root/db/onl.html onl -// online : Radix FZC DMCC +// online : Radix Technologies Inc. // https://www.iana.org/domains/root/db/online.html online @@ -9620,7 +9595,7 @@ pramerica // https://www.iana.org/domains/root/db/praxi.html praxi -// press : Radix FZC DMCC +// press : Radix Technologies Inc. // https://www.iana.org/domains/root/db/press.html press @@ -9928,10 +9903,6 @@ sbi // https://www.iana.org/domains/root/db/sbs.html sbs -// sca : SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ) -// https://www.iana.org/domains/root/db/sca.html -sca - // scb : The Siam Commercial Bank Public Company Limited ("SCB") // https://www.iana.org/domains/root/db/scb.html scb @@ -10076,7 +10047,7 @@ sina // https://www.iana.org/domains/root/db/singles.html singles -// site : Radix FZC DMCC +// site : Radix Technologies Inc. // https://www.iana.org/domains/root/db/site.html site @@ -10156,7 +10127,7 @@ soy // https://www.iana.org/domains/root/db/spa.html spa -// space : Radix FZC DMCC +// space : Radix Technologies Inc. // https://www.iana.org/domains/root/db/space.html space @@ -10208,7 +10179,7 @@ stockholm // https://www.iana.org/domains/root/db/storage.html storage -// store : Radix FZC DMCC +// store : Radix Technologies Inc. // https://www.iana.org/domains/root/db/store.html store @@ -10324,7 +10295,7 @@ tdk // https://www.iana.org/domains/root/db/team.html team -// tech : Radix FZC DMCC +// tech : Radix Technologies Inc. // https://www.iana.org/domains/root/db/tech.html tech @@ -10508,7 +10479,7 @@ unicom // https://www.iana.org/domains/root/db/university.html university -// uno : Radix FZC DMCC +// uno : Radix Technologies Inc. // https://www.iana.org/domains/root/db/uno.html uno @@ -10672,7 +10643,7 @@ webcam // https://www.iana.org/domains/root/db/weber.html weber -// website : Radix FZC DMCC +// website : Radix Technologies Inc. // https://www.iana.org/domains/root/db/website.html website @@ -10768,10 +10739,6 @@ xbox // https://www.iana.org/domains/root/db/xerox.html xerox -// xfinity : Comcast IP Holdings I, LLC -// https://www.iana.org/domains/root/db/xfinity.html -xfinity - // xihuan : Beijing Qihu Keji Co., Ltd. // https://www.iana.org/domains/root/db/xihuan.html xihuan @@ -11148,7 +11115,7 @@ xyz // https://www.iana.org/domains/root/db/yachts.html yachts -// yahoo : Oath Inc. +// yahoo : Yahoo Inc. // https://www.iana.org/domains/root/db/yahoo.html yahoo @@ -11213,6 +11180,12 @@ zuerich // ===BEGIN PRIVATE DOMAINS=== // (Note: these are in alphabetical order by company name) +// 12CHARS: https://12chars.com +// Submitted by Kenny Niehage +12chars.dev +12chars.it +12chars.pro + // 1GB LLC : https://www.1gb.ua/ // Submitted by 1GB LLC cc.ua @@ -11222,6 +11195,15 @@ ltd.ua // 611coin : https://611project.org/ 611.to +// AAA workspace : https://aaa.vodka +// Submitted by Kirill Rezraf +aaa.vodka + +// A2 Hosting +// Submitted by Tyler Hall +a2hosted.com +cpserver.com + // Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za // Submitted by Aaron Marais graphox.us @@ -11238,12 +11220,18 @@ graphox.us // Submitted by Ofer Kalaora activetrail.biz +// Adaptable.io : https://adaptable.io +// Submitted by Mark Terrel +adaptable.app + // Adobe : https://www.adobe.com/ // Submitted by Ian Boston and Lars Trieloff adobeaemcloud.com *.dev.adobeaemcloud.com +aem.live hlx.live adobeaemcloud.net +aem.page hlx.page hlx3.page @@ -11315,7 +11303,7 @@ myamaze.net // Amazon API Gateway // Submitted by AWS Security -// Reference: 4d863337-ff98-4501-a6f2-361eba8445d6 +// Reference: 9e37648f-a66c-4655-9ab1-5981f8737197 execute-api.cn-north-1.amazonaws.com.cn execute-api.cn-northwest-1.amazonaws.com.cn execute-api.af-south-1.amazonaws.com @@ -11330,6 +11318,7 @@ execute-api.ap-southeast-2.amazonaws.com execute-api.ap-southeast-3.amazonaws.com execute-api.ap-southeast-4.amazonaws.com execute-api.ca-central-1.amazonaws.com +execute-api.ca-west-1.amazonaws.com execute-api.eu-central-1.amazonaws.com execute-api.eu-central-2.amazonaws.com execute-api.eu-north-1.amazonaws.com @@ -11356,23 +11345,28 @@ cloudfront.net // Amazon Cognito // Submitted by AWS Security -// Reference: 7bee1013-f456-47df-bfe8-03c78d946d61 +// Reference: 09588633-91fe-49d8-b4e7-ec36496d11f3 auth.af-south-1.amazoncognito.com auth.ap-northeast-1.amazoncognito.com auth.ap-northeast-2.amazoncognito.com auth.ap-northeast-3.amazoncognito.com auth.ap-south-1.amazoncognito.com +auth.ap-south-2.amazoncognito.com auth.ap-southeast-1.amazoncognito.com auth.ap-southeast-2.amazoncognito.com auth.ap-southeast-3.amazoncognito.com +auth.ap-southeast-4.amazoncognito.com auth.ca-central-1.amazoncognito.com auth.eu-central-1.amazoncognito.com +auth.eu-central-2.amazoncognito.com auth.eu-north-1.amazoncognito.com auth.eu-south-1.amazoncognito.com +auth.eu-south-2.amazoncognito.com auth.eu-west-1.amazoncognito.com auth.eu-west-2.amazoncognito.com auth.eu-west-3.amazoncognito.com auth.il-central-1.amazoncognito.com +auth.me-central-1.amazoncognito.com auth.me-south-1.amazoncognito.com auth.sa-east-1.amazoncognito.com auth.us-east-1.amazoncognito.com @@ -11388,14 +11382,14 @@ auth-fips.us-west-2.amazoncognito.com // Amazon EC2 // Submitted by Luke Wells // Reference: 4c38fa71-58ac-4768-99e5-689c1767e537 +*.compute.amazonaws.com.cn *.compute.amazonaws.com *.compute-1.amazonaws.com -*.compute.amazonaws.com.cn us-east-1.amazonaws.com // Amazon EMR // Submitted by AWS Security -// Reference: 597f3f8e-9283-4e48-8e32-7ee25a1ff6ab +// Reference: 82f43f9f-bbb8-400e-8349-854f5a62f20d emrappui-prod.cn-north-1.amazonaws.com.cn emrnotebooks-prod.cn-north-1.amazonaws.com.cn emrstudio-prod.cn-north-1.amazonaws.com.cn @@ -11420,6 +11414,9 @@ emrstudio-prod.ap-northeast-3.amazonaws.com emrappui-prod.ap-south-1.amazonaws.com emrnotebooks-prod.ap-south-1.amazonaws.com emrstudio-prod.ap-south-1.amazonaws.com +emrappui-prod.ap-south-2.amazonaws.com +emrnotebooks-prod.ap-south-2.amazonaws.com +emrstudio-prod.ap-south-2.amazonaws.com emrappui-prod.ap-southeast-1.amazonaws.com emrnotebooks-prod.ap-southeast-1.amazonaws.com emrstudio-prod.ap-southeast-1.amazonaws.com @@ -11429,18 +11426,30 @@ emrstudio-prod.ap-southeast-2.amazonaws.com emrappui-prod.ap-southeast-3.amazonaws.com emrnotebooks-prod.ap-southeast-3.amazonaws.com emrstudio-prod.ap-southeast-3.amazonaws.com +emrappui-prod.ap-southeast-4.amazonaws.com +emrnotebooks-prod.ap-southeast-4.amazonaws.com +emrstudio-prod.ap-southeast-4.amazonaws.com emrappui-prod.ca-central-1.amazonaws.com emrnotebooks-prod.ca-central-1.amazonaws.com emrstudio-prod.ca-central-1.amazonaws.com +emrappui-prod.ca-west-1.amazonaws.com +emrnotebooks-prod.ca-west-1.amazonaws.com +emrstudio-prod.ca-west-1.amazonaws.com emrappui-prod.eu-central-1.amazonaws.com emrnotebooks-prod.eu-central-1.amazonaws.com emrstudio-prod.eu-central-1.amazonaws.com +emrappui-prod.eu-central-2.amazonaws.com +emrnotebooks-prod.eu-central-2.amazonaws.com +emrstudio-prod.eu-central-2.amazonaws.com emrappui-prod.eu-north-1.amazonaws.com emrnotebooks-prod.eu-north-1.amazonaws.com emrstudio-prod.eu-north-1.amazonaws.com emrappui-prod.eu-south-1.amazonaws.com emrnotebooks-prod.eu-south-1.amazonaws.com emrstudio-prod.eu-south-1.amazonaws.com +emrappui-prod.eu-south-2.amazonaws.com +emrnotebooks-prod.eu-south-2.amazonaws.com +emrstudio-prod.eu-south-2.amazonaws.com emrappui-prod.eu-west-1.amazonaws.com emrnotebooks-prod.eu-west-1.amazonaws.com emrstudio-prod.eu-west-1.amazonaws.com @@ -11450,6 +11459,9 @@ emrstudio-prod.eu-west-2.amazonaws.com emrappui-prod.eu-west-3.amazonaws.com emrnotebooks-prod.eu-west-3.amazonaws.com emrstudio-prod.eu-west-3.amazonaws.com +emrappui-prod.il-central-1.amazonaws.com +emrnotebooks-prod.il-central-1.amazonaws.com +emrstudio-prod.il-central-1.amazonaws.com emrappui-prod.me-central-1.amazonaws.com emrnotebooks-prod.me-central-1.amazonaws.com emrstudio-prod.me-central-1.amazonaws.com @@ -11480,9 +11492,11 @@ emrstudio-prod.us-west-2.amazonaws.com // Amazon Managed Workflows for Apache Airflow // Submitted by AWS Security -// Reference: 4ab55e6f-90c0-4a8d-b6a0-52ca5dbb1c2e +// Reference: 87f24ece-a77e-40e8-bb4a-f6b74fe9f975 *.cn-north-1.airflow.amazonaws.com.cn *.cn-northwest-1.airflow.amazonaws.com.cn +*.af-south-1.airflow.amazonaws.com +*.ap-east-1.airflow.amazonaws.com *.ap-northeast-1.airflow.amazonaws.com *.ap-northeast-2.airflow.amazonaws.com *.ap-south-1.airflow.amazonaws.com @@ -11491,17 +11505,20 @@ emrstudio-prod.us-west-2.amazonaws.com *.ca-central-1.airflow.amazonaws.com *.eu-central-1.airflow.amazonaws.com *.eu-north-1.airflow.amazonaws.com +*.eu-south-1.airflow.amazonaws.com *.eu-west-1.airflow.amazonaws.com *.eu-west-2.airflow.amazonaws.com *.eu-west-3.airflow.amazonaws.com +*.me-south-1.airflow.amazonaws.com *.sa-east-1.airflow.amazonaws.com *.us-east-1.airflow.amazonaws.com *.us-east-2.airflow.amazonaws.com +*.us-west-1.airflow.amazonaws.com *.us-west-2.airflow.amazonaws.com // Amazon S3 // Submitted by AWS Security -// Reference: 0e801048-08f2-4064-9cb8-e7373e0b57f4 +// Reference: cd5c8b3a-67b7-4b40-9236-c87ce81a3d10 s3.dualstack.cn-north-1.amazonaws.com.cn s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn s3-website.dualstack.cn-north-1.amazonaws.com.cn @@ -11600,6 +11617,16 @@ s3-accesspoint-fips.ca-central-1.amazonaws.com s3-fips.ca-central-1.amazonaws.com s3-object-lambda.ca-central-1.amazonaws.com s3-website.ca-central-1.amazonaws.com +s3.dualstack.ca-west-1.amazonaws.com +s3-accesspoint.dualstack.ca-west-1.amazonaws.com +s3-accesspoint-fips.dualstack.ca-west-1.amazonaws.com +s3-fips.dualstack.ca-west-1.amazonaws.com +s3-website.dualstack.ca-west-1.amazonaws.com +s3.ca-west-1.amazonaws.com +s3-accesspoint.ca-west-1.amazonaws.com +s3-accesspoint-fips.ca-west-1.amazonaws.com +s3-fips.ca-west-1.amazonaws.com +s3-website.ca-west-1.amazonaws.com s3.dualstack.eu-central-1.amazonaws.com s3-accesspoint.dualstack.eu-central-1.amazonaws.com s3-website.dualstack.eu-central-1.amazonaws.com @@ -11780,9 +11807,25 @@ s3-fips.us-west-2.amazonaws.com s3-object-lambda.us-west-2.amazonaws.com s3-website.us-west-2.amazonaws.com +// Amazon SageMaker Ground Truth +// Submitted by AWS Security +// Reference: 98dbfde4-7802-48c3-8751-b60f204e0d9c +labeling.ap-northeast-1.sagemaker.aws +labeling.ap-northeast-2.sagemaker.aws +labeling.ap-south-1.sagemaker.aws +labeling.ap-southeast-1.sagemaker.aws +labeling.ap-southeast-2.sagemaker.aws +labeling.ca-central-1.sagemaker.aws +labeling.eu-central-1.sagemaker.aws +labeling.eu-west-1.sagemaker.aws +labeling.eu-west-2.sagemaker.aws +labeling.us-east-1.sagemaker.aws +labeling.us-east-2.sagemaker.aws +labeling.us-west-2.sagemaker.aws + // Amazon SageMaker Notebook Instances // Submitted by AWS Security -// Reference: fe8c9e94-5a22-486d-8750-991a3a9b13c6 +// Reference: b5ea56df-669e-43cc-9537-14aa172f5dfc notebook.af-south-1.sagemaker.aws notebook.ap-east-1.sagemaker.aws notebook.ap-northeast-1.sagemaker.aws @@ -11795,6 +11838,9 @@ notebook.ap-southeast-2.sagemaker.aws notebook.ap-southeast-3.sagemaker.aws notebook.ap-southeast-4.sagemaker.aws notebook.ca-central-1.sagemaker.aws +notebook-fips.ca-central-1.sagemaker.aws +notebook.ca-west-1.sagemaker.aws +notebook-fips.ca-west-1.sagemaker.aws notebook.eu-central-1.sagemaker.aws notebook.eu-central-2.sagemaker.aws notebook.eu-north-1.sagemaker.aws @@ -11816,6 +11862,7 @@ notebook-fips.us-gov-east-1.sagemaker.aws notebook.us-gov-west-1.sagemaker.aws notebook-fips.us-gov-west-1.sagemaker.aws notebook.us-west-1.sagemaker.aws +notebook-fips.us-west-1.sagemaker.aws notebook.us-west-2.sagemaker.aws notebook-fips.us-west-2.sagemaker.aws notebook.cn-north-1.sagemaker.com.cn @@ -11823,7 +11870,7 @@ notebook.cn-northwest-1.sagemaker.com.cn // Amazon SageMaker Studio // Submitted by AWS Security -// Reference: 057ee397-6bf8-4f20-b807-d7bc145ac980 +// Reference: 69c723d9-6e1a-4bff-a203-48eecd203183 studio.af-south-1.sagemaker.aws studio.ap-east-1.sagemaker.aws studio.ap-northeast-1.sagemaker.aws @@ -11837,6 +11884,7 @@ studio.ca-central-1.sagemaker.aws studio.eu-central-1.sagemaker.aws studio.eu-north-1.sagemaker.aws studio.eu-south-1.sagemaker.aws +studio.eu-south-2.sagemaker.aws studio.eu-west-1.sagemaker.aws studio.eu-west-2.sagemaker.aws studio.eu-west-3.sagemaker.aws @@ -11881,7 +11929,7 @@ analytics-gateway.us-west-2.amazonaws.com // AWS Cloud9 // Submitted by: AWS Security -// Reference: 05c44955-977c-4b57-938a-f2af92733f9f +// Reference: 30717f72-4007-4f0f-8ed4-864c6f2efec9 webview-assets.aws-cloud9.af-south-1.amazonaws.com vfs.cloud9.af-south-1.amazonaws.com webview-assets.cloud9.af-south-1.amazonaws.com @@ -11927,6 +11975,8 @@ webview-assets.cloud9.eu-west-2.amazonaws.com webview-assets.aws-cloud9.eu-west-3.amazonaws.com vfs.cloud9.eu-west-3.amazonaws.com webview-assets.cloud9.eu-west-3.amazonaws.com +webview-assets.aws-cloud9.il-central-1.amazonaws.com +vfs.cloud9.il-central-1.amazonaws.com webview-assets.aws-cloud9.me-south-1.amazonaws.com vfs.cloud9.me-south-1.amazonaws.com webview-assets.cloud9.me-south-1.amazonaws.com @@ -11946,6 +11996,11 @@ webview-assets.aws-cloud9.us-west-2.amazonaws.com vfs.cloud9.us-west-2.amazonaws.com webview-assets.cloud9.us-west-2.amazonaws.com +// AWS Directory Service +// Submitted by AWS Security +// Reference: a13203e8-42dc-4045-a0d2-2ee67bed1068 +awsapps.com + // AWS Elastic Beanstalk // Submitted by AWS Security // Reference: bb5a965c-dec3-4967-aa22-e306ad064797 @@ -11989,6 +12044,11 @@ us-west-2.elasticbeanstalk.com // Reference: d916759d-a08b-4241-b536-4db887383a6a awsglobalaccelerator.com +// AWS re:Post Private +// Submitted by AWS Security +// Reference: 83385945-225f-416e-9aa0-ad0632bfdcee +*.private.repost.aws + // eero // Submitted by Yue Kang // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461 @@ -12006,6 +12066,10 @@ tele.amune.org // Submitted by Apigee Security Team apigee.io +// Apis Networks: https://apisnetworks.com +// Submitted by Matt Saladna +panel.dev + // Apphud : https://apphud.com // Submitted by Alexander Selivanov siiites.com @@ -12023,6 +12087,10 @@ appudo.net // Submitted by Thomas Orozco on-aptible.com +// Aquapal : https://aquapal.net/ +// Submitted by Aki Ueno +f5.si + // ASEINet : https://www.aseinet.com/ // Submitted by Asei SEKIGUCHI user.aseinet.ne.jp @@ -12058,6 +12126,7 @@ autocode.dev // AVM : https://avm.de // Submitted by Andreas Weise +myfritz.link myfritz.net // AVStack Pte. Ltd. : https://avstack.io @@ -12117,10 +12186,18 @@ beagleboard.io // Submitted by Lev Nekrasov *.beget.app +// Besties : https://besties.house +// Submitted by Hazel Cora +pages.gay + // BetaInABox // Submitted by Adrian betainabox.com +// University of Bielsko-Biala regional domain: http://dns.bielsko.pl/ +// Submitted by Marcin +bielsko.pl + // BinaryLane : http://www.binarylane.com // Submitted by Nathan O'Sullivan bnr.la @@ -12162,8 +12239,13 @@ square7.de bplaced.net square7.net +// Brave : https://brave.com +// Submitted by Andrea Brancaleoni +*.s.brave.io + // Brendly : https://brendly.rs -// Submitted by Dusan Radovanovic +// Submitted by Dusan Radovanovic +shop.brendly.hr shop.brendly.rs // BrowserSafetyMark @@ -12187,7 +12269,9 @@ mycd.eu // Canva Pty Ltd : https://canva.com/ // Submitted by Joel Aquilina canva-apps.cn +*.my.canvasite.cn canva-apps.com +*.my.canva.site // Carrd : https://carrd.co // Submitted by AJ @@ -12199,26 +12283,26 @@ ju.mp // CentralNic : http://www.centralnic.com/names/domains // Submitted by registry -ae.org +za.bz br.com cn.com -com.de -com.se de.com eu.com -gb.net -hu.net -jp.net jpn.com mex.com ru.com sa.com -se.net uk.com -uk.net us.com -za.bz za.com +com.de +gb.net +hu.net +jp.net +se.net +uk.net +ae.org +com.se // No longer operated by CentralNic, these entries should be adopted and/or removed by current operators // Submitted by Gavin Brown @@ -12239,8 +12323,8 @@ gr.com // Radix FZC : http://domains.in.net // Submitted by Gavin Brown -in.net web.in +in.net // US REGISTRY LLC : http://us.org // Submitted by Gavin Brown @@ -12278,7 +12362,10 @@ discourse.team // Clever Cloud : https://www.clever-cloud.com/ // Submitted by Quentin Adam +cleverapps.cc +*.services.clever-cloud.com cleverapps.io +cleverapps.tech // Clerk : https://www.clerk.dev // Submitted by Colin Sidoti @@ -12309,8 +12396,8 @@ cloudaccess.net // cloudControl : https://www.cloudcontrol.com/ // Submitted by Tobias Wilken -cloudcontrolled.com cloudcontrolapp.com +cloudcontrolled.com // Cloudera, Inc. : https://www.cloudera.com/ // Submitted by Kedarnath Waikar @@ -12324,6 +12411,17 @@ trycloudflare.com pages.dev r2.dev workers.dev +cdn.cloudflareanycast.net +cdn.cloudflarecn.net +cdn.cloudflareglobal.net +cloudflare.net +cdn.cloudflare.net + +// cloudscale.ch AG : https://www.cloudscale.ch/ +// Submitted by Gaudenz Steinlin +cust.cloudscale.ch +objects.lpg.cloudscale.ch +objects.rma.cloudscale.ch // Clovyr : https://clovyr.io // Submitted by Patrick Nielsen @@ -12342,22 +12440,33 @@ co.cz // CDN77.com : http://www.cdn77.com // Submitted by Jan Krpes -c.cdn77.org -cdn77-ssl.net +cdn77-storage.com +rsc.contentproxy9.cz r.cdn77.net +cdn77-ssl.net +c.cdn77.org rsc.cdn77.org ssl.origin.cdn77-secure.org // Cloud DNS Ltd : http://www.cloudns.net -// Submitted by Aleksander Hristov +// Submitted by Aleksander Hristov & Boyan Peychev cloudns.asia +cloudns.be cloudns.biz -cloudns.club cloudns.cc +cloudns.ch +cloudns.cl +cloudns.club +dnsabr.com +cloudns.cx cloudns.eu cloudns.in cloudns.info +dns-cloud.net +dns-dynamic.net +cloudns.nz cloudns.org +cloudns.ph cloudns.pro cloudns.pw cloudns.us @@ -12370,6 +12479,11 @@ cnpy.gdn // Submitted by Moritz Marquardt codeberg.page +// CodeSandbox B.V. : https://codesandbox.io +// Submitted by Ives van Hoorne +csb.app +preview.csb.app + // CoDNS B.V. co.nl co.no @@ -12379,6 +12493,10 @@ co.no webhosting.be hosting-cluster.nl +// Convex : https://convex.dev/ +// Submitted by James Cowling +convex.site + // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/ // Submitted by George Georgievsky ac.ru @@ -12391,8 +12509,8 @@ test.ru // COSIMO GmbH : http://www.cosimo.de // Submitted by Rene Marticke dyn.cosidns.de -dynamisches-dns.de dnsupdater.de +dynamisches-dns.de internet-dns.de l-o-g-i-n.de dynamic-dns.info @@ -12400,10 +12518,18 @@ feste-ip.net knx-server.net static-access.net +// cPanel L.L.C. : https://www.cpanel.net/ +// Submitted by Dustin Scherer +*.cprapid.com + // Craynic, s.r.o. : http://www.craynic.com/ // Submitted by Ales Krajnik realm.cz +// Crisp IM SAS : https://crisp.chat/ +// Submitted by Baptiste Jamin +on.crisp.email + // Cryptonomic : https://cryptonomic.net/ // Submitted by Andrew Cady *.cryptonomic.net @@ -12424,6 +12550,13 @@ curv.dev *.ocp.customer-oci.com *.ocs.customer-oci.com +// Cyclic Software : https://www.cyclic.sh +// Submitted by Kam Lasater +cyclic.app +cyclic.cloud +cyclic-app.com +cyclic.co.in + // cyon GmbH : https://www.cyon.ch/ // Submitted by Dominic Luechinger cyon.link @@ -12431,9 +12564,9 @@ cyon.site // Danger Science Group: https://dangerscience.com/ // Submitted by Skylar MacDonald +platform0.app fnwk.site folionetwork.site -platform0.app // Daplie, Inc : https://daplie.com // Submitted by AJ ONeal @@ -12469,6 +12602,7 @@ dyndns.dappnode.io // Dark, Inc. : https://darklang.com // Submitted by Paul Biggar builtwithdark.com +darklang.io // DataDetect, LLC. : https://datadetect.com // Submitted by Andrew Banchich @@ -12562,6 +12696,26 @@ dy.fi tunk.org // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ +dyndns.biz +for-better.biz +for-more.biz +for-some.biz +for-the.biz +selfip.biz +webhop.biz +ftpaccess.cc +game-server.cc +myphotos.cc +scrapping.cc +blogdns.com +cechire.com +dnsalias.com +dnsdojo.com +doesntexist.com +dontexist.com +doomdns.com +dyn-o-saur.com +dynalias.com dyndns-at-home.com dyndns-at-work.com dyndns-blog.com @@ -12576,64 +12730,14 @@ dyndns-server.com dyndns-web.com dyndns-wiki.com dyndns-work.com -dyndns.biz -dyndns.info -dyndns.org -dyndns.tv -at-band-camp.net -ath.cx -barrel-of-knowledge.info -barrell-of-knowledge.info -better-than.tv -blogdns.com -blogdns.net -blogdns.org -blogsite.org -boldlygoingnowhere.org -broke-it.net -buyshouses.net -cechire.com -dnsalias.com -dnsalias.net -dnsalias.org -dnsdojo.com -dnsdojo.net -dnsdojo.org -does-it.net -doesntexist.com -doesntexist.org -dontexist.com -dontexist.net -dontexist.org -doomdns.com -doomdns.org -dvrdns.org -dyn-o-saur.com -dynalias.com -dynalias.net -dynalias.org -dynathome.net -dyndns.ws -endofinternet.net -endofinternet.org -endoftheinternet.org est-a-la-maison.com est-a-la-masion.com est-le-patron.com est-mon-blogueur.com -for-better.biz -for-more.biz -for-our.info -for-some.biz -for-the.biz -forgot.her.name -forgot.his.name from-ak.com from-al.com from-ar.com -from-az.net from-ca.com -from-co.net from-ct.com from-dc.com from-de.com @@ -12646,10 +12750,8 @@ from-il.com from-in.com from-ks.com from-ky.com -from-la.net from-ma.com from-md.com -from-me.org from-mi.com from-mn.com from-mo.com @@ -12662,7 +12764,6 @@ from-nh.com from-nj.com from-nm.com from-nv.com -from-ny.net from-oh.com from-ok.com from-or.com @@ -12680,45 +12781,18 @@ from-wa.com from-wi.com from-wv.com from-wy.com -ftpaccess.cc -fuettertdasnetz.de -game-host.org -game-server.cc getmyip.com -gets-it.net -go.dyndns.org gotdns.com -gotdns.org -groks-the.info -groks-this.info -ham-radio-op.net -here-for-more.info hobby-site.com -hobby-site.org -home.dyndns.org -homedns.org -homeftp.net -homeftp.org -homeip.net homelinux.com -homelinux.net -homelinux.org homeunix.com -homeunix.net -homeunix.org iamallama.com -in-the-band.net is-a-anarchist.com is-a-blogger.com is-a-bookkeeper.com -is-a-bruinsfan.org is-a-bulls-fan.com -is-a-candidate.org is-a-caterer.com -is-a-celticsfan.org is-a-chef.com -is-a-chef.net -is-a-chef.org is-a-conservative.com is-a-cpa.com is-a-cubicle-slave.com @@ -12727,31 +12801,25 @@ is-a-designer.com is-a-doctor.com is-a-financialadvisor.com is-a-geek.com -is-a-geek.net -is-a-geek.org is-a-green.com is-a-guru.com is-a-hard-worker.com is-a-hunter.com -is-a-knight.org is-a-landscaper.com is-a-lawyer.com is-a-liberal.com is-a-libertarian.com -is-a-linux-user.org is-a-llama.com is-a-musician.com is-a-nascarfan.com is-a-nurse.com is-a-painter.com -is-a-patsfan.org is-a-personaltrainer.com is-a-photographer.com is-a-player.com is-a-republican.com is-a-rockstar.com is-a-socialist.com -is-a-soxfan.org is-a-student.com is-a-teacher.com is-a-techie.com @@ -12763,110 +12831,180 @@ is-an-anarchist.com is-an-artist.com is-an-engineer.com is-an-entertainer.com -is-by.us is-certified.com -is-found.org is-gone.com is-into-anime.com is-into-cars.com is-into-cartoons.com is-into-games.com is-leet.com -is-lost.org is-not-certified.com -is-saved.org is-slick.com is-uberleet.com -is-very-bad.org -is-very-evil.org -is-very-good.org -is-very-nice.org -is-very-sweet.org is-with-theband.com isa-geek.com -isa-geek.net -isa-geek.org isa-hockeynut.com issmarterthanyou.com -isteingeek.de -istmein.de -kicks-ass.net -kicks-ass.org -knowsitall.info -land-4-sale.us -lebtimnetz.de -leitungsen.de likes-pie.com likescandy.com -merseine.nu -mine.nu -misconfused.org -mypets.ws -myphotos.cc neat-url.com -office-on-the.net -on-the-web.tv -podzone.net -podzone.org -readmyblog.org saves-the-whales.com -scrapper-site.net -scrapping.cc -selfip.biz selfip.com -selfip.info -selfip.net -selfip.org sells-for-less.com sells-for-u.com -sells-it.net -sellsyourhome.org servebbs.com -servebbs.net -servebbs.org -serveftp.net -serveftp.org -servegame.org -shacknet.nu simple-url.com space-to-rent.com -stuff-4-sale.org -stuff-4-sale.us teaches-yoga.com -thruhere.net +writesthisblog.com +ath.cx +fuettertdasnetz.de +isteingeek.de +istmein.de +lebtimnetz.de +leitungsen.de traeumtgerade.de -webhop.biz +barrel-of-knowledge.info +barrell-of-knowledge.info +dyndns.info +for-our.info +groks-the.info +groks-this.info +here-for-more.info +knowsitall.info +selfip.info webhop.info -webhop.net -webhop.org -worse-than.tv -writesthisblog.com - -// ddnss.de : https://www.ddnss.de/ -// Submitted by Robert Niedziela -ddnss.de -dyn.ddnss.de -dyndns.ddnss.de -dyndns1.de -dyn-ip24.de -home-webserver.de -dyn.home-webserver.de -myhome-server.de -ddnss.org - -// Definima : http://www.definima.com/ -// Submitted by Maxence Bitterli -definima.net -definima.io - -// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/ -// Submitted by Braxton Huggins +forgot.her.name +forgot.his.name +at-band-camp.net +blogdns.net +broke-it.net +buyshouses.net +dnsalias.net +dnsdojo.net +does-it.net +dontexist.net +dynalias.net +dynathome.net +endofinternet.net +from-az.net +from-co.net +from-la.net +from-ny.net +gets-it.net +ham-radio-op.net +homeftp.net +homeip.net +homelinux.net +homeunix.net +in-the-band.net +is-a-chef.net +is-a-geek.net +isa-geek.net +kicks-ass.net +office-on-the.net +podzone.net +scrapper-site.net +selfip.net +sells-it.net +servebbs.net +serveftp.net +thruhere.net +webhop.net +merseine.nu +mine.nu +shacknet.nu +blogdns.org +blogsite.org +boldlygoingnowhere.org +dnsalias.org +dnsdojo.org +doesntexist.org +dontexist.org +doomdns.org +dvrdns.org +dynalias.org +dyndns.org +go.dyndns.org +home.dyndns.org +endofinternet.org +endoftheinternet.org +from-me.org +game-host.org +gotdns.org +hobby-site.org +homedns.org +homeftp.org +homelinux.org +homeunix.org +is-a-bruinsfan.org +is-a-candidate.org +is-a-celticsfan.org +is-a-chef.org +is-a-geek.org +is-a-knight.org +is-a-linux-user.org +is-a-patsfan.org +is-a-soxfan.org +is-found.org +is-lost.org +is-saved.org +is-very-bad.org +is-very-evil.org +is-very-good.org +is-very-nice.org +is-very-sweet.org +isa-geek.org +kicks-ass.org +misconfused.org +podzone.org +readmyblog.org +selfip.org +sellsyourhome.org +servebbs.org +serveftp.org +servegame.org +stuff-4-sale.org +webhop.org +better-than.tv +dyndns.tv +on-the-web.tv +worse-than.tv +is-by.us +land-4-sale.us +stuff-4-sale.us +dyndns.ws +mypets.ws + +// ddnss.de : https://www.ddnss.de/ +// Submitted by Robert Niedziela +ddnss.de +dyn.ddnss.de +dyndns.ddnss.de +dyn-ip24.de +dyndns1.de +home-webserver.de +dyn.home-webserver.de +myhome-server.de +ddnss.org + +// Definima : http://www.definima.com/ +// Submitted by Maxence Bitterli +definima.io +definima.net + +// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/ +// Submitted by Braxton Huggins ondigitalocean.app // DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/ // Submitted by Robin H. Johnson *.digitaloceanspaces.com +// DigitalPlat : https://www.digitalplat.org/ +// Submitted by Edward Hsing +us.kg + // dnstrace.pro : https://dnstrace.pro/ // Submitted by Chris Partridge bci.dnstrace.pro @@ -12904,6 +13042,26 @@ e4.cz easypanel.app easypanel.host +// EasyWP : https://www.easywp.com +// Submitted by +*.ewp.live + +// eDirect Corp. : https://hosting.url.com.tw/ +// Submitted by C.S. chang +twmail.cc +twmail.net +twmail.org +mymailer.com.tw +url.tw + +// Electromagnetic Field : https://www.emfcamp.org +// Submitted by +at.emf.camp + +// Elefunc, Inc. : https://elefunc.com +// Submitted by Cetin Sert +rt.ht + // Elementor : Elementor Ltd. // Submitted by Anton Barkan elementor.cloud @@ -12914,7 +13072,7 @@ elementor.cool en-root.fr // Enalean SAS: https://www.enalean.com -// Submitted by Thomas Cottier +// Submitted by Enalean Security Team mytuleap.com tuleap-partners.com @@ -13006,22 +13164,20 @@ us-2.evennode.com us-3.evennode.com us-4.evennode.com -// eDirect Corp. : https://hosting.url.com.tw/ -// Submitted by C.S. chang -twmail.cc -twmail.net -twmail.org -mymailer.com.tw -url.tw +// Evervault : https://evervault.com +// Submitted by Hannah Neary +relay.evervault.app +relay.evervault.dev + +// Expo : https://expo.dev/ +// Submitted by James Ide +expo.app +staging.expo.app // Fabrica Technologies, Inc. : https://www.fabrica.dev/ // Submitted by Eric Jiang onfabrica.com -// Facebook, Inc. -// Submitted by Peter Ruibal -apps.fbsbx.com - // FAITID : https://faitid.org/ // Submitted by Maxim Alzoba // https://www.flexireg.net/stat_info @@ -13108,8 +13264,6 @@ u.channelsdvr.net edgecompute.app fastly-edge.com fastly-terrarium.com -fastlylb.net -map.fastlylb.net freetls.fastly.net map.fastly.net a.prod.fastly.net @@ -13117,6 +13271,8 @@ global.prod.fastly.net a.ssl.fastly.net b.ssl.fastly.net global.ssl.fastly.net +fastlylb.net +map.fastlylb.net // Fastmail : https://www.fastmail.com/ // Submitted by Marc Bradshaw @@ -13179,11 +13335,15 @@ flap.id onflashdrive.app fldrv.com +// FlutterFlow : https://flutterflow.io +// Submitted by Anton Emelyanov +flutterflow.app + // fly.io: https://fly.io // Submitted by Kurt Mackey fly.dev -edgeapp.net shw.io +edgeapp.net // Flynn : https://flynn.io // Submitted by Jonathan Rudenberg @@ -13195,7 +13355,8 @@ forgeblocks.com id.forgerock.io // Framer : https://www.framer.com -// Submitted by Koen Rouwhorst +// Submitted by Koen Rouwhorst +framer.ai framer.app framercanvas.com framer.media @@ -13236,6 +13397,24 @@ freemyip.com // Submitted by Daniel A. Maierhofer wien.funkfeuer.at +// Future Versatile Group. : https://www.fvg-on.net/ +// T.Kabu +daemon.asia +dix.asia +mydns.bz +0am.jp +0g0.jp +0j0.jp +0t0.jp +mydns.jp +pgw.jp +wjg.jp +keyword-on.net +live-on.net +server-on.net +mydns.tw +mydns.vc + // Futureweb GmbH : https://www.futureweb.at // Submitted by Andreas Schnederle-Wagner *.futurecms.at @@ -13247,8 +13426,14 @@ futuremailing.at *.kunden.ortsinfo.at *.statics.cloud +// GCom Internet : https://www.gcom.net.au +// Submitted by Leo Julius +aliases121.com + // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names // Submitted by Stephen Ford +campaign.gov.uk +service.gov.uk independent-commission.uk independent-inquest.uk independent-inquiry.uk @@ -13256,8 +13441,6 @@ independent-panel.uk independent-review.uk public-inquiry.uk royal-commission.uk -campaign.gov.uk -service.gov.uk // CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk // Submitted by Jamie Tanna @@ -13275,9 +13458,11 @@ gentlentapis.com lab.ms cdn-edges.net -// Ghost Foundation : https://ghost.org -// Submitted by Matt Hanley -ghost.io +// Getlocalcert: https://www.getlocalcert.net +// Submitted by Robert Alexander +localcert.net +localhostcert.net +corpnet.work // GignoSystemJapan: http://gsj.bz // Submitted by GignoSystemJapan @@ -13421,6 +13606,10 @@ whitesnow.jp zombie.jp heteml.net +// GoDaddy Registry : https://registry.godaddy +// Submitted by Rohan Durrant +graphic.design + // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/ // Submitted by Tom Whitwell cloudapps.digital @@ -13430,85 +13619,69 @@ london.cloudapps.digital // Submitted by Richard Baker pymnt.uk -// UKHomeOffice : https://www.gov.uk/government/organisations/home-office -// Submitted by Jon Shanks -homeoffice.gov.uk - -// GlobeHosting, Inc. -// Submitted by Zoltan Egresi -ro.im - // GoIP DNS Services : http://www.goip.de // Submitted by Christian Poulter goip.de // Google, Inc. -// Submitted by Eduardo Vela -run.app -a.run.app -web.app -*.0emm.com -appspot.com -*.r.appspot.com -codespot.com -googleapis.com -googlecode.com -pagespeedmobilizer.com -publishproxy.com -withgoogle.com -withyoutube.com -*.gateway.dev -cloud.goog -translate.goog -*.usercontent.goog -cloudfunctions.net +// Submitted by Shannon McCabe blogspot.ae blogspot.al blogspot.am +*.hosted.app +*.run.app +web.app +blogspot.com.ar +blogspot.co.at +blogspot.com.au blogspot.ba blogspot.be blogspot.bg blogspot.bj +blogspot.com.br +blogspot.com.by blogspot.ca blogspot.cf blogspot.ch blogspot.cl -blogspot.co.at -blogspot.co.id -blogspot.co.il -blogspot.co.ke -blogspot.co.nz -blogspot.co.uk -blogspot.co.za -blogspot.com -blogspot.com.ar -blogspot.com.au -blogspot.com.br -blogspot.com.by blogspot.com.co -blogspot.com.cy -blogspot.com.ee -blogspot.com.eg -blogspot.com.es -blogspot.com.mt -blogspot.com.ng -blogspot.com.tr -blogspot.com.uy +*.0emm.com +appspot.com +*.r.appspot.com +blogspot.com +codespot.com +googleapis.com +googlecode.com +pagespeedmobilizer.com +publishproxy.com +withgoogle.com +withyoutube.com blogspot.cv +blogspot.com.cy blogspot.cz blogspot.de +*.gateway.dev blogspot.dk +blogspot.com.ee +blogspot.com.eg +blogspot.com.es blogspot.fi blogspot.fr +cloud.goog +translate.goog +*.usercontent.goog blogspot.gr blogspot.hk blogspot.hr blogspot.hu +blogspot.co.id blogspot.ie +blogspot.co.il blogspot.in blogspot.is blogspot.it blogspot.jp +blogspot.co.ke blogspot.kr blogspot.li blogspot.lt @@ -13516,10 +13689,14 @@ blogspot.lu blogspot.md blogspot.mk blogspot.mr +blogspot.com.mt blogspot.mx blogspot.my +cloudfunctions.net +blogspot.com.ng blogspot.nl blogspot.no +blogspot.co.nz blogspot.pe blogspot.pt blogspot.qa @@ -13533,9 +13710,13 @@ blogspot.si blogspot.sk blogspot.sn blogspot.td +blogspot.com.tr blogspot.tw blogspot.ug +blogspot.co.uk +blogspot.com.uy blogspot.vn +blogspot.co.za // Goupile : https://goupile.fr // Submitted by Niels Martignene @@ -13545,6 +13726,10 @@ goupile.fr // Submitted by gov.nl +// GrayJay Web Solutions Inc. : https://grayjaysports.ca +// Submitted by Matt Yamkowy +grayjayleagues.com + // Group 53, LLC : https://www.group53.com // Submitted by Tyler Todd awsmppl.com @@ -13564,8 +13749,8 @@ conf.se // Handshake : https://handshake.org // Submitted by Mike Damm -hs.zone hs.run +hs.zone // Hashbang : https://hashbang.sh hashbang.sh @@ -13579,6 +13764,15 @@ hasura-app.io // Submitted by Richard Zowalla pages.it.hs-heilbronn.de +// Helio Networks : https://heliohost.org +// Submitted by Ben Frede +helioho.st +heliohost.us + +// HeiyuSpace: https://lazycat.cloud +// Submitted by Xia Bin +heiyu.space + // Hepforge : https://www.hepforge.org // Submitted by David Grellscheid hepforge.org @@ -13592,7 +13786,6 @@ herokussl.com // Submitted by Oren Eini ravendb.cloud ravendb.community -ravendb.me development.run ravendb.run @@ -13600,6 +13793,12 @@ ravendb.run // Submitted by Krzysztof Wolski homesklep.pl +// Homebase : https://homebase.id/ +// Submitted by Jason Babo +*.kin.one +*.id.pub +*.kin.pub + // Hong Kong Productivity Council: https://www.hkpc.org/ // Submitted by SECaaS Team secaas.hk @@ -13628,6 +13827,10 @@ ie.ua // HostyHosting (hostyhosting.com) hostyhosting.io +// Hypernode B.V. : https://www.hypernode.com/ +// Submitted by Cipriano Groenendal +hypernode.io + // Häkkinen.fi // Submitted by Eero Häkkinen häkkinen.fi @@ -13648,8 +13851,8 @@ iliadboxos.it // Impertrix Solutions : // Submitted by Zhixiang Zhao -impertrixcdn.com impertrix.com +impertrixcdn.com // Incsub, LLC: https://incsub.com/ // Submitted by Aaron Edwards @@ -13666,10 +13869,10 @@ in-berlin.de in-brb.de in-butter.de in-dsl.de -in-dsl.net -in-dsl.org in-vpn.de +in-dsl.net in-vpn.net +in-dsl.org in-vpn.org // info.at : http://www.info.at/ @@ -13677,7 +13880,7 @@ biz.at info.at // info.cx : http://info.cx -// Submitted by Jacob Slater +// Submitted by June Slater info.cx // Interlegis : http://www.interlegis.leg.br @@ -13726,6 +13929,14 @@ iopsys.se // Submitted by Matthew Hardeman ipifony.net +// is-a.dev : https://www.is-a.dev +// Submitted by William Harrison +is-a.dev + +// ir.md : https://nic.ir.md +// Submitted by Ali Soizi +ir.md + // IServ GmbH : https://iserv.de // Submitted by Mario Hoberg iservschule.de @@ -13834,10 +14045,15 @@ myjino.ru // Submitted by Daniel Fariña jotelulu.cloud +// JouwWeb B.V. : https://www.jouwweb.nl +// Submitted by Camilo Sperberg +webadorsite.com +jouwweb.site + // Joyent : https://www.joyent.com/ // Submitted by Brian Bennett -*.triton.zone *.cns.joyent.com +*.triton.zone // JS.ORG : http://dns.js.org // Submitted by Stefan Keim @@ -13879,8 +14095,8 @@ oya.to // Katholieke Universiteit Leuven: https://www.kuleuven.be // Submitted by Abuse KU Leuven -kuleuven.cloud ezproxy.kuleuven.be +kuleuven.cloud // .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf co.krd @@ -13888,8 +14104,8 @@ edu.krd // Krellian Ltd. : https://krellian.com // Submitted by Ben Francis -krellian.net webthings.io +krellian.net // LCube - Professional hosting e.K. : https://www.lcube-webhosting.de // Submitted by Lars Laehn @@ -13907,6 +14123,10 @@ lpusercontent.com // Submitted by Lelux Admin lelux.site +// Libre IT Ltd : https://libre.nz +// Submitted by Tomas Maggio +runcontainers.dev + // Lifetime Hosting : https://Lifetime.Hosting/ // Submitted by Mike Fillator co.business @@ -13917,14 +14137,10 @@ co.network co.place co.technology -// Lightmaker Property Manager, Inc. : https://app.lmpm.com/ -// Submitted by Greg Holland -app.lmpm.com - // linkyard ldt: https://www.linkyard.ch/ // Submitted by Mario Siegenthaler -linkyard.cloud linkyard-cloud.ch +linkyard.cloud // Linode : https://linode.com // Submitted by @@ -13979,18 +14195,19 @@ lugs.org.uk // Lukanet Ltd : https://lukanet.com // Submitted by Anton Avramov barsy.bg -barsy.co.uk -barsyonline.co.uk +barsy.club barsycenter.com barsyonline.com -barsy.club barsy.de +barsy.dev barsy.eu +barsy.gr barsy.in barsy.info barsy.io barsy.me barsy.menu +barsyonline.menu barsy.mobi barsy.net barsy.online @@ -13998,10 +14215,15 @@ barsy.org barsy.pro barsy.pub barsy.ro +barsy.rs barsy.shop +barsyonline.shop barsy.site +barsy.store barsy.support barsy.uk +barsy.co.uk +barsyonline.co.uk // Magento Commerce // Submitted by Damien Tournoud @@ -14016,10 +14238,6 @@ mayfirst.org // Submitted by Ilya Zaretskiy hb.cldmail.ru -// Mail Transfer Platform : https://www.neupeer.com -// Submitted by Li Hui -cn.vu - // Maze Play: https://www.mazeplay.com // Submitted by Adam Humpherys mazeplay.com @@ -14032,8 +14250,8 @@ mcpe.me // Submitted by Evgeniy Subbotin mcdir.me mcdir.ru -mcpre.ru vps.mcdir.ru +mcpre.ru // Mediatech : https://mediatech.by // Submitted by Evgeniy Kozhuhovskiy @@ -14053,6 +14271,11 @@ memset.net // Submitted by Ruben Schmidmeister messerli.app +// Meta Platforms, Inc. : https://meta.com/ +// Submitted by Jacob Cordero +atmeta.com +apps.fbsbx.com + // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ // Submitted by Zdeněk Šustr *.cloud.metacentrum.cz @@ -14073,10 +14296,13 @@ co.pl // Microsoft Corporation : http://microsoft.com // Submitted by Public Suffix List Admin +// Managed by Corporate Domains +// Microsoft Azure : https://home.azure *.azurecontainer.io -azurewebsites.net +azure-api.net azure-mobile.net -cloudapp.net +azureedge.net +azurefd.net azurestaticapps.net 1.azurestaticapps.net 2.azurestaticapps.net @@ -14090,6 +14316,11 @@ eastasia.azurestaticapps.net eastus2.azurestaticapps.net westeurope.azurestaticapps.net westus2.azurestaticapps.net +azurewebsites.net +cloudapp.net +trafficmanager.net +blob.core.windows.net +servicebus.windows.net // minion.systems : http://minion.systems // Submitted by Robert Böttinger @@ -14103,6 +14334,10 @@ mintere.site // Submitted by Grayson Martin forte.id +// MODX Systems LLC : https://modx.com +// Submitted by Elizabeth Southwell +modx.dev + // Mozilla Corporation : https://mozilla.com // Submitted by Ben Francis mozilla-iot.org @@ -14120,8 +14355,8 @@ pp.ru // Mythic Beasts : https://www.mythic-beasts.com // Submitted by Paul Cammish hostedpi.com -customer.mythic-beasts.com caracal.mythic-beasts.com +customer.mythic-beasts.com fentiger.mythic-beasts.com lynx.mythic-beasts.com ocelot.mythic-beasts.com @@ -14141,6 +14376,10 @@ ui.nabu.casa // Submitted by Jan Jaeschke cloud.nospamproxy.com +// Netfy Domains : https://netfy.domains +// Submitted by Suranga Ranasinghe +netfy.app + // Netlify : https://www.netlify.com // Submitted by Jessica Parsons netlify.app @@ -14149,6 +14388,10 @@ netlify.app // Submitted by Trung Tran 4u.com +// NGO.US Registry : https://nic.ngo.us +// Submitted by Alstra Solutions Ltd. Networking Team +ngo.us + // ngrok : https://ngrok.com/ // Submitted by Alan Shreve ngrok.app @@ -14164,18 +14407,24 @@ jp.ngrok.io sa.ngrok.io us.ngrok.io ngrok.pizza +ngrok.pro // Nicolaus Copernicus University in Torun - MSK TORMAN (https://www.man.torun.pl) torun.pl // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/ -// Submitted by Nicholas Ford +// Submitted by Nicholas Ford nh-serv.co.uk +nimsite.uk // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ // Submitted by Jeff Wheelhouse nfshost.com +// NFT.Storage : https://nft.storage/ +// Submitted by Vasco Santos or +ipfs.nftstorage.link + // Noop : https://noop.app // Submitted by Nathaniel Schweinberg *.developer.app @@ -14193,6 +14442,10 @@ noop.app // Submitted by Laurent Pellegrino noticeable.news +// Notion Labs, Inc : https://www.notion.so/ +// Submitted by Jess Yao +notion.site + // Now-DNS : https://now-dns.com // Submitted by Steve Russell dnsking.ch @@ -14228,91 +14481,91 @@ nerdpol.ovh // No-IP.com : https://noip.com/ // Submitted by Deven Reza +mmafan.biz +myftp.biz +no-ip.biz +no-ip.ca +fantasyleague.cc +gotdns.ch +3utilities.com blogsyte.com -brasilia.me -cable-modem.org ciscofreak.com -collegefan.org -couchpotatofries.org damnserver.com -ddns.me +ddnsking.com ditchyourip.com -dnsfor.me dnsiskinky.com -dvrcam.info dynns.com -eating-organic.net -fantasyleague.cc geekgalaxy.com -golffan.us health-carereform.com homesecuritymac.com homesecuritypc.com -hopto.me -ilovecollege.info -loginto.me -mlbfan.org -mmafan.biz myactivedirectory.com -mydissent.net -myeffect.net -mymediapc.net -mypsx.net mysecuritycamera.com -mysecuritycamera.net -mysecuritycamera.org +myvnc.com net-freaks.com -nflfan.org -nhlfan.net -no-ip.ca -no-ip.co.uk -no-ip.net -noip.us onthewifi.com -pgafan.net point2this.com -pointto.us -privatizehealthinsurance.net quicksytes.com -read-books.org securitytactics.com +servebeer.com +servecounterstrike.com serveexchange.com +serveftp.com +servegame.com +servehalflife.com +servehttp.com servehumour.com +serveirc.com +servemp3.com servep2p.com +servepics.com +servequake.com servesarcasm.com stufftoread.com -ufcfan.org unusualperson.com workisboring.com -3utilities.com -bounceme.net -ddns.net -ddnsking.com -gotdns.ch -hopto.org -myftp.biz -myftp.org -myvnc.com -no-ip.biz +dvrcam.info +ilovecollege.info no-ip.info -no-ip.org +brasilia.me +ddns.me +dnsfor.me +hopto.me +loginto.me noip.me +webhop.me +bounceme.net +ddns.net +eating-organic.net +mydissent.net +myeffect.net +mymediapc.net +mypsx.net +mysecuritycamera.net +nhlfan.net +no-ip.net +pgafan.net +privatizehealthinsurance.net redirectme.net -servebeer.com serveblog.net -servecounterstrike.com -serveftp.com -servegame.com -servehalflife.com -servehttp.com -serveirc.com serveminecraft.net -servemp3.com -servepics.com -servequake.com sytes.net -webhop.me +cable-modem.org +collegefan.org +couchpotatofries.org +hopto.org +mlbfan.org +myftp.org +mysecuritycamera.org +nflfan.org +no-ip.org +read-books.org +ufcfan.org zapto.org +no-ip.co.uk +golffan.us +noip.us +pointto.us // NodeArt : https://nodeart.io // Submitted by Konstantin Nosov @@ -14326,8 +14579,17 @@ pcloud.host // Submitted by Matthew Brown nyc.mn +// O3O.Foundation : https://o3o.foundation/ +// Submitted by the prvcy.page Registry Team +prvcy.page + +// Obl.ong : +// Submitted by Reese Armstrong +obl.ong + // Observable, Inc. : https://observablehq.com // Submitted by Mike Bostock +observablehq.cloud static.observableusercontent.com // Octopodal Solutions, LLC. : https://ulterius.io/ @@ -14348,31 +14610,37 @@ omniwe.site // One.com: https://www.one.com/ // Submitted by Jacob Bunk Nielsen -123hjemmeside.dk -123hjemmeside.no -123homepage.it -123kotisivu.fi -123minsida.se -123miweb.es -123paginaweb.pt -123sait.ru -123siteweb.fr 123webseite.at -123webseite.de 123website.be +simplesite.com.br 123website.ch +simplesite.com +123webseite.de +123hjemmeside.dk +123miweb.es +123kotisivu.fi +123siteweb.fr +simplesite.gr +123homepage.it 123website.lu 123website.nl +123hjemmeside.no service.one -simplesite.com -simplesite.com.br -simplesite.gr simplesite.pl +123paginaweb.pt +123minsida.se // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones nid.io +// Open Domains : https://open-domains.net +// Submitted by William Harrison +is-cool.dev +is-not-a.dev +localplayer.dev +is-local.org + // Open Social : https://www.getopensocial.com/ // Submitted by Alexander Varwijk opensocial.site @@ -14393,6 +14661,11 @@ operaunite.com // Submitted by Alexandre Linte tech.orange +// OsSav Technology Ltd. : https://ossav.com/ +// TLD Nic: http://nic.can.re - TLD Whois Server: whois.can.re +// Submitted by OsSav Technology Ltd. +can.re + // Oursky Limited : https://authgear.com/, https://skygear.io/ // Submitted by Authgear Team , Skygear Developer authgear-staging.com @@ -14405,8 +14678,8 @@ outsystemscloud.com // OVHcloud: https://ovhcloud.com // Submitted by Vincent Cassé -*.webpaas.ovh.net *.hosting.ovh.net +*.webpaas.ovh.net // OwnProvider GmbH: http://www.ownprovider.com // Submitted by Jan Moennich @@ -14443,10 +14716,12 @@ pagexl.com // pcarrier.ca Software Inc: https://pcarrier.ca/ // Submitted by Pierre Carrier -bar0.net -bar1.net -bar2.net -rdv.to +*.xmit.co +xmit.dev +madethis.site +srv.us +gh.srv.us +gl.srv.us // .pl domains (grandfathered) art.pl @@ -14458,8 +14733,8 @@ zakopane.pl // Pantheon Systems, Inc. : https://pantheon.io/ // Submitted by Gary Dylina -pantheonsite.io gotpantheon.com +pantheonsite.io // Peplink | Pepwave : http://peplink.com/ // Submitted by Steve Leung @@ -14479,7 +14754,8 @@ on-web.fr // Platform.sh : https://platform.sh // Submitted by Nikola Kotur -bc.platform.sh +*.upsun.app +upsunapp.com ent.platform.sh eu.platform.sh us.platform.sh @@ -14494,9 +14770,13 @@ platterp.us // Plesk : https://www.plesk.com/ // Submitted by Anton Akhtyamov +pleskns.com pdns.page plesk.page -pleskns.com + +// Pley AB : https://www.pley.com/ +// Submitted by Henning Pohl +pley.games // Port53 : https://port53.io/ // Submitted by Maximilian Schieder @@ -14517,8 +14797,8 @@ pstmn.io mock.pstmn.io httpbin.org -//prequalifyme.today : https://prequalifyme.today -//Submitted by DeepakTiwari deepak@ivylead.io +// prequalifyme.today : https://prequalifyme.today +// Submitted by DeepakTiwari deepak@ivylead.io prequalifyme.today // prgmr.com : https://prgmr.com/ @@ -14529,10 +14809,6 @@ xen.prgmr.com // Submitted by registry priv.at -// privacytools.io : https://www.privacytools.io/ -// Submitted by Jonah Aragon -prvcy.page - // Protocol Labs : https://protocol.ai/ // Submitted by Michael Burns *.dweb.link @@ -14574,6 +14850,8 @@ qbuser.com // Rad Web Hosting: https://radwebhosting.com // Submitted by Scott Claeys cloudsite.builders +myradweb.net +servername.us // Redgate Software: https://red-gate.com // Submitted by Andrew Farries @@ -14597,9 +14875,12 @@ qcx.io *.sys.qcx.io // QNAP System Inc : https://www.qnap.com -// Submitted by Nick Chang -dev-myqnapcloud.com +// Submitted by Nick Chang +myqnapcloud.cn alpha-myqnapcloud.com +dev-myqnapcloud.com +mycloudnas.com +mynascloud.com myqnapcloud.com // Quip : https://quip.com @@ -14622,8 +14903,8 @@ g.vbrplsbx.io // Rancher Labs, Inc : https://rancher.com // Submitted by Vincent Fiduccia -*.on-k3s.io *.on-rancher.cloud +*.on-k3s.io *.on-rio.io // Read The Docs, Inc : https://www.readthedocs.org @@ -14636,15 +14917,44 @@ rhcloud.com // Render : https://render.com // Submitted by Anurag Goel -app.render.com onrender.com +app.render.com // Repl.it : https://repl.it -// Submitted by Lincoln Bergeson +// Submitted by Lincoln Bergeson +replit.app +id.replit.app firewalledreplit.co id.firewalledreplit.co repl.co id.repl.co +replit.dev +archer.replit.dev +bones.replit.dev +canary.replit.dev +global.replit.dev +hacker.replit.dev +id.replit.dev +janeway.replit.dev +kim.replit.dev +kira.replit.dev +kirk.replit.dev +odo.replit.dev +paris.replit.dev +picard.replit.dev +pike.replit.dev +prerelease.replit.dev +reed.replit.dev +riker.replit.dev +sisko.replit.dev +spock.replit.dev +staging.replit.dev +sulu.replit.dev +tarpit.replit.dev +teams.replit.dev +tucker.replit.dev +wesley.replit.dev +worf.replit.dev repl.run // Resin.io : https://resin.io @@ -14741,10 +15051,19 @@ from.tv sakura.tv // Salesforce.com, Inc. https://salesforce.com/ -// Submitted by Michael Biven +// Submitted by Salesforce Public Suffix List Team *.builder.code.com *.dev-builder.code.com *.stg-builder.code.com +*.001.test.code-builder-stg.platform.salesforce.com +*.d.crm.dev +*.w.crm.dev +*.wa.crm.dev +*.wb.crm.dev +*.wc.crm.dev +*.wd.crm.dev +*.we.crm.dev +*.wf.crm.dev // Sandstorm Development Group, Inc. : https://sandcats.io/ // Submitted by Asheesh Laroia @@ -14752,14 +15071,15 @@ sandcats.io // SBE network solutions GmbH : https://www.sbe.de/ // Submitted by Norman Meilick -logoip.de logoip.com +logoip.de // Scaleway : https://www.scaleway.com/ // Submitted by Rémy Léone fr-par-1.baremetal.scw.cloud fr-par-2.baremetal.scw.cloud nl-ams-1.baremetal.scw.cloud +cockpit.fr-par.scw.cloud fnc.fr-par.scw.cloud functions.fnc.fr-par.scw.cloud k8s.fr-par.scw.cloud @@ -14770,11 +15090,13 @@ whm.fr-par.scw.cloud priv.instances.scw.cloud pub.instances.scw.cloud k8s.scw.cloud +cockpit.nl-ams.scw.cloud k8s.nl-ams.scw.cloud nodes.k8s.nl-ams.scw.cloud s3.nl-ams.scw.cloud s3-website.nl-ams.scw.cloud whm.nl-ams.scw.cloud +cockpit.pl-waw.scw.cloud k8s.pl-waw.scw.cloud nodes.k8s.pl-waw.scw.cloud s3.pl-waw.scw.cloud @@ -14796,6 +15118,10 @@ service.gov.scot // Submitted by Shante Adam scrysec.com +// Scrypted : https://scrypted.app +// Submitted by Koushik Dutta +client.scrypted.io + // Securepoint GmbH : https://www.securepoint.de // Submitted by Erik Anders firewall-gateway.com @@ -14835,6 +15161,14 @@ biz.ua co.ua pp.ua +// Shanghai Accounting Society : https://www.sasf.org.cn +// Submitted by Information Administration +as.sh.cn + +// Sheezy.Art : https://sheezy.art +// Submitted by Nyoom +sheezy.games + // Shift Crypto AG : https://shiftcrypto.ch // Submitted by alex shiftcrypto.dev @@ -14905,9 +15239,9 @@ small-web.org vp4.me // Snowflake Inc : https://www.snowflake.com/ -// Submitted by Faith Olapade -snowflake.app -privatelink.snowflake.app +// Submitted by Sam Haar +*.snowflake.app +*.privatelink.snowflake.app streamlit.app streamlitapp.com @@ -14919,14 +15253,32 @@ try-snowplow.com // Submitted by Drew DeVault srht.site +// SparrowHost : https://sparrowhost.in/ +// Submitted by Anant Pandey +ind.mom + +// StackBlitz : https://stackblitz.com +// Submitted by Dominic Elm +w-corp-staticblitz.com +w-credentialless-staticblitz.com +w-staticblitz.com + // Stackhero : https://www.stackhero.io // Submitted by Adrien Gillon stackhero-network.com +// STACKIT : https://www.stackit.de/en/ +// Submitted by STACKIT-DNS Team (Simon Stier) +runs.onstackit.cloud +stackit.gg +stackit.rocks +stackit.run +stackit.zone + // Staclar : https://staclar.com // Submitted by Q Misell -musician.io // Submitted by Matthias Merkel +musician.io novecore.site // staticland : https://static.land @@ -14939,6 +15291,11 @@ sites.static.land // Submitted by Tony Schirmer storebase.store +// Strapi : https://strapi.io/ +// Submitted by Florent Baldino +strapiapp.com +media.strapiapp.com + // Strategic System Consulting (eApps Hosting): https://www.eapps.com/ // Submitted by Alex Oancea vps-host.net @@ -14989,6 +15346,19 @@ myspreadshop.co.uk // Submitted by Jacob Lee api.stdlib.com +// stereosense GmbH : https://www.involve.me +// Submitted by Florian Burmann +feedback.ac +forms.ac +assessments.cx +calculators.cx +funnels.cx +paynow.cx +quizzes.cx +researched.cx +tests.cx +surveys.so + // Storipress : https://storipress.com // Submitted by Benno Liu storipress.app @@ -14997,6 +15367,12 @@ storipress.app // Submitted by Philip Hutchins storj.farm +// Streak : https://streak.com +// Submitted by Blake Kadatz +streak-link.com +streaklinks.com +streakusercontent.com + // Studenten Net Twente : http://www.snt.utwente.nl/ // Submitted by Silke Hofstra utwente.io @@ -15019,8 +15395,8 @@ su.paba.se // Symfony, SAS : https://symfony.com/ // Submitted by Fabien Potencier -*.s5y.io *.sensiosite.cloud +*.s5y.io // Syncloud : https://syncloud.org // Submitted by Boris Rybalkin @@ -15042,14 +15418,14 @@ dsmynas.net familyds.net dsmynas.org familyds.org -vpnplus.to direct.quickconnect.to +vpnplus.to // Tabit Technologies Ltd. : https://tabit.cloud/ // Submitted by Oren Agiv -tabitorder.co.il -mytabit.co.il mytabit.com +mytabit.co.il +tabitorder.co.il // TAIFUN Software AG : http://taifun-software.de // Submitted by Bjoern Henke @@ -15059,6 +15435,7 @@ taifun-dns.de // Submitted by David Anderson beta.tailscale.net ts.net +*.c.ts.net // TASK geographical domains (www.task.gda.pl/uslugi/dns) gda.pl @@ -15089,11 +15466,11 @@ telebit.io reservd.com thingdustdata.com cust.dev.thingdust.io +reservd.dev.thingdust.io cust.disrec.thingdust.io +reservd.disrec.thingdust.io cust.prod.thingdust.io cust.testing.thingdust.io -reservd.dev.thingdust.io -reservd.disrec.thingdust.io reservd.testing.thingdust.io // ticket i/O GmbH : https://ticket.io @@ -15155,8 +15532,6 @@ tuxfamily.org // TwoDNS : https://www.twodns.de/ // Submitted by TwoDNS-Support dd-dns.de -diskstation.eu -diskstation.org dray-dns.de draydns.de dyn-vpn.de @@ -15167,6 +15542,8 @@ my-wan.de syno-ds.de synology-diskstation.de synology-ds.de +diskstation.eu +diskstation.org // Typedream : https://typedream.com // Submitted by Putri Karunia @@ -15178,20 +15555,24 @@ pro.typeform.com // Uberspace : https://uberspace.de // Submitted by Moritz Werner -uber.space *.uberspace.de +uber.space // UDR Limited : http://www.udr.hk.com // Submitted by registry hk.com -hk.org -ltd.hk inc.hk +ltd.hk +hk.org // UK Intis Telecom LTD : https://it.com // Submitted by ITComdomains it.com +// Unison Computing, PBC : https://unison.cloud +// Submitted by Simon Højberg +unison-services.cloud + // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/ // see also: whois -h whois.udr.org.yt help // Submitted by Atanunu Igbunuroghene @@ -15203,8 +15584,8 @@ org.yt // United Gameserver GmbH : https://united-gameserver.de // Submitted by Stefan Schwarz -virtualuser.de virtual-user.de +virtualuser.de // Upli : https://upli.io // Submitted by Lenny Bakkalian @@ -15219,6 +15600,11 @@ dnsupdate.info // Submitted by Ed Moore lib.de.us +// Val Town, Inc : https://val.town/ +// Submitted by Tom MacWright +express.val.run +web.val.run + // VeryPositive SIA : http://very.lv // Submitted by Danko Aleksejevs 2038.io @@ -15241,48 +15627,6 @@ v-info.info // Submitted by Nathan van Bakel voorloper.cloud -// Voxel.sh DNS : https://voxel.sh/dns/ -// Submitted by Mia Rehlinger -neko.am -nyaa.am -be.ax -cat.ax -es.ax -eu.ax -gg.ax -mc.ax -us.ax -xy.ax -nl.ci -xx.gl -app.gp -blog.gt -de.gt -to.gt -be.gy -cc.hn -blog.kg -io.kg -jp.kg -tv.kg -uk.kg -us.kg -de.ls -at.md -de.md -jp.md -to.md -indie.porn -vxl.sh -ch.tc -me.tc -we.tc -nyan.to -at.vg -blog.vu -dev.vu -me.vu - // V.UA Domain Administrator : https://domain.v.ua/ // Submitted by Serhii Rostilo v.ua @@ -15295,16 +15639,30 @@ v.ua // Submitted by Masayuki Note wafflecell.com +// Webflow, Inc. : https://www.webflow.com +// Submitted by Webflow Security Team +webflow.io +webflowtest.io + // WebHare bv: https://www.webhare.com/ // Submitted by Arnold Hendriks *.webhare.dev // WebHotelier Technologies Ltd: https://www.webhotelier.net/ // Submitted by Apostolos Tsakpinis -reserve-online.net -reserve-online.com bookonline.app hotelwithflight.com +reserve-online.com +reserve-online.net + +// WebPros International, LLC : https://webpros.com/ +// Submitted by Nicolas Rochelemagne +wp2.host +wpsquared.site + +// WebWaddle Ltd: https://webwaddle.com/ +// Submitted by Merlin Glander +*.wadl.top // WeDeploy by Liferay, Inc. : https://www.wedeploy.com // Submitted by Henrique Vicente @@ -15316,21 +15674,33 @@ wedeploy.sh // Submitted by Jung Jin remotewd.com +// Whatbox Inc. : https://whatbox.ca/ +// Submitted by Anthony Ryan +box.ca + // WIARD Enterprises : https://wiardweb.com // Submitted by Kidd Hustle pages.wiardweb.com // Wikimedia Labs : https://wikitech.wikimedia.org // Submitted by Arturo Borrero Gonzalez -wmflabs.org toolforge.org wmcloud.org +wmflabs.org // WISP : https://wisp.gg // Submitted by Stepan Fedotov panel.gg daemon.panel.gg +// Wix.com, Inc. : https://www.wix.com +// Submitted by Shahar Talmi / Alon Kochba +wixsite.com +wixstudio.com +editorx.io +wixstudio.io +wix.run + // Wizard Zines : https://wizardzines.com // Submitted by Julia Evans messwithdns.com @@ -15356,13 +15726,6 @@ weeklylottery.org.uk wpenginepowered.com js.wpenginepowered.com -// Wix.com, Inc. : https://www.wix.com -// Submitted by Shahar Talmi -wixsite.com -editorx.io -wixstudio.io -wix.run - // XenonCloud GbR: https://xenoncloud.net // Submitted by Julian Uphoff half.host @@ -15414,6 +15777,14 @@ noho.st za.net za.org +// ZAP-Hosting GmbH & Co. KG : https://zap-hosting.com +// Submitted by Julian Alker +zap.cloud + +// Zeabur : https://zeabur.com/ +// Submitted by Zeabur Team +zeabur.app + // Zine EOOD : https://zine.bg/ // Submitted by Martin Angelov bss.design commit bf5f74288b7b143b38c0f65b45004130a856d99d Author: Stefan Kangas Date: Sun Jun 23 00:16:42 2024 +0200 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. diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 22042b4c92c..e4993fb0014 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1540,10 +1540,11 @@ to the FSF@. For the reasons behind this, see @url{https://www.gnu.org/licenses/why-assign.html}. Copyright assignment is a simple process. Residents of many countries -can do it entirely electronically. We can help you get started, -including sending you the forms you should fill, and answer any -questions you may have (or point you to the people with the answers), -at the @email{emacs-devel@@gnu.org} mailing list. +can do it entirely electronically. To get started, follow the +instructions in the file @file{etc/copyright-assign.txt} in the Emacs +distribution. We can answer any questions you may have (or point you to +the people with the answers) at the @email{emacs-devel@@gnu.org} mailing +list. (Please note: general discussion about why some GNU projects ask for a copyright assignment is off-topic for emacs-devel. diff --git a/etc/TODO b/etc/TODO index 21b504ad18b..2750e3c114d 100644 --- a/etc/TODO +++ b/etc/TODO @@ -11,12 +11,16 @@ it best. Also to check that it hasn't been done already, since we don't always remember to update this file! It is best to consult the latest version of this file in the Emacs source code repository. -Since Emacs is an FSF-copyrighted package, please be prepared to sign -legal papers to transfer the copyright on your work to the FSF. -Copyright assignment is a simple process. Residents of some countries -can do it entirely electronically. We can help you get started, and -answer any questions you may have (or point you to the people with the -answers), at the emacs-devel@gnu.org mailing list. +Generally speaking, for non-trivial contributions to GNU Emacs and +packages stored in GNU ELPA, we require that the copyright be assigned +to the FSF. For the reasons behind this, see: +https://www.gnu.org/licenses/why-assign.html + +Copyright assignment is a simple process. Residents of many countries +can do it entirely electronically. To get started, follow the +instructions in the file etc/copyright-assign.txt in the Emacs +distribution. We can answer any questions you may have (or point you to +the people with the answers) at the emacs-devel@gnu.org mailing list. For more information about getting involved, see the CONTRIBUTE file. diff --git a/etc/copyright-assign.txt b/etc/copyright-assign.txt new file mode 100644 index 00000000000..74326bbab4d --- /dev/null +++ b/etc/copyright-assign.txt @@ -0,0 +1,36 @@ +Please email the following information to assign@gnu.org, and we +will send you the assignment form for your past and future changes. + +Please use your full legal name (in ASCII characters) as the subject +line of the message. +---------------------------------------------------------------------- +REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES + +[What is the name of the program or package you're contributing to?] +Emacs + +[Did you copy any files or text written by someone else in these changes? +Even if that material is free software, we need to know about it.] + + +[Do you have an employer who might have a basis to claim to own +your changes? Do you attend a school which might make such a claim?] + + +[For the copyright registration, what country are you a citizen of?] + + +[What year were you born?] + + +[Please write your email address here.] + + +[Please write your postal address here.] + + + + + +[Which files have you changed so far, and which new files have you written +so far?] commit fcd379880483ec0c9e039e144b8eea3e9dc34d23 Merge: 014aab9847a 0f01cb0ebd1 Author: Stefan Kangas Date: Sat Jun 22 23:46:46 2024 +0200 ; Merge from origin/emacs-29 The following commit was skipped: 0f01cb0ebd1 Bump Emacs version to 29.4.50 commit 0f01cb0ebd12c361b3f7bd7a44159911f52301bf (refs/remotes/origin/emacs-29) Author: Stefan Kangas Date: Sat Jun 22 23:42:02 2024 +0200 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. diff --git a/README b/README index 81d6fffe8ae..6c16d0a1e47 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 29.4 of GNU Emacs, the extensible, +This directory tree holds version 29.4.50 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index eca50251f2a..b3c40ab6cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ([2.65]) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT([GNU Emacs], [29.4], [bug-gnu-emacs@gnu.org], [], +AC_INIT([GNU Emacs], [29.4.50], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, diff --git a/etc/NEWS b/etc/NEWS index 1e381034ada..8b546eff943 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,33 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing 'C-u C-h C-n'. + +* Installation Changes in Emacs 29.5 + + +* Startup Changes in Emacs 29.5 + + +* Changes in Emacs 29.5 + + +* Editing Changes in Emacs 29.5 + + +* Changes in Specialized Modes and Packages in Emacs 29.5 + + +* New Modes and Packages in Emacs 29.5 + + +* Incompatible Lisp Changes in Emacs 29.5 + + +* Lisp Changes in Emacs 29.5 + + +* Changes in Emacs 29.5 on Non-Free Operating Systems + * Changes in Emacs 29.4 Emacs 29.4 is an emergency bugfix release intended to fix the diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index f44fc07b94d..aa04d8429d4 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -67,7 +67,7 @@ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ -/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.4"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.4.50"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/README.W32 b/nt/README.W32 index 074c036f7be..dd945e295c0 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 29.4 for MS-Windows + Emacs version 29.4.50 for MS-Windows This README file describes how to set up and run a precompiled distribution of the latest version of GNU Emacs for MS-Windows. You commit 014aab9847a0d3d898cb8cbc7224143f2d741abb Author: Vincenzo Pupillo Date: Sat Jun 22 16:22:16 2024 +0200 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) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index f453392ff7f..e7f74fc53f2 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -572,7 +572,7 @@ MODE is either `c' or `cpp'." "not" "not_eq" "operator" "or" "or_eq" "override" "private" "protected" "public" "requires" "template" "throw" - "try" "typename" "using" "virtual" + "try" "typename" "using" "xor" "xor_eq")) (append '("auto") c-keywords)))) @@ -635,7 +635,8 @@ MODE is either `c' or `cpp'." `([,@(c-ts-mode--keywords mode)] @font-lock-keyword-face ,@(when (eq mode 'cpp) '((auto) @font-lock-keyword-face - (this) @font-lock-keyword-face))) + (this) @font-lock-keyword-face + (virtual) @font-lock-keyword-face))) :language mode :feature 'operator commit fa364a0d469adcadb77808271b654d5d51953494 Author: Stefan Kangas Date: Sat Jun 22 19:25:35 2024 +0200 Revert "; * etc/HISTORY: Delete never-released Emacs 28.3." This reverts commit ea057131220bba504d28812dc8be58007017b029. Some GNU/Linux distros have offered Emacs 28.3 based on this tag, so this entry should be kept. diff --git a/etc/HISTORY b/etc/HISTORY index 25eac66030d..d3d2bd7981d 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -228,6 +228,9 @@ GNU Emacs 28.1 (2022-04-04) emacs-28.1 GNU Emacs 28.2 (2022-09-12) emacs-28.2 +GNU Emacs 28.3 (2023-02-17) emacs-28.3-rc1 +Was not actually released. + GNU Emacs 29.1 (2023-07-30) emacs-29.1 GNU Emacs 29.2 (2024-01-18) emacs-29.2 commit a81417e576682c09e1671a8327c9586e14bf94fe Author: Michael Albinus Date: Fri Jun 21 15:41:19 2024 +0200 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. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 41647d42cc5..a0dbd3d55fb 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -105,7 +105,8 @@ ("2.3.5.26.3" . "26.3") ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2") ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3") - ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3"))) + ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3") + ("2.6.3" . "29.4"))) (add-hook 'tramp-unload-hook (lambda () commit ff389163ee8d2b3af3b92dabc3d58a9c9ed3b94f Author: Stefan Kangas Date: Sat Jun 22 18:49:14 2024 +0200 Manually merge NEWS.29 from emacs-29 * etc/NEWS.29: Manually merge from etc/NEWS on the 'emacs-29' branch. diff --git a/etc/NEWS.29 b/etc/NEWS.29 index 470a758afb9..1e381034ada 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -15,6 +15,14 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing 'C-u C-h C-n'. + +* Changes in Emacs 29.4 +Emacs 29.4 is an emergency bugfix release intended to fix the +security vulnerability described below. + +** Arbitrary shell commands are no longer run when turning on Org mode. +This is for security reasons, to avoid running malicious commands. + * Changes in Emacs 29.3 Emacs 29.3 is an emergency bugfix release intended to fix several commit ea057131220bba504d28812dc8be58007017b029 Author: Stefan Kangas Date: Sat Jun 22 18:51:29 2024 +0200 ; * etc/HISTORY: Delete never-released Emacs 28.3. diff --git a/etc/HISTORY b/etc/HISTORY index d3d2bd7981d..25eac66030d 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -228,9 +228,6 @@ GNU Emacs 28.1 (2022-04-04) emacs-28.1 GNU Emacs 28.2 (2022-09-12) emacs-28.2 -GNU Emacs 28.3 (2023-02-17) emacs-28.3-rc1 -Was not actually released. - GNU Emacs 29.1 (2023-07-30) emacs-29.1 GNU Emacs 29.2 (2024-01-18) emacs-29.2 commit d3469978b89a12968f29fffbcd28f702c77820fb Merge: 3739342a4e9 fd15d89ec51 Author: Stefan Kangas Date: Sat Jun 22 18:47:20 2024 +0200 Merge from origin/emacs-29 fd15d89ec51 Merge remote-tracking branch 'origin/emacs-29' into emacs-29 6a299b3cace Release Emacs 29.4 7f7b28a2500 ; Wayland SECONDARY selection problem commit 3739342a4e9e997ccd9424b53dc177654af502b4 Merge: 38e738a35eb c0bfe429485 Author: Stefan Kangas Date: Sat Jun 22 18:47:20 2024 +0200 ; Merge from origin/emacs-29 The following commits were skipped: c0bfe429485 List Andrea Corallo as co-maintainer in ack.texi b3d6880512f * admin/MAINTAINERS: Add myself in (co-)maintainers. commit 38e738a35eb20730030706b580efbab5f57ba479 Merge: 4c4c94fa105 7cc939bf27e Author: Stefan Kangas Date: Sat Jun 22 18:47:18 2024 +0200 Merge from origin/emacs-29 7cc939bf27e ; * lisp/ldefs-boot.el: Regenerated for Emacs 29.4 # Conflicts: # lisp/ldefs-boot.el commit 4c4c94fa10510d6b2109e018a6b7e702e2f8455b Merge: 1313b8966ae 959eacc2a70 Author: Stefan Kangas Date: Sat Jun 22 18:47:18 2024 +0200 ; Merge from origin/emacs-29 The following commit was skipped: 959eacc2a70 Bump Emacs version to 29.4 commit 1313b8966ae5f8d2ebf0d2b418af5b32ccb6a71b Merge: 4a76af51bb6 9a02fce714c Author: Stefan Kangas Date: Sat Jun 22 18:44:19 2024 +0200 Merge from origin/emacs-29 9a02fce714c Update files for Emacs 29.4 d96c54d3883 * admin/authors.el: Update for Emacs 29.4 fd207432e50 * etc/NEWS: Update for Emacs 29.4 c645e1d8205 org-link-expand-abbrev: Do not evaluate arbitrary unsafe ... commit 4a76af51bb685e3082b152c35117bab1ed511d40 Author: Stefan Kangas Date: Sat Jun 22 18:42:06 2024 +0200 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. diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el index db60d21f137..8dc0f1d8955 100644 --- a/test/lisp/vc/log-edit-tests.el +++ b/test/lisp/vc/log-edit-tests.el @@ -180,9 +180,7 @@ lines.")))) (insert string4) (let ((fill-column 39)) (log-edit-fill-entry)) (should (equal (buffer-string) - ;; There is whitespace after "file2.txt" which - ;; should not be erased! - "* file2.txt + "* file2.txt\s (abcdefghijklmnopqrstuvwxyz):"))))) (ert-deftest log-edit-fill-entry-space-substitution () @@ -228,7 +226,7 @@ division. (sfnt_round_none, sfnt_round_to_grid, sfnt_round_to_double_grid) " wanted " -* src/sfnt.c +* src/sfnt.c\s (xmalloc, xrealloc): Improve behavior upon allocation @@ -330,7 +328,7 @@ new line. (but_this_entry_should_not): With the prose displaced to the next line instead." wanted " -* src/sfnt.c +* src/sfnt.c\s (long_entry_1): This entry should be placed on a new commit e41dd2241f7fea39a7149cf7012fd169dc631b0f Merge: 8520ec829d3 50a237c4689 Author: Stefan Kangas Date: Sat Jun 22 18:37:49 2024 +0200 ; Merge from origin/emacs-29 The following commit was skipped: 50a237c4689 Update Tramp version (don't merge to master) commit 8520ec829d30195373aea2ae8bd7bdcf01f80b41 Author: Eli Zaretskii Date: Sat Jun 22 19:39:37 2024 +0300 ; * lisp/editorconfig.el (editorconfig-indentation-alist): Fix :type. diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el index 475151d534d..931781007d9 100644 --- a/lisp/editorconfig.el +++ b/lisp/editorconfig.el @@ -268,7 +268,10 @@ This is a fallback used for those modes which don't set Each element should look like (MODE . SETTING) where SETTING should obey the same rules as `editorconfig-indent-size-vars'." :type '(alist :key-type symbol - :value-type (choice function (repeat symbol))) + :value-type (choice function + (repeat + (choice symbol + (cons symbol integer))))) :risky t) (defcustom editorconfig-trim-whitespaces-mode nil commit 99161fb7140ea67b606e8e8d3129ab6dbc0813a3 Author: Stefan Monnier Date: Sat Jun 22 12:26:09 2024 -0400 Fix non-existing `editorconfig-set-indentation-python-mode` * lisp/editorconfig.el (editorconfig--get-indentation-python-mode): New function. (editorconfig-indentation-alist): Use it. (editorconfig-indent-size-vars): Improve docstring. (editorconfig--default-indent-size-function): Add docstring. diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el index 02186e42891..475151d534d 100644 --- a/lisp/editorconfig.el +++ b/lisp/editorconfig.el @@ -226,8 +226,8 @@ This hook will be run even when there are no matching sections in (ps-mode ps-mode-tab) (pug-mode pug-tab-width) (puppet-mode puppet-indent-level) - (python-mode . editorconfig-set-indentation-python-mode) - (python-ts-mode . editorconfig-set-indentation-python-mode) + (python-mode . editorconfig--get-indentation-python-mode) + (python-ts-mode . editorconfig--get-indentation-python-mode) (rjsx-mode js-indent-level sgml-basic-offset) (ruby-mode ruby-indent-level) (ruby-ts-mode ruby-indent-level) @@ -323,6 +323,11 @@ Make a message by passing ARGS to `format-message'." (web-mode-script-padding . ,size) (web-mode-style-padding . ,size))) +(defun editorconfig--get-indentation-python-mode (size) + "Vars to set `python-mode' indent size to SIZE." + `((python-indent-offset . ,size) ;For python.el + (py-indent-offset . ,size))) ;For python-mode.el + (defun editorconfig--get-indentation-latex-mode (size) "Vars to set `latex-mode' indent size to SIZE." `((tex-indent-basic . ,size) @@ -361,12 +366,19 @@ Make a message by passing ARGS to `format-message'." (defvar editorconfig-indent-size-vars #'editorconfig--default-indent-size-function "Rule to use to set a given `indent_size'. -Can take the form of a function, in which case we call it with a single SIZE -argument (an integer) and it should return a list of (VAR . VAL) pairs. -Otherwise it can be a list of symbols (those which should be set to SIZE). +This should hold the list of variables that need to be set to SIZE +to tell the indentation code of the current major mode to use a basic +indentation step of size SIZE. +It can also take the form of a function, in which case we call it with +a single SIZE argument (an integer) and it should return a list +of (VAR . VAL) pairs indicating the variables to set and the values to +set them to. Major modes are expected to set this buffer-locally.") (defun editorconfig--default-indent-size-function (size) + "Guess which variables to set to for the indentation step to have size SIZE. +This relies on `editorconfig-indentation-alist' supplemented with a crude +heuristic for those modes not found there." (let ((parents (if (fboundp 'derived-mode-all-parents) ;Emacs-30 (derived-mode-all-parents major-mode) (let ((modes nil) commit fd15d89ec51ca6855052e3f56c123e6a98cc1d22 Merge: 6a299b3cace 7f7b28a2500 Author: Stefan Kangas Date: Sat Jun 22 18:21:03 2024 +0200 Merge remote-tracking branch 'origin/emacs-29' into emacs-29 commit 6a299b3caceb2c73b932ba73849738faa8c5d975 (tag: refs/tags/emacs-29.4) Author: Stefan Kangas Date: Sat Jun 22 18:18:06 2024 +0200 Release Emacs 29.4 * ChangeLog.4: * etc/HISTORY: Update files for Emacs 29.4. diff --git a/ChangeLog.4 b/ChangeLog.4 index fdcaad064f9..f6d67704ec4 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -1,3 +1,22 @@ +2024-06-22 Stefan Kangas + + * Version 29.4 released. + +2024-06-22 Stefan Kangas + + Bump Emacs version to 29.4 + +2024-06-22 Stefan Kangas + + Update files for Emacs 29.4 + + * ChangeLog.4: + * etc/AUTHORS: Update for Emacs 29.4. + +2024-06-22 Stefan Kangas + + * admin/authors.el: Update for Emacs 29.4 + 2024-06-22 Stefan Kangas * etc/NEWS: Update for Emacs 29.4 @@ -121967,14 +121986,14 @@ This file records repository revisions from commit f2ae39829812098d8269eafbc0fcb98959ee5bb7 (exclusive) to -commit fd207432e50264fc128e77bad8c61c0d0c8c0009 (inclusive). +commit 959eacc2a705caf067442a96ac17dcb8616f6d96 (inclusive). See ChangeLog.3 for earlier changes. ;; Local Variables: ;; coding: utf-8 ;; End: - Copyright (C) 2022, 2024 Free Software Foundation, Inc. + Copyright (C) 2022-2024 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/HISTORY b/etc/HISTORY index cfd4f1f6873..d3d2bd7981d 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -237,6 +237,8 @@ GNU Emacs 29.2 (2024-01-18) emacs-29.2 GNU Emacs 29.3 (2024-03-24) emacs-29.3 +GNU Emacs 29.4 (2024-06-22) emacs-29.4 + ---------------------------------------------------------------------- This file is part of GNU Emacs. commit 3f3c08bcc7693c309f42bf6a2445bbfd733808a8 Author: Stefan Kangas Date: Sat Jun 22 16:52:18 2024 +0200 Add before-save-hook to man page files * doc/man/ebrowse.1: * doc/man/emacs.1.in: * doc/man/emacsclient.1: * doc/man/etags.1: Add 'before-save-hook' that runs 'time-stamp' to local variables. diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index f25243d06ed..3384dcba366 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -100,6 +100,7 @@ in a translation approved by the Free Software Foundation. . .\" Local Variables: +.\" eval: (add-hook 'before-save-hook 'time-stamp nil t) .\" time-stamp-pattern: "3/.TH EBROWSE 1 \"%Y-%02m-%02d\" \"GNU Emacs\" \"GNU\"$" .\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index d26bf944a34..b478b5196ee 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -682,6 +682,7 @@ in a translation approved by the Free Software Foundation. . .\" Local Variables: +.\" eval: (add-hook 'before-save-hook 'time-stamp nil t) .\" time-stamp-pattern: "3/.TH EMACS 1 \"%Y-%02m-%02d\" \"GNU Emacs @version@\" \"GNU\"$" .\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index 55c58a67323..f5c9918be85 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 @@ -193,6 +193,7 @@ specific to that system. This manual page is in the public domain. .\" Local Variables: +.\" eval: (add-hook 'before-save-hook 'time-stamp nil t) .\" time-stamp-pattern: "3/.TH EMACSCLIENT 1 \"%Y-%02m-%02d\" \"GNU Emacs\" \"GNU\"$" .\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 55e38e08f2b..c567c51d7ef 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -307,6 +307,7 @@ modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. .\" Local Variables: +.\" eval: (add-hook 'before-save-hook 'time-stamp nil t) .\" time-stamp-pattern: "3/.TH ETAGS 1 \"%Y-%02m-%02d\" \"GNU Tools\" \"GNU\"$" .\" time-stamp-time-zone: "UTC0" .\" End: commit 7b0e6cb3ffa01eeffde347a1dee93bfc8d60850e Author: Stefan Kangas Date: Sat Jun 22 16:50:12 2024 +0200 Use UTC when generating man page timestamps * doc/man/ebrowse.1: * doc/man/emacs.1.in: * doc/man/emacsclient.1: * doc/man/etags.1: Add 'time-stamp-time-zone' to local variables to prefer UTC when generating timestamp. diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 7b03f50bc30..f25243d06ed 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -101,4 +101,5 @@ in a translation approved by the Free Software Foundation. .\" Local Variables: .\" time-stamp-pattern: "3/.TH EBROWSE 1 \"%Y-%02m-%02d\" \"GNU Emacs\" \"GNU\"$" +.\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index d7a44fb8475..d26bf944a34 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -683,4 +683,5 @@ in a translation approved by the Free Software Foundation. .\" Local Variables: .\" time-stamp-pattern: "3/.TH EMACS 1 \"%Y-%02m-%02d\" \"GNU Emacs @version@\" \"GNU\"$" +.\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index 8ceca65d7b1..55c58a67323 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 @@ -194,4 +194,5 @@ This manual page is in the public domain. .\" Local Variables: .\" time-stamp-pattern: "3/.TH EMACSCLIENT 1 \"%Y-%02m-%02d\" \"GNU Emacs\" \"GNU\"$" +.\" time-stamp-time-zone: "UTC0" .\" End: diff --git a/doc/man/etags.1 b/doc/man/etags.1 index ba1cd768fc4..55e38e08f2b 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -308,4 +308,5 @@ in a translation approved by the Free Software Foundation. .\" Local Variables: .\" time-stamp-pattern: "3/.TH ETAGS 1 \"%Y-%02m-%02d\" \"GNU Tools\" \"GNU\"$" +.\" time-stamp-time-zone: "UTC0" .\" End: commit a7cb642a9fce079c0185839caa94abfd78986f2a Merge: 6491d11b53a 7f7b28a2500 Author: Eli Zaretskii Date: Sat Jun 22 08:23:18 2024 -0400 Merge from origin/emacs-29 7f7b28a2500 ; Wayland SECONDARY selection problem commit 6491d11b53ab0ffc67680ede5b660089b1bdbbbe Merge: 2f39a4b28a9 f3e80dd0f70 Author: Eli Zaretskii Date: Sat Jun 22 08:23:18 2024 -0400 ; Merge from origin/emacs-29 The following commit was skipped: f3e80dd0f70 * admin/emacs-shell-lib: Backport to Bash 4.4 or older. commit 2f39a4b28a986b73d4c5a7d89bf3205e1b5706ca Merge: 150e2b979c1 ce85d3811da Author: Eli Zaretskii Date: Sat Jun 22 08:23:18 2024 -0400 Merge from origin/emacs-29 ce85d3811da Fix bug#49289 also for other auth-source backends commit 150e2b979c1f5c9fac4726b7775217d5b0330954 Author: Eli Zaretskii Date: Sat Jun 22 15:14:19 2024 +0300 ; * src/xfns.c (unwind_create_frame): Add missing definition. diff --git a/src/xfns.c b/src/xfns.c index 5ba4a78ac9d..9bc2f794849 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4757,6 +4757,7 @@ unwind_create_frame (Lisp_Object frame) free_glyphs (f); #if defined GLYPH_DEBUG && defined ENABLE_CHECKING /* Check that reference counts are indeed correct. */ + struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); eassert (dpyinfo->reference_count == dpyinfo_refcount); #endif /* GLYPH_DEBUG && ENABLE_CHECKING */ return Qt; commit 75fdeef7b494b0acffb69822ff9bec148140de16 Author: Eli Zaretskii Date: Sat Jun 22 13:38:53 2024 +0300 Allow to expand truncated long lines in *Compilation* buffers * lisp/progmodes/compile.el (compilation-button-map): Bind keys in 'compilation-button-map' to allow expanding the truncated text. (Bug#71683) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 4d43a715fef..d2e74aa44a6 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2292,6 +2292,9 @@ Returns the compilation buffer created." (define-key map [mouse-2] 'compile-goto-error) (define-key map [follow-link] 'mouse-face) (define-key map "\C-m" 'compile-goto-error) + (define-key map "\M-\C-m" 'push-button) + (define-key map [M-down-mouse-2] 'push-button) + (define-key map [M-mouse-2] 'push-button) map) "Keymap for compilation-message buttons.") (fset 'compilation-button-map compilation-button-map) commit fb1b188e1ada59848b82c961e32212f6340bad28 Author: Troy Brown Date: Wed Jun 19 20:14:07 2024 -0400 Eglot: Fix command execution (bug#71642) * lisp/progmodes/eglot.el (eglot--lsp-interface-alist): Add ExecuteCommandParams interface. (eglot--execute): Fix handling of Command and CodeAction and add ExecuteCommandParams. Copyright-paperwork-exempt: yes diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 03da5c7b22a..df4cbe50dc0 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -624,6 +624,7 @@ This can be useful when using docker to run a language server.") :command :data :tags)) (Diagnostic (:range :message) (:severity :code :source :relatedInformation :codeDescription :tags)) (DocumentHighlight (:range) (:kind)) + (ExecuteCommandParams ((:command . string)) (:arguments)) (FileSystemWatcher (:globPattern) (:kind)) (Hover (:contents) (:range)) (InitializeResult (:capabilities) (:serverInfo)) @@ -884,17 +885,25 @@ treated as in `eglot--dbind'." (cl-defgeneric eglot-execute (server action) "Ask SERVER to execute ACTION. -ACTION is an LSP object of either `CodeAction' or `Command' type." +ACTION is an LSP `CodeAction', `Command' or `ExecuteCommandParams' +object." (:method (server action) "Default implementation." (eglot--dcase action - (((Command)) (eglot--request server :workspace/executeCommand action)) + (((Command)) + ;; Convert to ExecuteCommandParams and recurse (bug#71642) + (cl-remf action :title) + (eglot-execute server action)) + (((ExecuteCommandParams)) + (eglot--request server :workspace/executeCommand action)) (((CodeAction) edit command data) (if (and (null edit) (null command) data (eglot-server-capable :codeActionProvider :resolveProvider)) (eglot-execute server (eglot--request server :codeAction/resolve action)) (when edit (eglot--apply-workspace-edit edit this-command)) - (when command (eglot--request server :workspace/executeCommand command))))))) + (when command + ;; Recursive call with what must be a Command object (bug#71642) + (eglot-execute server command))))))) (cl-defgeneric eglot-initialization-options (server) "JSON object to send under `initializationOptions'." commit 155cc89de0266e28b68fdecfdc2a0a40b9d79001 Author: Vincenzo Pupillo Date: Fri Jun 21 23:24:33 2024 +0200 Support for indentation of PHP alternative syntax control structures For some control structures, PHP provides an alternative syntax. A new rule has been added to handle this syntax. * lisp/progmodes/php-ts-mode.el (php-ts-mode--indent-styles): New rule for PHP alternative syntax. (Bug#71710) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 71f51b23ebf..7171baf27c9 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -651,6 +651,12 @@ characters of the current line." ;; These rules are for cases where the body is bracketless. ((match "while" "do_statement") parent-bol 0) + ;; rule for PHP alternative syntax + ((or (node-is "else_if_clause") + (node-is "endif") + (node-is "endforeach") + (node-is "endwhile")) + parent-bol 0) ((or (parent-is "if_statement") (parent-is "else_clause") (parent-is "for_statement") commit 7f7b28a2500235452ad636d0cc035d378ac05ec3 Author: Eli Zaretskii Date: Sat Jun 22 12:21:31 2024 +0300 ; Wayland SECONDARY selection problem * etc/PROBLEMS: Document problems with SECONDARY selection on Wayland. (Bug#71656) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 90d416714e5..b09a3b68ba3 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2113,6 +2113,14 @@ with a different toolkit. For example: This produces a build which uses Athena toolkit, and disables toolkit scroll bars which could sometimes be slow. +* Runtime problems specific to PGTK build + +** SECONDARY selections don't work on Wayland. + +This is because the SECONDARY selection is not implemented by the +Wayland compositor being used. A workaround is to use other kinds of +selections. + * Runtime problems on character terminals ** The meta key does not work on xterm. commit 11fb3510f48f3eeeca0bf5622c028c5138ba50f3 Author: Manuel Giraud Date: Mon Jun 17 11:06:28 2024 +0200 Prevent auto-revert when deleting entry (bug#71264) * lisp/dired.el (require): Require "autorevert" for `auto-revert-mode' usage. (dired-internal-do-deletions): Temporarily prevent auto-revert. diff --git a/lisp/dired.el b/lisp/dired.el index c51e5e42c29..0adf06f471e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -36,6 +36,7 @@ (eval-when-compile (require 'subr-x)) (eval-when-compile (require 'cl-lib)) +(eval-when-compile (require 'autorevert)) ;; When bootstrapping dired-loaddefs has not been generated. (require 'dired-loaddefs nil t) (require 'dnd) @@ -4015,7 +4016,11 @@ non-empty directories is allowed." (dired-move-to-filename) (let ((inhibit-read-only t)) (condition-case err - (let ((fn (car (car l)))) + (let ((fn (car (car l))) + ;; Temporarily prevent auto-revert while + ;; deleting entry in the dired buffer + ;; (bug#71264). + (auto-revert-mode nil)) (dired-delete-file fn dired-recursive-deletes trash) ;; if we get here, removing worked (setq succ (1+ succ)) commit a4fe4ca93cfdc835ecd8c5dcc98c201a1eefb546 Author: Vincenzo Pupillo Date: Sun Jun 16 16:32:53 2024 +0200 Fix font lock regex for user defined constant in PHP The old regex also captured functions with two or more uppercase characters. This new regex fixes that issue. * lisp/progmodes/php-ts-mode.el (php-ts-mode--font-lock-settings): New regex that match only user-defined constants. (Bug#71593) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 8bb18dab3d5..71f51b23ebf 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -774,7 +774,7 @@ characters of the current line." @font-lock-builtin-face)) ;; user defined constant ((name) @font-lock-constant-face - (:match "_?[A-Z][0-9A-Z_]+" @font-lock-constant-face)) + (:match "\\`_?[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face)) (const_declaration (const_element (name) @font-lock-constant-face)) (relative_scope "self") @font-lock-builtin-face commit e1ba4ebb495199d1723bd9c4a1f687a02207ee23 Author: Rudolf Adamkovič Date: Thu May 2 19:06:11 2024 +0200 Make Compilation mode recognize non-legacy Kotlin/Gradle errors The Compilation mode recognizes Kotlin/Gradle errors but only in the now legacy format. The current format, which has been in wide use for about a year, is not supported. This change adds support for the current format. * etc/compilation.txt: (symbols): Add examples of non-legacy Kotlin/Gradle warnings and errors. * lisp/progmodes/compile.el: (compilation-error-regexp-alist-alist): Rename 'gradle-kotlin' to 'gradle-kotlin-legacy' and add 'grade-kotlin' that matches the errors and warnings outputted by the current (non-legacy) Kotlin/Gradle. (Bug#70797) * test/lisp/progmodes/compile-tests.el (compile-tests--test-regexps-data): Rename 'gradle-kotlin' to 'gradle-kotlin-legacy' and add two test cases for the newly added, non-legacy Kotlin/Gradle warnings and errors. diff --git a/etc/compilation.txt b/etc/compilation.txt index 05f0829864c..e4e361ecfc7 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -186,13 +186,22 @@ Warning near line 10 file arrayclash.f: Module contains no executable Nonportable usage near line 31 col 9 file assign.f: mixed default and explicit -* Gradle with kotlin-gradle-plugin +* Gradle with Kotlin plugin -symbol: gradle-kotlin +symbol: grade-kotlin + +e: file:///src/Test.kt:267:5 foo: bar +w: file:///src/Test.kt:267:5 foo: bar + + +* Gradle with Kotlin plugin (legacy) + +symbol: gradle-kotlin-legacy e: /src/Test.kt: (34, 15): foo: bar w: /src/Test.kt: (34, 15): foo: bar + * Gradle Android resource linking symbol: gradle-android diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index e31af774bd0..4d43a715fef 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -263,10 +263,28 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) "\\(^Warning .*\\)? line[ \n]\\([0-9]+\\)[ \n]\\(?:col \\([0-9]+\\)[ \n]\\)?file \\([^ :;\n]+\\)" 4 2 3 (1)) - ;; Gradle with kotlin-gradle-plugin (see - ;; GradleStyleMessagerRenderer.kt in kotlin sources, see - ;; https://youtrack.jetbrains.com/issue/KT-34683). + ;; Introduced in Kotlin 1.8 and current as of Kotlin 2.0. + ;; Emitted by `GradleStyleMessagerRenderer' in Kotlin sources. (gradle-kotlin + ,(rx bol + (| (group "w") ; 1: warning + (group (in "iv")) ; 2: info + "e") ; error + ": " + "file://" + (group ; 3: file + (? (in "A-Za-z") ":") + (+ (not (in "\n:")))) + ":" + (group (+ digit)) ; 4: line + ":" + (group (+ digit)) ; 5: column + " ") + 3 4 5 (1 . 2)) + + ;; Obsoleted in Kotlin 1.8 Beta, released on Nov 15, 2022. + ;; See commit `93a0cdbf973' in Kotlin Git repository. + (gradle-kotlin-legacy ,(rx bol (| (group "w") ; 1: warning (group (in "iv")) ; 2: info diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index 20beed955d2..b1187426ccf 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el @@ -270,20 +270,24 @@ 1 nil 27041 "{standard input}") (gnu "boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]" 1 25 589 "boost/container/detail/flat_tree.hpp" 0) - ;; gradle-kotlin + ;; Gradle/Kotlin (gradle-kotlin - "e: /src/Test.kt: (34, 15): foo: bar" 4 15 34 "/src/Test.kt" 2) + "e: file:///src/Test.kt:267:5 foo: bar" 4 5 267 "/src/Test.kt" 2) (gradle-kotlin + "w: file:///src/Test.kt:267:5 foo: bar" 4 5 267 "/src/Test.kt" 1) + (gradle-kotlin-legacy + "e: /src/Test.kt: (34, 15): foo: bar" 4 15 34 "/src/Test.kt" 2) + (gradle-kotlin-legacy "w: /src/Test.kt: (11, 98): foo: bar" 4 98 11 "/src/Test.kt" 1) - (gradle-kotlin + (gradle-kotlin-legacy "e: e:/cygwin/src/Test.kt: (34, 15): foo: bar" 4 15 34 "e:/cygwin/src/Test.kt" 2) - (gradle-kotlin + (gradle-kotlin-legacy "w: e:/cygwin/src/Test.kt: (11, 98): foo: bar" 4 98 11 "e:/cygwin/src/Test.kt" 1) - (gradle-kotlin + (gradle-kotlin-legacy "e: e:\\src\\Test.kt: (34, 15): foo: bar" 4 15 34 "e:\\src\\Test.kt" 2) - (gradle-kotlin + (gradle-kotlin-legacy "w: e:\\src\\Test.kt: (11, 98): foo: bar" 4 98 11 "e:\\src\\Test.kt" 1) (gradle-android " ERROR:/Users/salutis/src/AndroidSchemeExperiment/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/item.xml:3: AAPT: error: '16dpw' is incompatible with attribute padding (attr) dimension." @@ -534,8 +538,8 @@ The test data is in `compile-tests--test-regexps-data'." 1 15 5 "alpha.c"))) (compile--test-error-line test)) - (should (eq compilation-num-errors-found 106)) - (should (eq compilation-num-warnings-found 35)) + (should (eq compilation-num-errors-found 107)) + (should (eq compilation-num-warnings-found 36)) (should (eq compilation-num-infos-found 35))))) (ert-deftest compile-test-grep-regexps () commit c0bfe42948507aaca018d3b32e2520869dc71856 Author: Stefan Kangas Date: Sat May 18 19:14:21 2024 +0200 List Andrea Corallo as co-maintainer in ack.texi * doc/emacs/ack.texi (Acknowledgments): List Andrea Corallo as co-maintainer from 29.3 onwards. diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index b5435442459..5ec5cd53fa6 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -245,7 +245,8 @@ Theresa O'Connor wrote @file{json.el}, a file for parsing and generating JSON files. @item -Andrea Corallo wrote the native compilation support in @file{comp.c} +Andrea Corallo was the Emacs (co-)maintainer from 29.3 onwards. +He wrote the native compilation support in @file{comp.c} and and @file{comp.el}, for compiling Emacs Lisp to native code using @samp{libgccjit}. commit b3d6880512fbaae03637836aa7634e7486fc07d1 Author: Andrea Corallo Date: Wed May 15 19:17:30 2024 +0200 * admin/MAINTAINERS: Add myself in (co-)maintainers. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 98bbfa5bd7c..caad6cdabcf 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -9,6 +9,7 @@ The (co-)maintainers of Emacs are: Eli Zaretskii Stefan Kangas + Andrea Corallo ============================================================================== 1. Areas that someone wants to be maintaining (i.e. has a particularly commit 7cc939bf27eee14eaad6945294f76cb097ecf056 Author: Stefan Kangas Date: Sat Jun 22 02:30:27 2024 +0200 ; * lisp/ldefs-boot.el: Regenerated for Emacs 29.4 diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 60e7f6811bc..d610f8fe219 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -11719,9 +11719,10 @@ this are the `default' and `header-line' faces: they will both be scaled even if they have an explicit `:height' setting. See also the related command `global-text-scale-adjust'. Unlike -that command, which scales the font size with a increment, -`text-scale-adjust' scales the font size with a factor, -`text-scale-mode-step'. With a small `text-scale-mode-step' +that command, which scales the font size with a increment (and can +also optionally resize frames to keep the same number of lines and +characters per line), `text-scale-adjust' scales the font size with +a factor, `text-scale-mode-step'. With a small `text-scale-mode-step' factor, the two commands behave similarly. (fn INC)" t) @@ -32891,7 +32892,7 @@ Add archive file name handler to `file-name-handler-alist'." (when (and tramp-ar ;;; Generated autoloads from net/trampver.el -(push (purecopy '(tramp 2 6 3 -1)) package--builtin-versions) +(push (purecopy '(tramp 2 6 3)) package--builtin-versions) (register-definition-prefixes "trampver" '("tramp-")) commit 959eacc2a705caf067442a96ac17dcb8616f6d96 Author: Stefan Kangas Date: Sat Jun 22 01:16:59 2024 +0200 Bump Emacs version to 29.4 diff --git a/README b/README index b972a53e9f3..81d6fffe8ae 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 29.3.50 of GNU Emacs, the extensible, +This directory tree holds version 29.4 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index f2a7463dfe8..eca50251f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ([2.65]) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT([GNU Emacs], [29.3.50], [bug-gnu-emacs@gnu.org], [], +AC_INIT([GNU Emacs], [29.4], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 34b382df8fe..f44fc07b94d 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -67,7 +67,7 @@ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ -/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.3.50"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.4"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/README.W32 b/nt/README.W32 index a1838f66988..074c036f7be 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 29.3.50 for MS-Windows + Emacs version 29.4 for MS-Windows This README file describes how to set up and run a precompiled distribution of the latest version of GNU Emacs for MS-Windows. You commit 9a02fce714c546710b592db971f3cf0d123a2a44 Author: Stefan Kangas Date: Sat Jun 22 01:13:01 2024 +0200 Update files for Emacs 29.4 * ChangeLog.4: * etc/AUTHORS: Update for Emacs 29.4. diff --git a/ChangeLog.4 b/ChangeLog.4 index d9596005f70..fdcaad064f9 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -1,3 +1,464 @@ +2024-06-22 Stefan Kangas + + * etc/NEWS: Update for Emacs 29.4 + +2024-06-22 Ihor Radchenko + + org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code + + * lisp/org/ol.el (org-link-expand-abbrev): Refuse expanding %(...) + link abbrevs that specify unsafe function. Instead, display a + warning, and do not expand the abbrev. Clear all the text properties + from the returned link, to avoid any potential vulnerabilities caused + by properties that may contain arbitrary Elisp. + +2024-06-21 Michael Albinus + + 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-20 Stefan Kangas + + * admin/emacs-shell-lib: Backport to Bash 4.4 or older. + +2024-06-18 Michael Albinus + + Fix bug#49289 also for other auth-source backends + + * lisp/auth-source.el (auth-info-password): Revert commit 59261e6f4fe. + (auth-source-secrets-create, auth-source-plstore-create): + Search also for :user. (Bug#49289) + +2024-06-12 Michael Albinus + + Fix auth-info-password + + * lisp/auth-source.el (auth-info-password): :secret can be a + cascaded function. + +2024-06-01 Yuan Fu + + Fix treesit-parse-string crash (bug#71012) + + Parsing a large file with treesit-parse-string and then printing the + returned node crashes Emacs, because with-temp-buffer kills the temp + buffer when treesit-parse-string returns, and print.c tries to access + the node's position in the killed buffer. + + * lisp/treesit.el (treesit-parse-string): Don't use with-temp-buffer. + +2024-06-01 Yuan Fu + + Check for buffer liveness when accessing tree-sitter node (bug#71012) + + * src/treesit.h (treesit_node_buffer_live_p): Declare function. + * src/print.c (print_vectorlike): Print node without position if + buffer is killed. + * src/treesit.c (treesit_node_buffer_live_p): New function. + (treesit_check_node): Add buffer liveness check. + (syms_of_treesit): New error treesit-node-buffer-killed. + +2024-05-28 Eli Zaretskii + + Improve documentation of case-conversion commands + + * doc/emacs/text.texi (Case): Include the commands with negative + arguments. (Bug#71220) + +2024-05-25 Eli Zaretskii + + Avoid assertion violations in displaying under 'outline-minor-mode' + + * src/xdisp.c (init_from_display_pos): Initialize BYTEPOS + correctly, since 'init_iterator' no longer computes it from + CHARPOS as needed. This fixes a change made on Mar 13, 2013. + (Bug#71194) + +2024-05-25 Eli Zaretskii + + Improve documentation of 'no-special-glyphs' frame parameter + + * doc/lispref/frames.texi (Layout Parameters): Document + limitations of support for 'no-special-glyphs' frame parameter. + (Bug#71163) + * doc/lispref/display.texi (Truncation): Update for when + 'fringe-mode' is off. + +2024-05-24 kobarity + + Fix Python font lock of chained assignment statement + + * lisp/progmodes/python.el + (python-font-lock-keywords-maximum-decoration): Allow chaining + of single assignment statements. + * test/lisp/progmodes/python-tests.el + (python-font-lock-assignment-statement-20): New test. + (Bug#71093) + +2024-05-24 Brad Knotwell (tiny change) + + Fix example in Calc manual + + * doc/misc/calc.texi (Defining Simple Commands): Fix typo in + command names. (Bug#71166) + +2024-05-22 Eli Zaretskii + + Avoid crashes on MS-Windows due to invalid UNC file names + + * src/w32.c (parse_root): Avoid crashes due to invalid (too short) + UNC names, such as "\\". (Bug#70914) + + * test/src/fileio-tests.el (fileio-tests-invalid-UNC): New test. + +2024-05-18 Eli Zaretskii + + Document :box attribute caveats when used on display strings + + * doc/lispref/display.texi (Replacing Specs, Face Attributes): + Mention special considerations when a display string has a + ':box' face attribute identical to the surrounding buffer text. + Suggested by JD Smith . (Bug#70637) + +2024-05-18 Eli Zaretskii + + Improve documentation of 'movemail' + + * doc/emacs/rmail.texi (Movemail): Fix the name of the Mailutils + manual in the printed version. Add index entries. Move the + description of remote mailboxes to... + (Remote Mailboxes): ...here, to avoid duplication. + +2024-05-18 Jakub Ječmínek + + Replace incorrect link in Rmail chapter of Emacs manual + + * doc/emacs/rmail.texi (Movemail): Fix cross-reference to a node + in the Mailutils manual. (Bug#71018) + +2024-05-08 Eli Zaretskii + + Avoid errors in 'image-dired-tag-thumbnail' + + * lisp/image/image-dired.el (image-dired-tag-thumbnail) + (image-dired-tag-thumbnail-remove): Move here from + image-dired-tags.el. (Bug#70821) + +2024-04-27 Eli Zaretskii + + Fix last change + + * test/lisp/progmodes/csharp-mode-tests.el + (csharp-ts-mode-test-indentation): If need to skip the tree-sitter + test, do so silently. (Bug#70345) + +2024-04-27 Brad Howes (tiny change) + + Fix a typo in Introduction to Emacs Lisp (bug#70571). + +2024-04-25 Eli Zaretskii + + Fix last change + + * test/lisp/progmodes/csharp-mode-tests.el + (csharp-ts-mode-test-indentation): Move the test to here. + * test/lisp/progmodes/csharp-ts-mode-tests.el: Remove file. + * test/lisp/progmodes/csharp-ts-mode-resources/indent.erts: Move + to test/lisp/progmodes/csharp-mode-resources/indent-ts.erts. + +2024-04-25 Jacob Leeming (tiny change) + + Fix indentation of if/else in 'csharp-ts-mode' (bug#70345) + + * lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules): + Fix indentation rules for 'if' and 'else'. + + * test/lisp/progmodes/csharp-ts-mode-tests.el: + * test/lisp/progmodes/csharp-ts-mode-resources/indent.erts: New + test files. + +2024-04-23 Ulrich Müller + + * build-aux/make-info-dir: Avoid bashism (bug#70484). + +2024-04-23 Eli Zaretskii + + Improve documentation of selection and navigation in *xref* buffers + + * doc/emacs/maintaining.texi (Looking Up Identifiers): More + detailed description of 'xref-auto-jump-to-first-definition'. + Improve indexing. Describe the use of 'next-error' and + 'previous-error' in conjunction with the *xref* buffer. + (Identifier Search): More detailed description of + 'xref-auto-jump-to-first-xref'. Describe the use of 'next-error' + and 'previous-error'. + +2024-04-22 Stephen Berman + + Fix Widget manual typos, markup and omissions (bug#70502) + + * doc/misc/widget.texi (Widgets and the Buffer): Correct typos and + texinfo markup, add equivalent key bindings and make minor changes + in wording. + (Customization): Correct names of two faces and add documentation + of remaining widget faces. + +2024-04-22 Prateek Sharma + + Fix python-ts-mode built-in functions and attributes (bug#70478) + + * lisp/progmodes/python.el (python--treesit-settings): Change the + treesitter query to fetch the correct type of node for built-in + functions and attributes and highlight them with corresponding + font-lock face. + +2024-04-21 Eli Zaretskii + + Fix markup and indexing in the Calendar chapter of user manual + + * doc/emacs/calendar.texi (Calendar Unit Motion) + (Scroll Calendar, Writing Calendar Files, Holidays) + (Sunrise/Sunset, Lunar Phases, Calendar Systems) + (To Other Calendar, Displaying the Diary, Date Formats) + (Adding to Diary, Special Diary Entries): Fix markup, style, and + indexing. + +2024-04-21 Gautier Ponsinet + + Fix the user manual for `calendar-time-zone-style' + + * doc/emacs/calendar.texi (Sunrise/Sunset): Refer to the + variable `calendar-time-zone-style' explicitly. (Bug#70498) + +2024-04-21 Eli Zaretskii + + Avoid assertion violations in 'push_prefix_prop' + + * src/xdisp.c (push_prefix_prop): Set the + 'string_from_prefix_prop_p' flag for any valid value of the + 'line-prefix' or 'wrap-prefix' property/variable. (Bug#70495) + +2024-04-20 Basil L. Contovounesios + + Remove ert-equal-including-properties from manual + + * doc/misc/ert.texi (Useful Techniques): Mention only + equal-including-properties in place of the now obsolete + ert-equal-including-properties. + +2024-04-14 Eli Zaretskii + + * lisp/dnd.el (dnd-handle-movement): Avoid errors (bug#70311). + +2024-04-13 Stefan Kangas + + * doc/misc/calc.texi: Improve indexing. + +2024-04-11 Eli Zaretskii + + Fix display of vscrolled windows + + * src/xdisp.c (redisplay_window): Fix condition for resetting the + window's vscroll. (Bug#70038) + +2024-04-10 Peter Oliver + + * doc/emacs/misc.texi (emacsclient Options): Suggest forwarding sockets. + + (Bug#66667) + +2024-04-10 Yuan Fu + + Update go-ts-mode to support latest tree-sitter-go grammar + + tree-sitter-go changed method_spec to method_elem in + https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11f6ce63d72884580bf33 + + * lisp/progmodes/go-ts-mode.el: + (go-ts-mode--method-elem-supported-p): New function. + (go-ts-mode--font-lock-settings): Conditionally use method_elem or + method_spec in the query. + +2024-04-09 Yuan Fu + + Fix c++-ts-mode defun navigation (bug#65885) + + * lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Add BOL and EOL marker + in the regexp. + +2024-03-31 Michael Albinus + + Adapt Tramp versio (don't merge) + + * doc/misc/trampver.texi: + * lisp/net/trampver.el: Change version to "2.6.3". + (customize-package-emacs-version-alist): + Adapt Tramp version integrated in Emacs 29.3. + +2024-03-31 Xuan Wang (tiny change) + + Fix warning-suppress for list type "warning type" + + Per the documentation of 'warning-suppress-types' and the + implementation of 'warning-suppress-p', a warning type can + be either a symbol or a list of symbols. The previous + implementation could generate wrong 'warning-suppress-types': + + old behavior: + type warning-suppress-types + pkg -> '((pkg)) Correct + (pkg subtype) -> '(((pkg subtype))) Incorrect + + Now we check whether type is a cons cell first. (Should not + use listp here, as listp returns t for nil.) + + new behavior: + type warning-suppress-types + pkg -> '((pkg)) Correct + (pkg subtype) -> '((pkg subtype)) Correct + + * lisp/emacs-lisp/warnings.el (warnings-suppress): Fix saving + warning types in 'warning-suppress-types'. (Bug#70063) + +2024-03-31 Theodor Thornhill + + Make object init more robust (bug#69571) + + * lisp/progmodes/csharp-mode.el (csharp-guess-basic-syntax): Make the + regex same as before, but conditionally check other heuristics rather + than crazy regex shenanigans. + +2024-03-30 Eli Zaretskii + + Avoid errors in Info-search-case-sensitively in DIR buffers + + * lisp/info.el (Info-search): Don't run the "try other subfiles" + code if there are no subfiles. This happens, for example, in DIR + files. (Bug#70058) + +2024-03-28 Theodor Thornhill + + Add test for previous change (bug#70023) + + * test/lisp/progmodes/typescript-ts-mode-resources/indent.erts: Add + test. + +2024-03-28 Noah Peart + + Add typescript-ts-mode indentation for interface bodies (bug#70023) + + * lisp/progmodes/typescript-ts-mode.el + (typescript-ts-mode--indent-rules): Add indentation rule for + interface bodies. + +2024-03-26 Andrea Corallo + + * Don't install unnecessary trampolines (bug#69573) (don't merge) + + * lisp/emacs-lisp/comp.el (comp-subr-trampoline-install): + Check that subr-name actually matches the target subr. + +2024-03-25 Eli Zaretskii + + Improve documentation of in user manual + + * doc/emacs/basic.texi (Erasing): Document that deletes + entire grapheme clusters. + +2024-03-25 Eli Zaretskii + + Fix documentation of 'other-window-for-scrolling' + + * src/window.c (Fother_window_for_scrolling): More accurate + documentation of how "the other" window is looked for. Suggested + by Karthik Chikmagalur . + +2024-03-24 Eli Zaretskii + + Bump Emacs version to 29.3.50 + + * README: + * configure.ac: + * nt/README.W32: + * msdos/sed2v2.inp: + * etc/NEWS: Bump Emacs version to 29.3.50. + +2024-03-24 Eli Zaretskii + + Update files for Emacs 29.3 + + * ChangeLog.4: + * etc/AUTHORS: + * etc/HISTORY: Update for Emacs 29.3. + +2024-03-24 Eli Zaretskii + + * lisp/ldefs-boot.el: Regenerate. + +2024-03-24 Eli Zaretskii + + Bump Emacs version to 29.3 + + * README: + * configure.ac: + * nt/README.W32: + * msdos/sed2v2.inp: Bump Emacs version to 29.3. + +2024-03-24 Ihor Radchenko + + org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers + + * lisp/org/org.el (org--confirm-resource-safe): When called from + non-file buffer, do not put stray "f" in the prompt. + +2024-03-24 Ihor Radchenko + + org-file-contents: Consider all remote files unsafe + + * lisp/org/org.el (org-file-contents): When loading files, consider all + remote files (like TRAMP-fetched files) unsafe, in addition to URLs. + +2024-03-24 Ihor Radchenko + + org-latex-preview: Add protection when `untrusted-content' is non-nil + + * lisp/org/org.el (org--latex-preview-when-risky): New variable + controlling how to handle LaTeX previews in Org files from untrusted + origin. + (org-latex-preview): Consult `org--latex-preview-when-risky' before + generating previews. + + This patch adds a layer of protection when LaTeX preview is requested + for an email attachment, where `untrusted-content' is set to non-nil. + +2024-03-24 Ihor Radchenko + + * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents untrusted. + +2024-03-24 Ihor Radchenko + + * lisp/files.el (untrusted-content): New variable. + + The new variable is to be used when buffer contents comes from untrusted + source. + +2024-03-24 Ihor Radchenko + + org-macro--set-templates: Prevent code evaluation + + * lisp/org/org-macro.el (org-macro--set-templates): Get rid of any + risk to evaluate code when `org-macro--set-templates' is called as a + part of major mode initialization. This way, no code evaluation is + ever triggered when user merely opens the file or when + `mm-display-org-inline' invokes Org major mode to fontify mime part + preview in email messages. + +2024-03-24 Eli Zaretskii + + * admin/authors.el (authors-aliases): Add ignored authors. + 2024-03-24 Ihor Radchenko org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers @@ -76460,7 +76921,7 @@ Extract `gnus-collect-urls-from-article' from `gnus-summary-browse-url' - * lisp/gnus-sum.el (gnus-collect-urls-from-article): + * lisp/gnus/gnus-sum.el (gnus-collect-urls-from-article): New function, extracted from `gnus-summary-browse-url'. (gnus-summary-browse-url): Use it. @@ -76577,7 +77038,7 @@ New command `gnus-summary-browse-all-urls' bound to "v" - * lisp/gnus-sum.el (gnus-collect-urls-from-article): New function, + * lisp/gnus/gnus-sum.el (gnus-collect-urls-from-article): New function, extracted from `gnus-summary-browse-url'. (gnus-summary-browse-url): Use it; also use `browse-url-button-open-url' to handle the prefix argument. @@ -121506,7 +121967,7 @@ This file records repository revisions from commit f2ae39829812098d8269eafbc0fcb98959ee5bb7 (exclusive) to -commit 8d8253f89915f1d9b45791d46cf974c6bdcc1457 (inclusive). +commit fd207432e50264fc128e77bad8c61c0d0c8c0009 (inclusive). See ChangeLog.3 for earlier changes. ;; Local Variables: diff --git a/etc/AUTHORS b/etc/AUTHORS index 8a541e8a7e2..14ede21281b 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -74,7 +74,7 @@ Adrian Robert: co-wrote ns-win.el and changed nsterm.m nsfns.m nsfont.m nsterm.h nsmenu.m configure.ac src/Makefile.in macos.texi README config.in emacs.c font.c keyboard.c nsgui.h nsimage.m xdisp.c image.c lib-src/Makefile.in lisp.h menu.c - Makefile.in and 79 other files + Makefile.in and 78 other files Ævar Arnfjörð Bjarmason: changed rcirc.el @@ -460,11 +460,11 @@ Antoine Beaupré: changed vc-git.el Antoine Kalmbach: changed README.md eglot.el -Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi ada-prj.el +Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi ange-ftp.el cus-edit.el dired-x.el ebnf2ps.el emerge.el erc-button.el erc-goodies.el erc-stamp.el erc-track.el files.el find-file.el gnus-art.el gnus-uu.el gnus.el gnus.texi message.el mh-funcs.el - and 9 other files + mh-mime.el and 8 other files Antonin Houska: changed newcomment.el @@ -740,6 +740,8 @@ Bozhidar Batsov: changed ruby-mode.el subr-x.el subr.el bytecomp.el Brad Howes: changed gnus-demon.el +Brad Knotwell: changed calc.texi + Brady Trainor: changed README.md eglot.el Brahimi Saifullah: changed wid-edit.el @@ -904,7 +906,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el and changed simple.el display.texi xdisp.c files.el frames.texi cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c startup.el package.el misc.texi emacs.texi modes.texi mouse.el - custom.texi image.c window.el and 934 other files + custom.texi image.c window.el and 932 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -1253,7 +1255,7 @@ and co-wrote hideshow.el and changed vc.el configure.ac vc-hg.el vc-git.el src/Makefile.in vc-bzr.el sysdep.c emacs.c process.c vc-cvs.el lisp.h term.c vc-hooks.el xterm.c keyboard.c vc-svn.el xterm.el callproc.c darwin.h - term.el gnu-linux.h and 920 other files + term.el gnu-linux.h and 919 other files Danny Roozendaal: wrote handwrite.el @@ -1291,7 +1293,7 @@ and co-wrote latin-ltx.el socks.el and changed configure.ac help.el mule-cmds.el fortran.el mule-conf.el xterm.c browse-url.el mule.el coding.c src/Makefile.in european.el fns.c mule-diag.el simple.el wid-edit.el cus-edit.el cus-start.el - files.el keyboard.c byte-opt.el info.el and 772 other files + files.el keyboard.c byte-opt.el info.el and 771 other files Dave Pearson: wrote 5x5.el quickurl.el @@ -1465,10 +1467,10 @@ Debarshi Ray: changed erc-backend.el erc.el Decklin Foster: changed nngateway.el -Deepak Goel: changed idlw-shell.el ada-xref.el feedmail.el files.el - find-func.el flymake.el mh-search.el mh-seq.el mh-thread.el mh-xface.el - org.el simple.el vc.el vhdl-mode.el wdired.el README ada-mode.el - allout.el appt.el apropos.el artist.el and 85 other files +Deepak Goel: changed idlw-shell.el feedmail.el files.el find-func.el + flymake.el mh-search.el mh-seq.el mh-thread.el mh-xface.el org.el + simple.el vc.el vhdl-mode.el wdired.el README allout.el appt.el + apropos.el artist.el bibtex.el bindings.el and 82 other files D. E. Evans: changed basic.texi @@ -1677,9 +1679,9 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c] chartab-tests.el coding-tests.el etags-tests.el rxvt.el tty-colors.el and co-wrote help-tests.el and changed xdisp.c display.texi w32.c msdos.c simple.el w32fns.c - files.el fileio.c keyboard.c emacs.c configure.ac text.texi w32term.c - dispnew.c frames.texi w32proc.c files.texi xfaces.c window.c - dispextern.h lisp.h and 1341 other files + files.el fileio.c keyboard.c emacs.c text.texi configure.ac w32term.c + dispnew.c frames.texi w32proc.c files.texi window.c xfaces.c + dispextern.h lisp.h and 1339 other files Eliza Velasquez: changed server.el @@ -1700,7 +1702,7 @@ Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el and 58 other files Emmanuel Briot: wrote xml.el -and changed ada-mode.el ada-stmt.el ada-prj.el ada-xref.el +and changed ada-stmt.el Era Eriksson: changed bibtex.el dired.el json.el ses.el ses.texi shell.el tramp.el tramp.texi @@ -1815,7 +1817,7 @@ and changed simple.el emacs.c files.el lread.c rmail.el alloc.c editfns.c lisp.h print.c process.c add-log.el buffer.c casetab.c cl-macs.el and 114 other files -Erik Toubro Nielsen: changed gnus-sum.el gnus-topic.el +Erik Toubro Nielsen: changed gnus-topic.el Ernest Adrogué: changed european.el latin-pre.el mule-cmds.el @@ -2067,6 +2069,8 @@ Gary Wong: changed termcap.c tparam.c Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c +Gautier Ponsinet: changed calendar.texi + G Dinesh Dutt: changed etags.el Geert Kloosterman: changed which-func.el @@ -2110,7 +2114,7 @@ Gerd Möllmann: wrote authors.el ebrowse.el jit-lock.el tooltip.el and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c window.c keyboard.c lisp.h faces.el alloc.c buffer.c startup.el xterm.h fns.c term.c configure.ac simple.el frame.c xmenu.c emacs.c - and 621 other files + and 618 other files Gergely Nagy: changed erc.el @@ -2138,7 +2142,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el lisp/Makefile.in diary-lib.el files.el make-dist rmail.el progmodes/f90.el bytecomp.el admin.el misc/Makefile.in simple.el authors.el startup.el emacs.texi lib-src/Makefile.in display.texi - ack.texi subr.el and 1796 other files + ack.texi subr.el and 1791 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -2321,7 +2325,7 @@ Hrvoje Nikšić: wrote croatian.el savehist.el and changed gnus-xmas.el message.el nnmail.el fileio.c fns.c gnus-art.el gnus-salt.el gnus-spec.el mm-decode.el simple.el add-log.el appt.el arc-mode.el avoid.el bookmark.el cal-china.el cal-tex.el calendar.el - cl-indent.el cmacexp.el comint.el and 83 other files + cl-indent.el cmacexp.el comint.el and 82 other files Hubert Chan: changed spam.el @@ -2357,8 +2361,8 @@ Igor Kuzmin: wrote cconv.el Igor Saprykin: changed ftfont.c Ihor Radchenko: wrote org-fold-core.el org-fold.el org-persist.el -and changed ox.el fns.c emacsclient.desktop help-mode.el oc.el - org-element.el org.el +and changed org.el ox.el files.el fns.c mm-view.el org-macro.el + emacsclient.desktop help-mode.el oc.el ol.el org-element.el Iku Iwasa: changed auth-source-pass-tests.el auth-source-pass.el @@ -2425,8 +2429,7 @@ Itai Y. Efrat: changed browse-url.el Itai Zukerman: changed mm-decode.el Ivan Andrus: changed editfns.c epg.el ffap.el find-file.el ibuf-ext.el - ibuffer.el newcomment.el nextstep/templates/Info.plist.in nxml-mode.el - progmodes/python.el + ibuffer.el newcomment.el nxml-mode.el progmodes/python.el Ivan Boldyrev: changed mml1991.el @@ -2465,6 +2468,8 @@ Jackson Ray Hamilton: changed js.el files.el sgml-mode.el Jack Twilley: changed message.el +Jacob Leeming: changed csharp-mode.el + Jacob Morzinski: changed mh-comp.el Jacques Duthen: co-wrote ps-print.el ps-samp.el @@ -2480,6 +2485,8 @@ Jai Flack: changed gnus-search.el Jake Moss: changed gdb-mi.el +Jakub Ječmínek: changed rmail.texi + Jakub-W: changed calculator.el J. Alexander Branham: wrote conf-mode-tests.el @@ -3047,7 +3054,7 @@ Jorge P. De Morais Neto: changed TUTORIAL cl.texi Jose A. Ortega Ruiz: changed doc-view.el misc.texi mixal-mode.el gnus-sum.el imenu.el url-http.el -Jose E. Marchesi: changed ada-mode.el gomoku.el simple.el smtpmail.el +Jose E. Marchesi: changed gomoku.el simple.el smtpmail.el José L. Doménech: changed dired-aux.el @@ -3095,7 +3102,7 @@ and co-wrote help-tests.el keymap-tests.el and changed subr.el desktop.el w32fns.c faces.el simple.el emacsclient.c files.el server.el bs.el help-fns.el xdisp.c org.el w32term.c w32.c buffer.c keyboard.c ido.el image.c window.c eval.c allout.el - and 1229 other files + and 1225 other files Juan Pechiar: changed ob-octave.el @@ -3144,7 +3151,7 @@ Juri Linkov: wrote compose.el emoji.el files-x.el misearch.el and changed isearch.el simple.el info.el replace.el dired.el dired-aux.el progmodes/grep.el minibuffer.el window.el subr.el vc.el outline.el mouse.el diff-mode.el repeat.el image-mode.el files.el menu-bar.el - search.texi startup.el display.texi and 473 other files + search.texi startup.el display.texi and 472 other files Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h w32console.c w32heap.c w32inevt.c w32term.h @@ -3219,7 +3226,7 @@ and changed simple.el files.el CONTRIBUTE doc-view.el image-mode.el Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c alloc.c files.el frame.c configure.ac window.c data.c minibuf.c editfns.c fns.c process.c Makefile.in fileio.c simple.el keymap.c - indent.c and 447 other files + indent.c and 446 other files Karl Kleinpaste: changed gnus-sum.el gnus-art.el gnus-picon.el gnus-score.el gnus-uu.el gnus-xmas.el gnus.el mm-uu.el mml.el nnmail.el @@ -3386,7 +3393,7 @@ Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el and changed xdisp.c dispextern.h process.c simple.el window.c keyboard.c xterm.c dispnew.c subr.el w32term.c lisp.h fringe.c display.texi macterm.c alloc.c fns.c xfaces.c keymap.c xfns.c xterm.h .gdbinit - and 249 other files + and 248 other files Kimit Yada: changed copyright.el @@ -3434,10 +3441,10 @@ Konrad Hinsen: wrote ol-eshell.el and changed ob-python.el Konstantin Kharlamov: changed smerge-mode.el diff-mode.el files.el - ada-mode.el autorevert.el calc-aent.el calc-ext.el calc-lang.el - cc-mode.el cperl-mode.el css-mode.el cua-rect.el dnd.el ebnf-abn.el - ebnf-dtd.el ebnf-ebx.el emacs-module-tests.el epg.el faces.el - gnus-art.el gtkutil.c and 28 other files + autorevert.el calc-aent.el calc-ext.el calc-lang.el cc-mode.el + cperl-mode.el css-mode.el cua-rect.el dnd.el ebnf-abn.el ebnf-dtd.el + ebnf-ebx.el emacs-module-tests.el epg.el faces.el gnus-art.el gtkutil.c + hideif.el and 27 other files Konstantin Kliakhandler: changed org-agenda.el @@ -3555,11 +3562,11 @@ Lele Gaifax: changed progmodes/python.el TUTORIAL.it python-tests.el flymake-proc.el flymake.texi isearch.el pgtkfns.c xterm.c Lennart Borgman: co-wrote ert-x.el -and changed nxml-mode.el tutorial.el re-builder.el window.el ada-xref.el - buff-menu.el emacs-lisp/debug.el emacsclient.c filesets.el flymake.el - help-fns.el isearch.el linum.el lisp-mode.el lisp.el mouse.el - progmodes/grep.el recentf.el remember.el replace.el reveal.el - and 6 other files +and changed nxml-mode.el tutorial.el re-builder.el window.el buff-menu.el + emacs-lisp/debug.el emacsclient.c filesets.el flymake.el help-fns.el + isearch.el linum.el lisp-mode.el lisp.el mouse.el progmodes/grep.el + recentf.el remember.el replace.el reveal.el ruby-mode.el + and 5 other files Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c @@ -3658,7 +3665,7 @@ Lute Kamstra: changed modes.texi emacs-lisp/debug.el generic-x.el generic.el font-lock.el simple.el subr.el battery.el debugging.texi easy-mmode.el elisp.texi emacs-lisp/generic.el hl-line.el info.el octave.el basic.texi bindings.el calc.el cmdargs.texi diff-mode.el - doclicense.texi and 289 other files + doclicense.texi and 288 other files Lynn Slater: wrote help-macro.el @@ -3793,7 +3800,7 @@ Mark Oteiza: wrote mailcap-tests.el md4-tests.el xdg-tests.el xdg.el and changed image-dired.el dunnet.el mpc.el eww.el json.el calc-units.el lcms.c subr-x.el subr.el message.el tex-mode.el cl-macs.el cl.texi ibuffer.el lcms-tests.el mailcap.el progmodes/python.el cl-print.el - eldoc.el emacs-lisp/chart.el files.el and 172 other files + eldoc.el emacs-lisp/chart.el files.el and 173 other files Mark Plaksin: changed nnrss.el term.el @@ -3818,7 +3825,7 @@ and changed cus-edit.el files.el progmodes/compile.el rmail.el tex-mode.el find-func.el rmailsum.el simple.el cus-dep.el dired.el mule-cmds.el rmailout.el checkdoc.el configure.ac custom.el emacsbug.el gnus.el help-fns.el ls-lisp.el mwheel.el sendmail.el - and 126 other files + and 125 other files Markus Sauermann: changed lisp-mode.el @@ -3867,7 +3874,7 @@ Martin Pohlack: changed iimage.el pc-select.el Martin Rudalics: changed window.el window.c windows.texi frame.c xdisp.c xterm.c frames.texi w32fns.c w32term.c xfns.c frame.el display.texi frame.h help.el cus-start.el buffer.c window.h mouse.el dispnew.c - keyboard.c nsfns.m and 214 other files + keyboard.c nsfns.m and 213 other files Martin Stjernholm: wrote cc-bytecomp.el and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el @@ -3991,7 +3998,7 @@ Mattias Engdegård: changed byte-opt.el rx.el bytecomp.el bytecomp-tests.el rx-tests.el searching.texi fns.c subr.el bytecode.c eval.c calc-tests.el lread.c progmodes/compile.el lisp.h files.el fns-tests.el print.c autorevert.el gdb-mi.el alloc.c - regex-emacs-tests.el and 677 other files + regex-emacs-tests.el and 678 other files Mattias M: changed asm-mode-tests.el asm-mode.el @@ -4253,7 +4260,7 @@ Miles Bader: wrote button.el face-remap.el image-file.el macroexp.el and changed comint.el faces.el simple.el editfns.c xfaces.c xdisp.c info.el minibuf.c display.texi quick-install-emacs wid-edit.el xterm.c dispextern.h subr.el window.el cus-edit.el diff-mode.el xfns.c - bytecomp.el help.el lisp.h and 272 other files + bytecomp.el help.el lisp.h and 271 other files Milton Wulei: changed gdb-ui.el @@ -4614,7 +4621,7 @@ and co-wrote cal-dst.el and changed lisp.h configure.ac alloc.c fileio.c process.c editfns.c sysdep.c xdisp.c fns.c image.c emacs.c keyboard.c data.c lread.c xterm.c eval.c gnulib-comp.m4 callproc.c Makefile.in buffer.c frame.c - and 1863 other files + and 1860 other files Paul Fisher: changed fns.c @@ -4642,7 +4649,7 @@ Paul Reilly: changed dgux.h lwlib-Xm.c lwlib.c xlwmenu.c configure.ac lwlib/Makefile.in mail/rmailmm.el rmailedit.el rmailkwd.el and 10 other files -Paul Rivier: changed ada-mode.el mixal-mode.el reftex-vars.el reftex.el +Paul Rivier: changed mixal-mode.el reftex-vars.el reftex.el Paul Rubin: changed config.h sun2.h texinfmt.el window.c @@ -4664,7 +4671,7 @@ Pavel Janík: co-wrote eudc-bob.el eudc-export.el eudc-hotlist.el and changed keyboard.c xterm.c COPYING xdisp.c process.c emacs.c lisp.h menu-bar.el ldap.el make-dist xfns.c buffer.c coding.c eval.c fileio.c flyspell.el fns.c indent.c Makefile.in callint.c cus-start.el - and 702 other files + and 699 other files Pavel Kobiakov: wrote flymake-proc.el flymake.el and changed flymake.texi @@ -4745,8 +4752,8 @@ Peter Münster: changed image-dired.el gnus-delay.el gnus-demon.el Peter O'Gorman: changed configure.ac frame.h hpux10-20.h termhooks.h Peter Oliver: changed emacsclient.desktop emacsclient-mail.desktop - Makefile.in emacs-mail.desktop server.el configure.ac emacs.desktop - emacs.metainfo.xml emacsclient.1 misc.texi perl-mode.el + Makefile.in emacs-mail.desktop misc.texi server.el configure.ac + emacs.desktop emacs.metainfo.xml emacsclient.1 perl-mode.el ruby-mode-tests.el vc-sccs.el Peter Povinec: changed term.el @@ -4900,6 +4907,8 @@ Po Lu: changed xterm.c haikuterm.c haiku_support.cc xfns.c xterm.h Pontus Michael: changed simple.el +Prateek Sharma: changed progmodes/python.el + Prestoo Ten: changed screen.el Primoz Peterlin: changed TUTORIAL.sl @@ -5024,9 +5033,9 @@ and changed vhdl-mode.texi Reuben Thomas: changed ispell.el whitespace.el dired-x.el files.el sh-script.el emacsclient-tests.el remember.el README emacsclient.c - misc.texi msdos.c simple.el INSTALL ada-mode.el ada-xref.el alloc.c - arc-mode.el authors.el config.bat copyright cperl-mode.el - and 38 other files + misc.texi msdos.c simple.el INSTALL alloc.c arc-mode.el authors.el + config.bat copyright cperl-mode.el dired-x.texi dired.el + and 36 other files Ricardo Martins: changed eglot.el @@ -5075,7 +5084,7 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-langs.el and changed files.el keyboard.c simple.el xterm.c xdisp.c rmail.el fileio.c process.c sysdep.c buffer.c xfns.c window.c subr.el configure.ac startup.el sendmail.el emacs.c Makefile.in editfns.c - info.el dired.el and 1339 other files + info.el dired.el and 1337 other files Richard Ryniker: changed sendmail.el @@ -5198,10 +5207,9 @@ R Primus: changed eglot.el Rüdiger Sonderfeld: wrote inotify-tests.el reftex-tests.el and changed eww.el octave.el shr.el bibtex.el configure.ac - misc/Makefile.in reftex-vars.el vc-git.el TUTORIAL.de ada-mode.el - autoinsert.el building.texi bytecomp.el calc-lang.el cc-langs.el - dired.texi editfns.c emacs.c emacs.texi epa.el erc.el - and 40 other files + misc/Makefile.in reftex-vars.el vc-git.el TUTORIAL.de autoinsert.el + building.texi bytecomp.el calc-lang.el cc-langs.el dired.texi editfns.c + emacs.c emacs.texi epa.el erc.el eww.texi and 39 other files Rudolf Adamkovič: co-wrote quail/slovak.el and changed files.el scheme.el @@ -5269,9 +5277,9 @@ Sam Kendall: changed etags.c etags.el Sam Steingold: wrote gulp.el midnight.el and changed progmodes/compile.el cl-indent.el simple.el vc-cvs.el vc.el - mouse.el vc-hg.el files.el gnus-sum.el tex-mode.el etags.el - font-lock.el sgml-mode.el subr.el window.el ange-ftp.el inf-lisp.el - message.el package.el rcirc.el vc-git.el and 215 other files + mouse.el vc-hg.el files.el tex-mode.el etags.el font-lock.el + sgml-mode.el subr.el window.el ange-ftp.el gnus-sum.el inf-lisp.el + message.el package.el rcirc.el vc-git.el and 213 other files Samuel Bronson: changed custom.el emacsclient.c keyboard.c progmodes/grep.el semantic/format.el unexmacosx.c @@ -5320,7 +5328,6 @@ Scott A Crosby: changed gnus-logic.el Scott Bender: co-wrote ns-win.el Scott Byer: co-wrote nnfolder.el -and changed gnus-sum.el Scott Corley: changed scroll.c @@ -5387,9 +5394,8 @@ Sébastien Vauban: changed org.el org-agenda.el ox-latex.el ob-core.el org-clock.el ox-ascii.el ox-html.el Seiji Zenitani: changed nsfns.m frame.c xterm.c PkgInfo document.icns - find-func.el frame.h help-fns.el macfns.c - nextstep/templates/Info.plist.in nsfont.m nsterm.m w32fns.c xdisp.c - xfns.c + find-func.el frame.h help-fns.el macfns.c nsfont.m nsterm.m w32fns.c + xdisp.c xfns.c Sen Nagata: wrote crm.el rfc2368.el @@ -5558,7 +5564,7 @@ and co-wrote help-tests.el keymap-tests.el and changed image-dired.el efaq.texi package.el cperl-mode.el help.el subr.el checkdoc.el bookmark.el simple.el dired.el files.el gnus.texi dired-x.el keymap.c image-mode.el erc.el ediff-util.el speedbar.el - woman.el browse-url.el bytecomp-tests.el and 1690 other files + woman.el browse-url.el bytecomp-tests.el and 1689 other files Stefan Merten: co-wrote rst.el @@ -5575,7 +5581,7 @@ and co-wrote font-lock.el gitmerge.el pcvs.el and changed subr.el simple.el keyboard.c bytecomp.el cl-macs.el files.el lisp.h vc.el xdisp.c alloc.c eval.c buffer.c sh-script.el progmodes/compile.el tex-mode.el keymap.c window.c help-fns.el lread.c - lisp-mode.el package.el and 1660 other files + lisp-mode.el package.el and 1657 other files Stefano Facchini: changed gtkutil.c @@ -5612,7 +5618,7 @@ and changed wdired.el todo-mode.texi wdired-tests.el diary-lib.el dired.el dired-tests.el doc-view.el files.el info.el minibuffer.el outline.el todo-test-1.todo allout.el eww.el find-dired.el frames.texi hl-line.el menu-bar.el mouse.el otodo-mode.el simple.el - and 64 other files + and 65 other files Stephen C. Gilardi: changed configure.ac @@ -5635,11 +5641,11 @@ and changed time-stamp.el time-stamp-tests.el mh-e.el mh-utils-tests.el Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el Stephen Leake: wrote elisp-mode-tests.el -and changed ada-mode.el ada-xref.el elisp-mode.el xref.el eglot.el - window.el mode-local.el project.el CONTRIBUTE ada-prj.el vc-mtn.el - ada-stmt.el cedet-global.el ede/generic.el simple.el autoload.el - bytecomp.el cl-generic.el ede/locate.el files.texi functions.texi - and 36 other files +and changed elisp-mode.el xref.el eglot.el window.el mode-local.el + project.el CONTRIBUTE vc-mtn.el ada-stmt.el cedet-global.el + ede/generic.el simple.el autoload.el bytecomp.el cl-generic.el + ede/locate.el files.texi functions.texi package.el progmodes/grep.el + windows.texi and 33 other files Stephen Pegoraro: changed xterm.c @@ -5840,7 +5846,7 @@ and co-wrote hideshow.el and changed ewoc.el vc.el info.el processes.texi zone.el lisp-mode.el scheme.el text.texi vc-rcs.el display.texi fileio.c files.el vc-git.el TUTORIAL.it bindat.el cc-vars.el configure.ac dcl-mode.el diff-mode.el - dired.el elisp.texi and 169 other files + dired.el elisp.texi and 168 other files Thierry Banel: co-wrote ob-C.el and changed calc-arith.el @@ -6008,9 +6014,9 @@ Tommi Vainikainen: changed gnus-sum.el message.el mml-sec.el Tomohiko Morioka: co-wrote mm-bodies.el mm-decode.el mm-encode.el mm-util.el rfc2047.el -and changed rmail.el nnmail.el rmailout.el gnus-sum.el nnfolder.el - nnheader.el nnmh.el nnml.el rmailsum.el coding.c fns.c gnus-art.el - gnus-ems.el gnus-mule.el message.el nnspool.el nntp.el rmailkwd.el +and changed rmail.el nnmail.el rmailout.el nnfolder.el nnheader.el + nnmh.el nnml.el rmailsum.el coding.c fns.c gnus-art.el gnus-ems.el + gnus-mule.el gnus-sum.el message.el nnspool.el nntp.el rmailkwd.el smiley.el Tomohiro Matsuyama: wrote profiler.el @@ -6118,7 +6124,7 @@ Ulrich Müller: changed configure.ac calc-units.el emacsclient-mail.desktop lib-src/Makefile.in src/Makefile.in version.el Makefile.in doctor.el emacs.1 files.el gamegrid.el gud.el server.el ChgPane.c ChgSel.c HELLO INSTALL XMakeAssoc.c authors.el bindings.el - bytecomp.el and 45 other files + bytecomp.el and 46 other files Ulrich Neumerkel: changed xterm.c @@ -6357,6 +6363,8 @@ Xi Lu: changed etags.c htmlfontify.el ruby-mode.el CTAGS.good_crlf Xiyue Deng: changed emacs-lisp-intro.texi functions.texi strings.texi symbols.texi +Xuan Wang: changed warnings.el + Xu Chunyang: changed eglot.el eww.el dom.el gud.el netrc.el Xue Fuqiao: changed display.texi emacs-lisp-intro.texi files.texi @@ -6421,9 +6429,9 @@ and changed fontset.el message.el nnheader.el nnmail.el Yuan Fu: changed treesit.el c-ts-mode.el treesit.c parsing.texi progmodes/python.el modes.texi js.el treesit-tests.el indent.erts - typescript-ts-mode.el treesit.h css-mode.el configure.ac - java-ts-mode.el print.c sh-script.el c-ts-common.el gdb-mi.el - rust-ts-mode.el go-ts-mode.el starter-guide and 55 other files + typescript-ts-mode.el treesit.h css-mode.el print.c configure.ac + java-ts-mode.el sh-script.el c-ts-common.el gdb-mi.el go-ts-mode.el + rust-ts-mode.el starter-guide and 55 other files Yuanle Song: changed rng-xsd.el diff --git a/etc/NEWS b/etc/NEWS index 2fba63369f1..1e381034ada 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -46,9 +46,6 @@ To get back previous insecure behavior, set the variable ** Org mode now considers contents of remote files to be untrusted. Remote files are recognized by calling 'file-remote-p'. - -* Installation Changes in Emacs 29.2 - * Startup Changes in Emacs 29.2 commit d96c54d388373d35a974ae37210707a105f65207 Author: Stefan Kangas Date: Sat Jun 22 01:06:05 2024 +0200 * admin/authors.el: Update for Emacs 29.4 diff --git a/admin/authors.el b/admin/authors.el index 88c01f14120..904551dcb01 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -580,6 +580,9 @@ Changes to files matching one of the regexps in this list are not listed.") "obsolete/options.el" "obsolete/old-whitespace.el" "obsolete/lucid.el" + "lisp/obsolete/fast-lock.el" + "lisp/obsolete/lazy-lock.el" + "lisp/obsolete/pc-mode.el" ;; ada-mode has been deleted, now in GNU ELPA "ada-mode.texi" "doc/misc/ada-mode.texi" @@ -1595,6 +1598,22 @@ in the repository.") ("url-dired.el" . "url-dired.el") ("lisp/text-modes/tex-mode.el" . "tex-mode.el") ("editfns.c" . "editfns.c") + ("lisp/thumbs.el" . "thumbs.el") + ("lisp/linum.el" . "linum.el") + ("lisp/image-dired.el" . "image-dired.el") + ("lisp/url/url-about.el" . "url-about.el") + ("lisp/url/url-dired.el" . "url-dired.el") + ("lisp/ps-def.el" . "ps-def.el") + ("lisp/net/quickurl.el" . "quickurl.el") + ("lisp/vc/vc-mtn.el" . "vc-mtn.el") + ("lisp/mail/uce.el" . "uce.el") + ("test/lisp/progmodes/csharp-ts-mode-tests.el" . "csharp-mode.el") + ("lisp/makesum.el" . "makesum.el") + ("lisp/mh-e/mh-compat.el" . "mh-compat.el") + ("lisp/net/rlogin.el" . "rlogin.el") + ("lisp/emacs-lisp/autoload.el" . "autoload.el") + ("lisp/emacs-lisp/eieio-compat.el" . "eieio-compat.el") + ("autoarg.el" . "autoarg.el") ) "Alist of files which have been renamed during their lifetime. Elements are (OLDNAME . NEWNAME).") commit fd207432e50264fc128e77bad8c61c0d0c8c0009 Author: Stefan Kangas Date: Fri Jun 21 16:03:20 2024 +0200 * etc/NEWS: Update for Emacs 29.4 diff --git a/etc/NEWS b/etc/NEWS index 4695bcc5334..2fba63369f1 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,32 +15,13 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing 'C-u C-h C-n'. - -* Installation Changes in Emacs 29.4 - - -* Startup Changes in Emacs 29.4 - * Changes in Emacs 29.4 +Emacs 29.4 is an emergency bugfix release intended to fix the +security vulnerability described below. - -* Editing Changes in Emacs 29.4 - - -* Changes in Specialized Modes and Packages in Emacs 29.4 - - -* New Modes and Packages in Emacs 29.4 - - -* Incompatible Lisp Changes in Emacs 29.4 - - -* Lisp Changes in Emacs 29.4 - - -* Changes in Emacs 29.4 on Non-Free Operating Systems +** Arbitrary shell commands are no longer run when turning on Org mode. +This is for security reasons, to avoid running malicious commands. * Changes in Emacs 29.3 commit c645e1d8205f0f0663ec4a2d27575b238c646c7c Author: Ihor Radchenko Date: Fri Jun 21 15:45:25 2024 +0200 org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code * lisp/org/ol.el (org-link-expand-abbrev): Refuse expanding %(...) link abbrevs that specify unsafe function. Instead, display a warning, and do not expand the abbrev. Clear all the text properties from the returned link, to avoid any potential vulnerabilities caused by properties that may contain arbitrary Elisp. diff --git a/lisp/org/ol.el b/lisp/org/ol.el index 4c84e62f4c9..c34d92b4c3e 100644 --- a/lisp/org/ol.el +++ b/lisp/org/ol.el @@ -1063,17 +1063,35 @@ Abbreviations are defined in `org-link-abbrev-alist'." (if (not as) link (setq rpl (cdr as)) - (cond - ((symbolp rpl) (funcall rpl tag)) - ((string-match "%(\\([^)]+\\))" rpl) - (replace-match - (save-match-data - (funcall (intern-soft (match-string 1 rpl)) tag)) - t t rpl)) - ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) - ((string-match "%h" rpl) - (replace-match (url-hexify-string (or tag "")) t t rpl)) - (t (concat rpl tag))))))) + ;; Drop any potentially dangerous text properties like + ;; `modification-hooks' that may be used as an attack vector. + (substring-no-properties + (cond + ((symbolp rpl) (funcall rpl tag)) + ((string-match "%(\\([^)]+\\))" rpl) + (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl)))) + ;; Using `unsafep-function' is not quite enough because + ;; Emacs considers functions like `genenv' safe, while + ;; they can potentially be used to expose private system + ;; data to attacker if abbreviated link is clicked. + (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe)) + (eq t (get rpl-fun-symbol 'pure))) + (replace-match + (save-match-data + (funcall (intern-soft (match-string 1 rpl)) tag)) + t t rpl) + (org-display-warning + (format "Disabling unsafe link abbrev: %s +You may mark function safe via (put '%s 'org-link-abbrev-safe t)" + rpl (match-string 1 rpl))) + (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local) + org-link-abbrev-alist (delete as org-link-abbrev-alist)) + link + ))) + ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) + ((string-match "%h" rpl) + (replace-match (url-hexify-string (or tag "")) t t rpl)) + (t (concat rpl tag)))))))) (defun org-link-open (link &optional arg) "Open a link object LINK. commit 50a237c4689b0531e82d5f731ae7c825f3d43310 Author: Michael Albinus Date: Fri Jun 21 15:41:19 2024 +0200 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. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index c7e3e6eafc0..ab08f21462c 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -105,7 +105,8 @@ ("2.3.5.26.3" . "26.3") ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2") ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3") - ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3"))) + ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3") + ("2.6.3" . "29.4"))) (add-hook 'tramp-unload-hook (lambda () commit f3e80dd0f70aabb6abcddb0148f75356fb60c32b Author: Stefan Kangas Date: Thu Jun 20 23:12:31 2024 +0200 * admin/emacs-shell-lib: Backport to Bash 4.4 or older. diff --git a/admin/emacs-shell-lib b/admin/emacs-shell-lib index 1c4d895fdb4..e639a4740a1 100644 --- a/admin/emacs-shell-lib +++ b/admin/emacs-shell-lib @@ -49,6 +49,9 @@ emacs_tempfiles=() emacs_tempfiles_cleanup () { + # This is needed on Bash 4.4 or older. + [ ${#emacs_tempfiles[@]} -eq 0 ] && return + for file in ${emacs_tempfiles[@]}; do rm -f "${file}" 2> /dev/null done commit ce85d3811daea42db78fc1c5bc4a7375ac5e209d Author: Michael Albinus Date: Tue Jun 18 16:43:53 2024 +0200 Fix bug#49289 also for other auth-source backends * lisp/auth-source.el (auth-info-password): Revert commit 59261e6f4fe. (auth-source-secrets-create, auth-source-plstore-create): Search also for :user. (Bug#49289) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 4dcf7d73717..2609541f415 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -874,9 +874,9 @@ while \(:host t) would find all host entries." (defun auth-info-password (auth-info) "Return the :secret password from the AUTH-INFO." (let ((secret (plist-get auth-info :secret))) - (while (functionp secret) - (setq secret (funcall secret))) - secret)) + (if (functionp secret) + (funcall secret) + secret))) (defun auth-source-pick-first-password (&rest spec) "Pick the first secret found by applying `auth-source-search' to SPEC." @@ -1698,7 +1698,7 @@ authentication tokens: items)) (cl-defun auth-source-secrets-create (&rest spec - &key backend host port create + &key backend host port create user &allow-other-keys) (let* ((base-required '(host user port secret label)) ;; we know (because of an assertion in auth-source-search) that the @@ -1706,6 +1706,7 @@ authentication tokens: (create-extra (if (eq t create) nil create)) (current-data (car (auth-source-search :max 1 :host host + :user user :port port))) (required (append base-required create-extra)) (collection (oref backend source)) @@ -2160,7 +2161,7 @@ entries for git.gnus.org: items)) (cl-defun auth-source-plstore-create (&rest spec - &key backend host port create + &key backend host port create user &allow-other-keys) (let* ((base-required '(host user port secret)) (base-secret '(secret)) @@ -2170,9 +2171,11 @@ entries for git.gnus.org: (create-extra-secret (plist-get create :encrypted)) (create-extra (if (eq t create) nil (or (append (plist-get create :unencrypted) - create-extra-secret) create))) + create-extra-secret) + create))) (current-data (car (auth-source-search :max 1 :host host + :user user :port port))) (required (append base-required create-extra)) (required-secret (append base-secret create-extra-secret))