diff options
| author | Glenn Morris | 2018-03-06 20:13:51 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-03-06 20:13:51 -0500 |
| commit | 19afff31c9340ba5c35504064fb0fadcc8a86aff (patch) | |
| tree | cbf19dd953c1ec9a34bfd127686a69d26717e53f | |
| parent | c797bc90f5c63ad5ad01c1caa54f6d236a283efe (diff) | |
| download | emacs-19afff31c9340ba5c35504064fb0fadcc8a86aff.tar.gz emacs-19afff31c9340ba5c35504064fb0fadcc8a86aff.zip | |
Replace some obsolete aliases in documentation
* doc/emacs/text.texi (Nroff Mode):
* doc/misc/efaq.texi (How to add fonts):
* lisp/gnus/nnheader.el (nnheader-insert-file-contents):
* lisp/progmodes/pascal.el (pascal-outline-mode):
Doc fixes re obsolete aliases.
; * src/frame.c (do_switch_frame): Comment.
| -rw-r--r-- | doc/emacs/text.texi | 16 | ||||
| -rw-r--r-- | doc/misc/efaq.texi | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnheader.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/pascal.el | 2 | ||||
| -rw-r--r-- | src/frame.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index c8e36411a5c..b188c02a9ab 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi | |||
| @@ -2057,27 +2057,27 @@ hook @code{text-mode-hook}, then @code{nroff-mode-hook} | |||
| 2057 | separators, pages are separated by @samp{.bp} commands, and comments | 2057 | separators, pages are separated by @samp{.bp} commands, and comments |
| 2058 | start with backslash-doublequote. It also defines these commands: | 2058 | start with backslash-doublequote. It also defines these commands: |
| 2059 | 2059 | ||
| 2060 | @findex forward-text-line | 2060 | @findex nroff-forward-text-line |
| 2061 | @findex backward-text-line | 2061 | @findex nroff-backward-text-line |
| 2062 | @findex count-text-lines | 2062 | @findex nroff-count-text-lines |
| 2063 | @kindex M-n @r{(Nroff mode)} | 2063 | @kindex M-n @r{(Nroff mode)} |
| 2064 | @kindex M-p @r{(Nroff mode)} | 2064 | @kindex M-p @r{(Nroff mode)} |
| 2065 | @kindex M-? @r{(Nroff mode)} | 2065 | @kindex M-? @r{(Nroff mode)} |
| 2066 | @table @kbd | 2066 | @table @kbd |
| 2067 | @item M-n | 2067 | @item M-n |
| 2068 | Move to the beginning of the next line that isn't an nroff command | 2068 | Move to the beginning of the next line that isn't an nroff command |
| 2069 | (@code{forward-text-line}). An argument is a repeat count. | 2069 | (@code{nroff-forward-text-line}). An argument is a repeat count. |
| 2070 | @item M-p | 2070 | @item M-p |
| 2071 | Like @kbd{M-n} but move up (@code{backward-text-line}). | 2071 | Like @kbd{M-n} but move up (@code{nroff-backward-text-line}). |
| 2072 | @item M-? | 2072 | @item M-? |
| 2073 | Displays in the echo area the number of text lines (lines that are not | 2073 | Displays in the echo area the number of text lines (lines that are not |
| 2074 | nroff commands) in the region (@code{count-text-lines}). | 2074 | nroff commands) in the region (@code{nroff-count-text-lines}). |
| 2075 | @end table | 2075 | @end table |
| 2076 | 2076 | ||
| 2077 | @findex electric-nroff-mode | 2077 | @findex nroff-electric-mode |
| 2078 | Electric Nroff mode is a buffer-local minor mode that can be used | 2078 | Electric Nroff mode is a buffer-local minor mode that can be used |
| 2079 | with Nroff mode. To toggle this minor mode, type @kbd{M-x | 2079 | with Nroff mode. To toggle this minor mode, type @kbd{M-x |
| 2080 | electric-nroff-mode} (@pxref{Minor Modes}). When the mode is on, each | 2080 | nroff-electric-mode} (@pxref{Minor Modes}). When the mode is on, each |
| 2081 | time you type @key{RET} to end a line containing an nroff command that | 2081 | time you type @key{RET} to end a line containing an nroff command that |
| 2082 | opens a kind of grouping, the nroff command to close that grouping is | 2082 | opens a kind of grouping, the nroff command to close that grouping is |
| 2083 | automatically inserted on the following line. | 2083 | automatically inserted on the following line. |
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 6f4977779fd..e0dfc8936d9 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi | |||
| @@ -4310,7 +4310,7 @@ fontset, or you can select it by setting the default font in your | |||
| 4310 | @file{~/.emacs}: | 4310 | @file{~/.emacs}: |
| 4311 | 4311 | ||
| 4312 | @lisp | 4312 | @lisp |
| 4313 | (set-default-font "fontset-bdf") | 4313 | (set-frame-font "fontset-bdf") |
| 4314 | @end lisp | 4314 | @end lisp |
| 4315 | 4315 | ||
| 4316 | 4316 | ||
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index 14bd14924ff..77afb09a2a8 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el | |||
| @@ -945,7 +945,7 @@ first. Otherwise, find the newest one, though it may take a time." | |||
| 945 | "Like `insert-file-contents', q.v., but only reads in the file. | 945 | "Like `insert-file-contents', q.v., but only reads in the file. |
| 946 | A buffer may be modified in several ways after reading into the buffer due | 946 | A buffer may be modified in several ways after reading into the buffer due |
| 947 | to advanced Emacs features, such as file-name-handlers, format decoding, | 947 | to advanced Emacs features, such as file-name-handlers, format decoding, |
| 948 | find-file-hooks, etc. | 948 | find-file-hook, etc. |
| 949 | This function ensures that none of these modifications will take place." | 949 | This function ensures that none of these modifications will take place." |
| 950 | (let ((coding-system-for-read nnheader-file-coding-system)) | 950 | (let ((coding-system-for-read nnheader-file-coding-system)) |
| 951 | (mm-insert-file-contents filename visit beg end replace))) | 951 | (mm-insert-file-contents filename visit beg end replace))) |
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 83f15d495b5..737dd9ea8a8 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el | |||
| @@ -1425,7 +1425,7 @@ Pascal Outline mode provides some additional commands. | |||
| 1425 | \\[pascal-show-all]\t- Show the whole buffer. | 1425 | \\[pascal-show-all]\t- Show the whole buffer. |
| 1426 | \\[pascal-hide-other-defuns]\ | 1426 | \\[pascal-hide-other-defuns]\ |
| 1427 | \t- Hide everything but the current function (function under the cursor). | 1427 | \t- Hide everything but the current function (function under the cursor). |
| 1428 | \\[pascal-outline]\t- Leave Pascal Outline mode." | 1428 | \\[pascal-outline-mode]\t- Leave Pascal Outline mode." |
| 1429 | :init-value nil :lighter " Outl" :keymap pascal-outline-map | 1429 | :init-value nil :lighter " Outl" :keymap pascal-outline-map |
| 1430 | (add-to-invisibility-spec '(pascal . t)) | 1430 | (add-to-invisibility-spec '(pascal . t)) |
| 1431 | (unless pascal-outline-mode | 1431 | (unless pascal-outline-mode |
diff --git a/src/frame.c b/src/frame.c index a86f05191a8..cee775c6fa9 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1419,7 +1419,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor | |||
| 1419 | /* We want to make sure that the next event generates a frame-switch | 1419 | /* We want to make sure that the next event generates a frame-switch |
| 1420 | event to the appropriate frame. This seems kludgy to me, but | 1420 | event to the appropriate frame. This seems kludgy to me, but |
| 1421 | before you take it out, make sure that evaluating something like | 1421 | before you take it out, make sure that evaluating something like |
| 1422 | (select-window (frame-root-window (new-frame))) doesn't end up | 1422 | (select-window (frame-root-window (make-frame))) doesn't end up |
| 1423 | with your typing being interpreted in the new frame instead of | 1423 | with your typing being interpreted in the new frame instead of |
| 1424 | the one you're actually typing in. */ | 1424 | the one you're actually typing in. */ |
| 1425 | #ifdef HAVE_WINDOW_SYSTEM | 1425 | #ifdef HAVE_WINDOW_SYSTEM |