summaryrefslogtreecommitdiff
path: root/lisp/cus-edit.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-11-16 07:18:19 +0100
committerStefan Kangas <stefan@marxist.se>2021-11-16 07:18:19 +0100
commite0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf (patch)
treea50f913bc47e2d9aae6fb535b1f96a0c9c56af3b /lisp/cus-edit.el
parentd89d5e0f9466b9823fe31d02a374d654163594e4 (diff)
parente852822f3db469c985bf022651f184d6ff2c518a (diff)
downloademacs-e0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf.tar.gz
emacs-e0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf.tar.bz2
emacs-e0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf.zip
Merge from origin/emacs-28
e852822f3d Fix removal of fringe marks of deleted bookmarks b418aad85a * lisp/repeat.el (repeat-echo-message): Bind message-log-m... fe2ac7cb7c * lisp/repeat.el (describe-repeat-maps): Use help-fns--ana... c840bfe7e1 * lisp/repeat.el: Detect changes in the minibuffer state (... 5044151486 Avoid segfaults due to freed face cache 199e2468d3 Doc fix; change recommended file name of custom-file
Diffstat (limited to 'lisp/cus-edit.el')
-rw-r--r--lisp/cus-edit.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 34a6db508d5..6c353b0d9ec 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4646,8 +4646,8 @@ You can set this option through Custom, if you carefully read the
last paragraph below. However, usually it is simpler to write
something like the following in your init file:
-\(setq custom-file \"~/.emacs-custom.el\")
-\(load custom-file)
+(setq custom-file \"~/.config/emacs-custom.el\")
+(load custom-file)
Note that both lines are necessary: the first line tells Custom to
save all customizations in this file, but does not load it.