aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2018-03-12 21:09:36 -0400
committerGlenn Morris2018-03-12 21:09:36 -0400
commite4b73abd3897a9291fc028f5ef33d6215c7e9de9 (patch)
tree449c94fd17de5a201188c8a895f5432799b5fd2f
parent05669f0e3ee01e785da2482c1342bbd902e57edf (diff)
downloademacs-e4b73abd3897a9291fc028f5ef33d6215c7e9de9.tar.gz
emacs-e4b73abd3897a9291fc028f5ef33d6215c7e9de9.zip
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.
-rw-r--r--doc/misc/calc.texi7
-rw-r--r--lisp/progmodes/meta-mode.el4
2 files changed, 5 insertions, 6 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.
31292You can modify Embedded mode's behavior by setting various Lisp 31292You can modify Embedded mode's behavior by setting various Lisp
31293variables described here. These variables are customizable 31293variables described here. These variables are customizable
31294(@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable} 31294(@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable}
31295or @kbd{M-x edit-options} to adjust a variable on the fly. 31295to adjust a variable on the fly.
31296(Another possibility would be to use a file-local variable annotation at 31296(Another possibility would be to use a file-local variable annotation at
31297the end of the file; 31297the end of the file;
31298@pxref{File Variables, , Local Variables in Files, emacs, the Emacs manual}.) 31298@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
31311in detail. 31311in detail.
31312 31312
31313The surrounding @samp{" "} marks quote the text between them as a 31313The surrounding @samp{" "} marks quote the text between them as a
31314Lisp string. If you left them off, @code{set-variable} or 31314Lisp string. If you left them off, @code{set-variable} (for example)
31315@code{edit-options} would try to read the regular expression as a 31315would try to read the regular expression as a Lisp program.
31316Lisp program.
31317 31316
31318The most obvious property of this regular expression is that it 31317The most obvious property of this regular expression is that it
31319contains indecently many backslashes. There are actually two levels 31318contains indecently many backslashes. There are actually two levels
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index 7d20e02d80d..e207d22ff4a 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -47,8 +47,8 @@
47;; `metafont-mode-hook' and `metapost-mode-hook' which apply to the 47;; `metafont-mode-hook' and `metapost-mode-hook' which apply to the
48;; individual modes. In addition, there are several variables and 48;; individual modes. In addition, there are several variables and
49;; regexps controlling e.g. the behavior of the indentation function, 49;; regexps controlling e.g. the behavior of the indentation function,
50;; which may be customized via `edit-options'. Please refer to the 50;; which may be customized. Please refer to the docstrings in the code
51;; docstrings in the code below for details. 51;; below for details.
52 52
53;; Availability: 53;; Availability:
54;; 54;;