summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-12 21:09:36 -0400
committerGlenn Morris <rgm@gnu.org>2018-03-12 21:09:36 -0400
commite4b73abd3897a9291fc028f5ef33d6215c7e9de9 (patch)
tree449c94fd17de5a201188c8a895f5432799b5fd2f /doc
parent05669f0e3ee01e785da2482c1342bbd902e57edf (diff)
downloademacs-e4b73abd3897a9291fc028f5ef33d6215c7e9de9.tar.gz
Stop mentioning options.el in doc
* doc/misc/calc.texi (Customizing Embedded Mode): Remove mentions of the obsolete (since 22.1) options.el. * lisp/progmodes/meta-mode.el: Comment fix.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/calc.texi7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 1fe7948ab81..be78a53ed66 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -31292,7 +31292,7 @@ for @code{Save} have no effect.
You can modify Embedded mode's behavior by setting various Lisp
variables described here. These variables are customizable
(@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable}
-or @kbd{M-x edit-options} to adjust a variable on the fly.
+to adjust a variable on the fly.
(Another possibility would be to use a file-local variable annotation at
the end of the file;
@pxref{File Variables, , Local Variables in Files, emacs, the Emacs manual}.)
@@ -31311,9 +31311,8 @@ regular expression is not completely plain, let's go through it
in detail.
The surrounding @samp{" "} marks quote the text between them as a
-Lisp string. If you left them off, @code{set-variable} or
-@code{edit-options} would try to read the regular expression as a
-Lisp program.
+Lisp string. If you left them off, @code{set-variable} (for example)
+would try to read the regular expression as a Lisp program.
The most obvious property of this regular expression is that it
contains indecently many backslashes. There are actually two levels