andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
3a8a231810 * lisp/textmodes/fill.el (fill-nobreak-predicate): Fix doc...
cbe643104d Improve Package Menu hiding docstrings
8d28c98ae0 Fix display of Big5 characters when using Fontconfig
This commit is contained in:
Glenn Morris 2020-03-18 07:50:36 -07:00
commit 45630d0252
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/package.el
View file

@ -2861,7 +2861,11 @@ Can be toggled with \\<package-menu-mode-map> \\[package-menu-toggle-hiding].
Installed obsolete packages are always displayed.")
(defun package-menu-toggle-hiding ()
"In Package Menu, toggle visibility of obsolete available packages."
"In Package Menu, toggle visibility of obsolete available packages.
Also hide packages whose name matches a regexp in user option
`package-hidden-regexps' (a list). To add regexps to this list,
use `package-menu-hide-package'."
(interactive)
(package--ensure-package-menu-mode)
(setq package-menu--hide-packages
@ -3191,8 +3195,16 @@ function. The args ARG and NOCONFIRM, passed from
(defun package-menu-hide-package ()
"Hide in Package Menu packages that match a regexp.
Prompts for the regexp to match against package names.
The default regexp will hide only the package whose name is at point."
Prompt for the regexp to match against package names.
The default regexp will hide only the package whose name is at point.
The regexp is added to the list in the user option
`package-hidden-regexps' and saved for future sessions.
To unhide a package, type
`\\[customize-variable] RET package-hidden-regexps'.
Type \\[package-menu-toggle-hiding] to toggle package hiding."
(interactive)
(package--ensure-package-menu-mode)
(declare (interactive-only "change `package-hidden-regexps' instead."))
@ -3211,7 +3223,7 @@ The default regexp will hide only the package whose name is at point."
package-archive-contents)))
(message "Packages to hide: %d. Type `%s' to toggle or `%s' to customize"
(length hidden)
(substitute-command-keys "\\[package-menu-toggle-hidding]")
(substitute-command-keys "\\[package-menu-toggle-hiding]")
(substitute-command-keys "\\[customize-variable] RET package-hidden-regexps")))))

3
lisp/textmodes/fill.el
View file

@ -365,7 +365,8 @@ which is an error according to some typographical conventions."
(defcustom fill-nobreak-predicate nil
"List of predicates for recognizing places not to break a line.
The predicates are called with no arguments, with point at the place to
be tested. If it returns t, fill commands do not break the line there."
be tested. If it returns a non-nil value, fill commands do not break
the line there."
:group 'fill
:type 'hook
:options '(fill-french-nobreak-p fill-single-word-nobreak-p

2
src/ftfont.c
View file

@ -102,7 +102,7 @@ static struct
{ "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }},
{ "iso8859-16", { 0x00A0, 0x0218}},
{ "gb2312.1980-0", { 0x4E13 }, "zh-cn"},
{ "big5-0", { 0xF6B1 }, "zh-tw" },
{ "big5-0", { 0x9C21 }, "zh-tw" },
{ "jisx0208.1983-0", { 0x4E55 }, "ja"},
{ "ksc5601.1985-0", { 0xAC00 }, "ko"},
{ "cns11643.1992-1", { 0xFE32 }, "zh-tw"},

2
src/macfont.m
View file

@ -664,7 +664,7 @@ static struct
{ "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }},
{ "iso8859-16", { 0x00A0, 0x0218}},
{ "gb2312.1980-0", { 0x4E13 }, CFSTR ("zh-Hans")},
{ "big5-0", { /* 0xF6B1 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") },
{ "big5-0", { /* 0x9C21 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") },
{ "jisx0208.1983-0", { 0x4E55 }, CFSTR ("ja")},
{ "ksc5601.1987-0", { 0xAC00 }, CFSTR ("ko")},
{ "cns11643.1992-1", { 0xFE32 }, CFSTR ("zh-Hant")},