Update documentation for obsolete generalized variables

* doc/misc/cl.texi (Setf Extensions): Delete obsolete generalized
variables from list.
* etc/NEWS: Fix sorting of obsolete generalized variables.

1 files changed, 5 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index a5b5e9053d9..44ee9b8fc73 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2581,7 +2581,7 @@ abbrevlist.el, assoc.el, complete.el, cust-print.el,
 erc-hecomplete.el, mailpost.el, mouse-sel.el, old-emacs-lock.el,
 patcomp.el, pc-mode.el, pc-select.el, s-region.el, and sregex.el.
 
----
++++
 ** Many seldom-used generalized variables have been made obsolete.
 Emacs has a number of rather obscure generalized variables defined,
 that, for instance, allowed you to say things like:
@@ -2594,7 +2594,7 @@ for instance, is the same as saying
    (narrow-to-region 4 (point-max))
 
 The following generalized variables have been made obsolete:
-'buffer-local-value', 'visited-file-name', 'buffer-modified-p',
+'buffer-file-name', 'buffer-local-value', 'buffer-modified-p',
 'buffer-name', 'buffer-string', 'buffer-substring', 'current-buffer',
 'current-column', 'current-global-map', 'current-input-mode',
 'current-local-map', 'current-window-configuration',
@@ -2602,9 +2602,9 @@ The following generalized variables have been made obsolete:
 'frame-visible-p', 'global-key-binding', 'local-key-binding', 'mark',
 'mark-marker', 'marker-position', 'mouse-position', 'point',
 'point-marker', 'point-max', 'point-min', 'read-mouse-position',
-'screen-height', 'screen-width', 'selected-window', 'selected-screen',
-'selected-frame', 'standard-case-table', 'syntax-table',
-'visited-file-modtime', 'window-height', 'window-width' and
+'screen-height', 'screen-width', 'selected-frame', 'selected-screen',
+'selected-window', 'standard-case-table', 'syntax-table',
+'visited-file-modtime', 'window-height', 'window-width', and
 'x-get-secondary-selection'.