commit ec9290eb80253cc97990788aab588a15cb35b664 (HEAD, refs/remotes/origin/master)
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Mar 18 23:11:01 2025 +0100

    ; Minor keymap cleanup in dired.el
    
    * lisp/dired.el:
    (dired-context-menu): Prefer keymap-set.
    (dired-click-to-select-map): Move key definition inside defvar-keymap.

diff --git a/lisp/dired.el b/lisp/dired.el
index 9a8c8d74394..c00ae0fde7d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1185,7 +1185,7 @@ If a directory or nothing is found at point, return nil."
 	     (not (file-directory-p file-name)))
 	file-name)))
 
-;;;###autoload (define-key ctl-x-map "d" 'dired)
+;;;###autoload (keymap-set ctl-x-map "d" #'dired)
 ;;;###autoload
 (defun dired (dirname &optional switches)
   "\"Edit\" directory DIRNAME--delete, rename, print, etc. some files in it.
@@ -1214,21 +1214,21 @@ If DIRNAME is already in a Dired buffer, that buffer is used without refresh."
   (interactive (dired-read-dir-and-switches ""))
   (pop-to-buffer-same-window (dired-noselect dirname switches)))
 
-;;;###autoload (define-key ctl-x-4-map "d" 'dired-other-window)
+;;;###autoload (keymap-set ctl-x-4-map "d" #'dired-other-window)
 ;;;###autoload
 (defun dired-other-window (dirname &optional switches)
   "\"Edit\" directory DIRNAME.  Like `dired' but select in another window."
   (interactive (dired-read-dir-and-switches "in other window "))
   (switch-to-buffer-other-window (dired-noselect dirname switches)))
 
-;;;###autoload (define-key ctl-x-5-map "d" 'dired-other-frame)
+;;;###autoload (keymap-set ctl-x-5-map "d" #'dired-other-frame)
 ;;;###autoload
 (defun dired-other-frame (dirname &optional switches)
   "\"Edit\" directory DIRNAME.  Like `dired' but make a new frame."
   (interactive (dired-read-dir-and-switches "in other frame "))
   (switch-to-buffer-other-frame (dired-noselect dirname switches)))
 
-;;;###autoload (define-key tab-prefix-map "d" 'dired-other-tab)
+;;;###autoload (keymap-set tab-prefix-map "d" #'dired-other-tab)
 ;;;###autoload
 (defun dired-other-tab (dirname &optional switches)
   "\"Edit\" directory DIRNAME.  Like `dired' but make a new tab."
@@ -2681,7 +2681,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
 (defun dired-context-menu (menu click)
   "Populate MENU with Dired mode commands at CLICK."
   (when (mouse-posn-property (event-start click) 'dired-filename)
-    (define-key menu [dired-separator] menu-bar-separator)
+    (keymap-set menu "<dired-separator>" menu-bar-separator)
     (let* ((filename (save-excursion
                        (mouse-set-point click)
                        (dired-get-filename nil t)))
@@ -5306,10 +5306,8 @@ Interactively with prefix argument, read FILE-NAME."
 ;;; Click-To-Select mode
 
 (defvar-keymap dired-click-to-select-map
-  :doc "Keymap placed on files under `dired-click-to-select' mode.")
-
-(define-key dired-click-to-select-map [mouse-2]
-            #'dired-mark-for-click)
+  :doc "Keymap placed on files under `dired-click-to-select' mode."
+  "<mouse-2>" #'dired-mark-for-click)
 
 (defun dired-mark-for-click (event)
   "Mark or unmark the file underneath the mouse click at EVENT.

commit 0e1f81b9bc469c7b115d1abcd12c20aae4160dd7
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Tue Mar 18 08:42:42 2025 -0400

    lisp/emacs-lisp/smie.el (smie-config-show-indent): Tweak message

diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 111d413cc42..0286f430045 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -2063,7 +2063,7 @@ position corresponding to each rule."
   (interactive "P")
   (let ((trace (cdr (smie-config--get-trace))))
     (cond
-     ((null trace) (message "No SMIE rules involved"))
+     ((null trace) (message "No SMIE rules involved at this position"))
      ((not arg)
       (message "Rules used: %s"
                (mapconcat (lambda (elem)

commit 739d18dc41234824f4f01bfaa2313510e2df14a7
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Tue Mar 18 09:17:52 2025 +0100

    Ensure redisplay after re-parenting a tty child frame (Bug#77079)
    
    * src/frame.c (store_frame_param): When re-parenting a tty child
    frame, mark it's old and new root frames as garbaged so redisplay
    will reflect the change immediately (Bug#77079).

diff --git a/src/frame.c b/src/frame.c
index c1ef26e5dd4..e5177afa059 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3705,7 +3705,10 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val)
     {
       if (NILP (f->parent_frame) != NILP (val))
 	error ("Making a root frame a child or vice versa is not supported");
+
+      SET_FRAME_GARBAGED (root_frame (f));
       f->parent_frame = val;
+      SET_FRAME_GARBAGED (root_frame (f));
     }
 
   /* The tty color needed to be set before the frame's parameter