3 files changed, 6 insertions, 3 deletions

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index bbe6a64b626..84306fb3ae7 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -472,8 +472,10 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
                     ;; minibuffer.
                     (window-buffer (get-mru-window)))
                    ;; Otherwise, if we found the expansion in another
-                   ;; buffer, use that buffer for further expansions.
-                   (dabbrev--last-buffer-found dabbrev--last-buffer-found)
+                   ;; buffer and that buffer is still live, use that
+                   ;; buffer for further expansions.
+                   ((buffer-live-p dabbrev--last-buffer-found)
+                    dabbrev--last-buffer-found)
                    ;; Otherwise, use the buffer where we invoked
                    ;; dabbrev-expand.
                    (t (current-buffer))))
diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el
index 33324cafb5b..632e270a922 100644
--- a/lisp/mail/rfc2231.el
+++ b/lisp/mail/rfc2231.el
@@ -193,7 +193,7 @@ must never cause a Lisp error."
                      (push (list attribute value encoded) cparams))
                     ;; Repetition of a part; do nothing.
                     ((and elem
-                          (null number))
+                          (null part))
                      )
                     ;; Concatenate continuation parts.
                     (t
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 58c2e9771ba..42fb8c57b40 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -317,6 +317,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
                       dictionary-read-dictionary-function)
                      vals))
          (set-default-toplevel-value symbol value))
+  :initialize #'custom-initialize-changed
   :version "30.1")
 
 (defface dictionary-word-definition-face