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

Merge from origin/emacs-27

Browse source 
362ca83a3b (origin/emacs-27) Let Emacs start even if curdir is inacce...
dd989c0ea0 * etc/NEWS: Mention GnuPG 2.0 through 2.1.5 issue (Bug#428...
4542b750cc Fix bug with ~/Emacs file not being read at init
9b403d624e ; Fix last change
6bff65a626 ; * doc/lispref/sequences.texi (Sequence Functions): Typo ...
3c4edfd85e Prevent from frozen frame after `C-z' in Lucid builds
98e8241992 Document the 'flex' completion style
19fa8b7ca3 Note that Emacs needs systemd support if systemd is used t...

# Conflicts:
#	etc/NEWS
This commit is contained in:
Glenn Morris 2020-08-18 07:51:08 -07:00
commit 06738a40d1
6 changed files with 42 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/emacs/mini.texi
View file

@ -518,6 +518,13 @@ between @samp{foo} and @samp{bar}, that matches
@samp{@var{a}foo@var{b}bar@var{c}}, where @var{a}, @var{b}, and
@var{c} can be any string including the empty string.
@item flex
@cindex @code{flex}, completion style
This aggressive completion style, also known as @code{flx} or
@code{fuzzy} or @code{scatter} completion, attempts to complete using
in-order substrings. For example, it can consider @samp{foo} to match
@samp{frodo} or @samp{fbarbazoo}.
@item initials
@cindex @code{initials}, completion style
This very aggressive completion style attempts to complete acronyms

6
doc/lispref/sequences.texi
View file

@ -791,11 +791,11 @@ use instead of the default @code{equal}.
@example
@group
(seq-contains '(symbol1 symbol2) 'symbol1)
@result{} symbol1
(seq-contains-p '(symbol1 symbol2) 'symbol1)
@result{} t
@end group
@group
(seq-contains '(symbol1 symbol2) 'symbol3)
(seq-contains-p '(symbol1 symbol2) 'symbol3)
@result{} nil
@end group
@end example

14
etc/NEWS.27
View file

@ -202,10 +202,11 @@ it won't work right without some adjustment:
** Emacs now notifies systemd when startup finishes or shutdown begins.
Units that are ordered after 'emacs.service' will only be started
after Emacs has finished initialization and is ready for use.
(If your Emacs is installed in a non-standard location and you copied the
emacs.service file to e.g. "~/.config/systemd/user/", you will need to copy
the new version of the file again.)
after Emacs has finished initialization and is ready for use, and
Emacs needs to be built with systemd support. (If your Emacs is
installed in a non-standard location and you copied the emacs.service
file to e.g. "~/.config/systemd/user/", you will need to copy the new
version of the file again.)
* Changes in Emacs 27.1
@ -1917,6 +1918,11 @@ The value of the new 'sender' slot (if a string) is used to set gpg's
'mml-secure-openpgp-sign-with-sender'. See gpg(1) manual page about
"--sender" for more information.
*** 'epg-find-configuration' no longer finds GnuPG 2.0 through 2.1.5.
Previously, it found these versions by mistake. The intent was to
find GnuPG 2.1.6 or later, or find GnuPG 1.4.3 or later within the
GnuPG 1 series.
** Rmail
*** New user option 'rmail-output-reset-deleted-flag'.

11
lisp/startup.el
View file

@ -649,11 +649,12 @@ It is the default value of the variable `top-level'."
;; Use FOO/., so that if FOO is a symlink, file-attributes
;; describes the directory linked to, not FOO itself.
(or (and default-directory
(equal (file-attributes
(concat (file-name-as-directory pwd) "."))
(file-attributes
(concat (file-name-as-directory default-directory)
"."))))
(ignore-errors
(equal (file-attributes
(concat (file-name-as-directory pwd) "."))
(file-attributes
(concat (file-name-as-directory default-directory)
".")))))
(setq process-environment
(delete (concat "PWD=" pwd)
process-environment)))))

4
src/xrdb.c
View file

@ -289,9 +289,9 @@ get_user_app (const char *class)
/* Check in the home directory. This is a bit of a hack; let's
hope one's home directory doesn't contain ':' or '%'. */
char const *home = get_homedir ();
db = search_magic_path (home, class, "%L/%N");
db = search_magic_path (home, class, "/%L/%N");
if (! db)
db = search_magic_path (home, class, "%N");
db = search_magic_path (home, class, "/%N");
}
return db;

14
src/xterm.c
View file

@ -8760,6 +8760,20 @@ handle_one_xevent (struct x_display_info *dpyinfo,
goto OTHER;
case FocusIn:
/* Some WMs (e.g. Mutter in Gnome Shell), don't unmap
minimized/iconified windows; thus, for those WMs we won't get
a MapNotify when unminimizing/deconifying. Check here if we
are deconizing a window (Bug42655). */
f = any;
if (f && FRAME_ICONIFIED_P (f))
{
SET_FRAME_VISIBLE (f, 1);
SET_FRAME_ICONIFIED (f, false);
f->output_data.x->has_been_visible = true;
inev.ie.kind = DEICONIFY_EVENT;
XSETFRAME (inev.ie.frame_or_window, f);
}
x_detect_focus_change (dpyinfo, any, event, &inev.ie);
goto OTHER;