5 files changed, 50 insertions, 26 deletions

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6298244c399..6fc80594125 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3302,7 +3302,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
   '(("install," "delete," "unmark," ("execute" . 1))
     ("next," "previous")
     ("Hide-package," "(-toggle-hidden")
-    ("refresh-contents," "g-redisplay," "filter," "help")))
+    ("g-refresh-contents," "/-filter," "help")))
 
 (defun package--prettify-quick-help-key (desc)
   "Prettify DESC to be displayed as a help menu."
@@ -3310,7 +3310,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
       (if (listp (cdr desc))
           (mapconcat #'package--prettify-quick-help-key desc "   ")
         (let ((place (cdr desc))
-              (out (car desc)))
+              (out (copy-sequence (car desc))))
           (add-text-properties place (1+ place)
                                '(face (bold font-lock-warning-face))
                                out)
@@ -3790,6 +3790,9 @@ packages."
                         (package--has-keyword-p pkg-desc keyword))
                       (concat "keyword:" (string-join keyword ",")))))
 
+(define-obsolete-function-alias
+  'package-menu-filter #'package-menu-filter-by-keyword "27.1")
+
 (defun package-menu-filter-by-name (name)
   "Filter the \"*Packages*\" buffer by NAME regexp.
 Display only packages with name that matches regexp NAME.
diff --git a/lisp/format-spec.el b/lisp/format-spec.el
index f418cea4259..9278bd74c42 100644
--- a/lisp/format-spec.el
+++ b/lisp/format-spec.el
@@ -29,35 +29,46 @@
 
 (defun format-spec (format specification &optional only-present)
   "Return a string based on FORMAT and SPECIFICATION.
-FORMAT is a string containing `format'-like specs like \"su - %u %k\",
-while SPECIFICATION is an alist mapping from format spec characters
-to values.
+FORMAT is a string containing `format'-like specs like \"su - %u %k\".
+SPECIFICATION is an alist mapping format specification characters
+to their substitutions.
 
 For instance:
 
   (format-spec \"su - %u %l\"
-               `((?u . ,(user-login-name))
+               \\=`((?u . ,(user-login-name))
                  (?l . \"ls\")))
 
-Each format spec can have modifiers, where \"%<010b\" means \"if
-the expansion is shorter than ten characters, zero-pad it, and if
-it's longer, chop off characters from the left side\".
+Each %-spec may contain optional flag and width modifiers, as
+follows:
 
-The following modifiers are allowed:
+  %<flags><width>character
 
-* 0: Use zero-padding.
-* -: Pad to the right.
-* ^: Upper-case the expansion.
-* _: Lower-case the expansion.
-* <: Limit the length by removing chars from the left.
-* >: Limit the length by removing chars from the right.
+The following flags are allowed:
 
-Any text properties on a %-spec itself are propagated to the text
-that it generates.
+* 0: Pad to the width, if given, with zeros instead of spaces.
+* -: Pad to the width, if given, on the right instead of the left.
+* <: Truncate to the width, if given, on the left.
+* >: Truncate to the width, if given, on the right.
+* ^: Convert to upper case.
+* _: Convert to lower case.
 
-If ONLY-PRESENT, format spec characters not present in
-SPECIFICATION are ignored, and the \"%\" characters are left
-where they are, including \"%%\" strings."
+The width modifier behaves like the corresponding one in `format'
+when applied to %s.
+
+For example, \"%<010b\" means \"substitute into the output the
+value associated with ?b in SPECIFICATION, either padding it with
+leading zeros or truncating leading characters until it's ten
+characters wide\".
+
+Any text properties of FORMAT are copied to the result, with any
+text properties of a %-spec itself copied to its substitution.
+
+ONLY-PRESENT indicates how to handle %-spec characters not
+present in SPECIFICATION.  If it is nil or omitted, emit an
+error; otherwise leave those %-specs and any occurrences of
+\"%%\" in FORMAT verbatim in the result, including their text
+properties, if any."
   (with-temp-buffer
     (insert format)
     (goto-char (point-min))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 0277524a8c6..722969c21ba 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -663,7 +663,7 @@ A non-nil `specs' arg must be an alist with `nnir-query-spec' and
   (let ((backend (car (gnus-server-to-method server))))
     (if backend
         (nnoo-change-server backend server definitions)
-      (add-hook 'gnus-summary-prepared-hook 'nnir-mode)
+      (add-hook 'gnus-summary-generate-hook 'nnir-mode)
       (nnoo-change-server 'nnir server definitions))))
 
 (deffoo nnir-request-group (group &optional server dont-check _info)
@@ -1850,8 +1850,11 @@ is also searched."
 
 (defun nnir-mode ()
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
-    (setq gnus-summary-line-format
-          (or nnir-summary-line-format gnus-summary-line-format))
+    (when (and nnir-summary-line-format
+               (not (string= nnir-summary-line-format
+                             gnus-summary-line-format)))
+      (setq gnus-summary-line-format nnir-summary-line-format)
+      (gnus-update-format-specifications nil 'summary))
     (when (bound-and-true-p gnus-registry-enabled)
       (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index c12f3901f09..60ef0247bae 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -330,7 +330,10 @@ if that doesn't produce a completion match."
                 icomplete-hide-common-prefix nil
                 completion-styles '(flex)
                 completion-flex-nospace nil
-                completion-category-defaults nil)))
+                completion-category-defaults nil
+                completion-ignore-case t
+                read-buffer-completion-ignore-case t
+                read-file-name-completion-ignore-case t)))
 
 ;;;###autoload
 (define-minor-mode fido-mode
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index e7a12675905..a3a6f3fdd94 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -152,6 +152,7 @@ If the argument is nil, we return the display table to its standard state."
     (aset standard-display-table ?љ  [?l ?j])
     (aset standard-display-table ?њ  [?n ?j])
     (aset standard-display-table ?џ  [?d ?z])
+    (aset standard-display-table ?ґ  [?g])
 
     (aset standard-display-table ?Є  [?Y ?e])
     (aset standard-display-table ?Ї  [?Y ?i])
@@ -166,6 +167,7 @@ If the argument is nil, we return the display table to its standard state."
     (aset standard-display-table ?Љ  [?L ?j])
     (aset standard-display-table ?Њ  [?N ?j])
     (aset standard-display-table ?Џ  [?D ?j])
+    (aset standard-display-table ?Ґ  [?G])
 
     (when (equal cyrillic-language "Bulgarian")
       (aset standard-display-table ?щ [?s ?h ?t])
@@ -182,7 +184,9 @@ If the argument is nil, we return the display table to its standard state."
       (aset standard-display-table ?й [?i])
       (aset standard-display-table ?Й [?Y])
       (aset standard-display-table ?ю [?i ?u])
-      (aset standard-display-table ?я [?i ?a]))))
+      (aset standard-display-table ?я [?i ?a])
+      (aset standard-display-table ?г [?h])
+      (aset standard-display-table ?Г [?H]))))
 
 ;;
 (provide 'cyril-util)