[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 06738a4 3/3: Merge from origin/emacs-27
|
From: |
Glenn Morris |
|
Subject: |
master 06738a4 3/3: Merge from origin/emacs-27 |
|
Date: |
Tue, 18 Aug 2020 10:56:06 -0400 (EDT) |
branch: master
commit 06738a40d10706e36ca0dc767ed3a0ef6fe17078
Merge: 192247b 362ca83
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
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
---
doc/emacs/mini.texi | 7 +++++++
doc/lispref/sequences.texi | 6 +++---
etc/NEWS.27 | 14 ++++++++++----
lisp/startup.el | 11 ++++++-----
src/xrdb.c | 4 ++--
src/xterm.c | 14 ++++++++++++++
6 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 55e41e3..54f046a 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -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
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 91c3049..ca52369 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -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
diff --git a/etc/NEWS.27 b/etc/NEWS.27
index d0a24c2..31b6902 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -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'.
diff --git a/lisp/startup.el b/lisp/startup.el
index bff1000..364689c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -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)))))
diff --git a/src/xrdb.c b/src/xrdb.c
index e3a1fcb..3d7f715 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -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;
diff --git a/src/xterm.c b/src/xterm.c
index 6340700..2a99c46 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -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;