diff options
author | Glenn Morris <rgm@gnu.org> | 2020-08-18 07:51:08 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-08-18 07:51:08 -0700 |
commit | 06738a40d10706e36ca0dc767ed3a0ef6fe17078 (patch) | |
tree | 3a3f2b2fa31f9892523b3bb8ad441096b54dc917 /src/xrdb.c | |
parent | 192247bb04104da156ca3f00e174b6bf669eb0af (diff) | |
parent | 362ca83a3b9d74c51ac325a6490551272aa25f9a (diff) | |
download | emacs-06738a40d10706e36ca0dc767ed3a0ef6fe17078.tar.gz |
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
Diffstat (limited to 'src/xrdb.c')
-rw-r--r-- | src/xrdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index e3a1fcb15a9..3d7f715c88f 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; |