From: Glenn Morris <rgm@gnu.org>
Date: Thu, 13 Feb 2020 15:50:24 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7892
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56ce263f506fede328888a321a12b1f85f46d0d5;p=emacs.git

Merge from origin/emacs-27

ad5e350ab7 c-end-of-macro: Handle block coment lines with unescaped N...
06c302d425 Fix set-fontset-font with ADD arg non-nil
530067463b Correct "different than" to "different from" where appropr...
56b8768b32 More accurate documentation of 'package-menu-hide-package'
---

56ce263f506fede328888a321a12b1f85f46d0d5
diff --cc lisp/allout.el
index 408a2a9a0cc,174f1e3dc21..dedad45f827
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@@ -5924,9 -5946,9 +5924,9 @@@ See `allout-toggle-current-subtree-encr
          ;; they're encrypted, so the coding system is set to accommodate
          ;; them.
          (setq buffer-file-coding-system
 -              (allout-select-safe-coding-system subtree-beg subtree-end))
 +              (select-safe-coding-system subtree-beg subtree-end))
          ;; if the coding system for the text being encrypted is different
-         ;; than that prevailing, then there a real risk that the coding
+         ;; from that prevailing, then there a real risk that the coding
          ;; system can't be noticed by emacs when the file is visited.  to
          ;; mitigate that, offer to preserve the coding system using a file
          ;; local variable.
diff --cc lisp/emacs-lisp/package.el
index f14ef7919ea,64d2001646f..c4f751871b6
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@@ -2717,14 -2730,11 +2717,14 @@@ either a full name or nil, and EMAIL i
  
      "--"
      ("Filter Packages"
 +     ["Filter by Archive" package-menu-filter-by-archive :help "Filter packages by archive"]
       ["Filter by Keyword" package-menu-filter-by-keyword :help "Filter packages by keyword"]
       ["Filter by Name" package-menu-filter-by-name :help "Filter packages by name"]
 +     ["Filter by Status" package-menu-filter-by-status :help "Filter packages by status"]
 +     ["Filter by Version" package-menu-filter-by-version :help "Filter packages by version"]
       ["Clear Filter" package-menu-clear-filter :help "Clear package list filter"])
  
-     ["Hide by Regexp" package-menu-hide-package :help "Permanently hide all packages matching a regexp"]
+     ["Hide by Regexp" package-menu-hide-package :help "Hide all packages matching a regexp"]
      ["Display Older Versions" package-menu-toggle-hiding
       :style toggle :selected (not package-menu--hide-packages)
       :help "Display package even if a newer version is already installed"]