From: Glenn Morris <rgm@gnu.org>
Date: Wed, 7 Mar 2018 01:13:51 +0000 (-0500)
Subject: Replace some obsolete aliases in documentation
X-Git-Tag: emacs-26.1-rc1~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19afff31c9340ba5c35504064fb0fadcc8a86aff;p=emacs.git

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.
---

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}
 separators, pages are separated by @samp{.bp} commands, and comments
 start with backslash-doublequote.  It also defines these commands:
 
-@findex forward-text-line
-@findex backward-text-line
-@findex count-text-lines
+@findex nroff-forward-text-line
+@findex nroff-backward-text-line
+@findex nroff-count-text-lines
 @kindex M-n @r{(Nroff mode)}
 @kindex M-p @r{(Nroff mode)}
 @kindex M-? @r{(Nroff mode)}
 @table @kbd
 @item M-n
 Move to the beginning of the next line that isn't an nroff command
-(@code{forward-text-line}).  An argument is a repeat count.
+(@code{nroff-forward-text-line}).  An argument is a repeat count.
 @item M-p
-Like @kbd{M-n} but move up (@code{backward-text-line}).
+Like @kbd{M-n} but move up (@code{nroff-backward-text-line}).
 @item M-?
 Displays in the echo area the number of text lines (lines that are not
-nroff commands) in the region (@code{count-text-lines}).
+nroff commands) in the region (@code{nroff-count-text-lines}).
 @end table
 
-@findex electric-nroff-mode
+@findex nroff-electric-mode
   Electric Nroff mode is a buffer-local minor mode that can be used
 with Nroff mode.  To toggle this minor mode, type @kbd{M-x
-electric-nroff-mode} (@pxref{Minor Modes}).  When the mode is on, each
+nroff-electric-mode} (@pxref{Minor Modes}).  When the mode is on, each
 time you type @key{RET} to end a line containing an nroff command that
 opens a kind of grouping, the nroff command to close that grouping is
 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
 @file{~/.emacs}:
 
 @lisp
-  (set-default-font "fontset-bdf")
+  (set-frame-font "fontset-bdf")
 @end lisp
 
 
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."
   "Like `insert-file-contents', q.v., but only reads in the file.
 A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
-find-file-hooks, etc.
+find-file-hook, etc.
   This function ensures that none of these modifications will take place."
   (let ((coding-system-for-read nnheader-file-coding-system))
     (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.
 \\[pascal-show-all]\t- Show the whole buffer.
 \\[pascal-hide-other-defuns]\
 \t- Hide everything but the current function (function under the cursor).
-\\[pascal-outline]\t- Leave Pascal Outline mode."
+\\[pascal-outline-mode]\t- Leave Pascal Outline mode."
   :init-value nil :lighter " Outl" :keymap pascal-outline-map
   (add-to-invisibility-spec '(pascal . t))
   (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
   /* We want to make sure that the next event generates a frame-switch
      event to the appropriate frame.  This seems kludgy to me, but
      before you take it out, make sure that evaluating something like
-     (select-window (frame-root-window (new-frame))) doesn't end up
+     (select-window (frame-root-window (make-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
 #ifdef HAVE_WINDOW_SYSTEM