aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-12-05 15:50:34 +0000
committerLuc Teirlinck2004-12-05 15:50:34 +0000
commit44240c376d5f7972a91090e4a4d64d7fefb4270f (patch)
treed7cf7123cdd8424b66e1dc8c7d97b95748b2870f
parent32a6e6fc2635e6f2da805f85fa751ec559b8d603 (diff)
downloademacs-44240c376d5f7972a91090e4a4d64d7fefb4270f.tar.gz
emacs-44240c376d5f7972a91090e4a4d64d7fefb4270f.zip
(custom-file): Escape double-quotes in docstring.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/cus-edit.el2
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35603e7e9c1..098342c9bcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-12-05 Luc Teirlinck <teirllm@auburn.edu>
2
3 * cus-edit.el (custom-file): Escape double-quotes in docstring.
4
12004-12-05 Richard M. Stallman <rms@gnu.org> 52004-12-05 Richard M. Stallman <rms@gnu.org>
2 6
3 * cus-edit.el (custom-file): Doc fix. 7 * cus-edit.el (custom-file): Doc fix.
@@ -7,7 +11,7 @@
72004-12-02 Per Abrahamsen <abraham@dina.kvl.dk> 112004-12-02 Per Abrahamsen <abraham@dina.kvl.dk>
8 12
9 * wid-edit.el (widget-specify-field): Add `real-field' property to 13 * wid-edit.el (widget-specify-field): Add `real-field' property to
10 boundary. 14 boundary.
11 (widget-field-at): Use it. 15 (widget-field-at): Use it.
12 16
132004-12-02 Richard M. Stallman <rms@gnu.org> 172004-12-02 Richard M. Stallman <rms@gnu.org>
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index ae008f2f2e2..e9a5cc41214 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3681,7 +3681,7 @@ The default is nil, which means to use your init file
3681as specified by `user-init-file'. If you specify some other file, 3681as specified by `user-init-file'. If you specify some other file,
3682you need to explicitly load that file in order for 3682you need to explicitly load that file in order for
3683the settings it contains to take effect. You might want to 3683the settings it contains to take effect. You might want to
3684put code in your init file to load it: `(load "CUSTOM-FILENAME")'. 3684put code in your init file to load it: `(load \"CUSTOM-FILENAME\")'.
3685 3685
3686When you change this variable, look in the previous custom file 3686When you change this variable, look in the previous custom file
3687\(usually your init file) for the forms `(custom-set-variables ...)' 3687\(usually your init file) for the forms `(custom-set-variables ...)'