aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2018-03-13 13:49:05 -0400
committerGlenn Morris2018-03-13 13:49:05 -0400
commita6437924f796c07ec15a13c7d1885e83d1b0b0cc (patch)
treeee53fd56e719e30c2f60959e54ea4522ab6a8d44 /doc
parent3060fb8f8118aa88ed13721fc042f22492b9d637 (diff)
downloademacs-a6437924f796c07ec15a13c7d1885e83d1b0b0cc.tar.gz
emacs-a6437924f796c07ec15a13c7d1885e83d1b0b0cc.zip
Doc fixes re obsolete items
* doc/emacs/maintaining.texi (VC Undo): * doc/misc/efaq-w32.texi (Font names): Replace obsolete aliases. * doc/misc/url.texi (Customization): Don't mention url-temporary-directory, it essentially does nothing. * lisp/hilit-chg.el (highlight-changes-global-changes-existing-buffers): Doc fix. ; * lisp/w32-fns.el: Comment. ; * etc/TODO: Remove obsolete ffap mention.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/maintaining.texi2
-rw-r--r--doc/misc/efaq-w32.texi4
-rw-r--r--doc/misc/url.texi13
3 files changed, 3 insertions, 16 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 619f80a3155..cda482877ae 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1078,7 +1078,7 @@ Revert the work file(s) in the current VC fileset to the last revision
1078@findex vc-revert 1078@findex vc-revert
1079@vindex vc-revert-show-diff 1079@vindex vc-revert-show-diff
1080 If you want to discard all the changes you have made to the current 1080 If you want to discard all the changes you have made to the current
1081VC fileset, type @kbd{C-x v u} (@code{vc-revert-buffer}). This shows 1081VC fileset, type @kbd{C-x v u} (@code{vc-revert}). This shows
1082you a diff between the work file(s) and the revision from which you 1082you a diff between the work file(s) and the revision from which you
1083started editing, and asks for confirmation for discarding the changes. 1083started editing, and asks for confirmation for discarding the changes.
1084If you agree, the fileset is reverted. If you don't want @kbd{C-x v 1084If you agree, the fileset is reverted. If you don't want @kbd{C-x v
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 8cdf870ad64..a4e82e2d923 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -906,7 +906,7 @@ The doc string contains a list of the system sounds you can use.
906@cindex font XLFD name format 906@cindex font XLFD name format
907@cindex fontconfig font names in Emacs 23 907@cindex fontconfig font names in Emacs 23
908@cindex font dialog, using to find font names 908@cindex font dialog, using to find font names
909@findex w32-select-font 909@findex x-select-font
910@findex x-list-fonts 910@findex x-list-fonts
911 911
912Fonts in Emacs 22 and earlier are named using the X Logical Font 912Fonts in Emacs 22 and earlier are named using the X Logical Font
@@ -937,7 +937,7 @@ Fontconfig: Courier New-13
937To find the XFLD name for a font, you can execute the following in the 937To find the XFLD name for a font, you can execute the following in the
938@file{*scratch*} buffer by pressing C-j at the end of the line: 938@file{*scratch*} buffer by pressing C-j at the end of the line:
939@example 939@example
940(w32-select-font nil t) 940(x-select-font nil t)
941@end example 941@end example
942 942
943To see a complete list of fonts, execute the following in the 943To see a complete list of fonts, execute the following in the
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index ed39aab2a37..1acf5f2319e 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1263,19 +1263,6 @@ You can use this function to do completion of URLs from the history.
1263@node Customization 1263@node Customization
1264@chapter Customization 1264@chapter Customization
1265 1265
1266@cindex environment variables
1267 The following environment variables affect the @code{url} library's
1268operation at startup.
1269
1270@table @code
1271@item TMPDIR
1272@vindex TMPDIR
1273@vindex url-temporary-directory
1274If this is defined, @code{url-temporary-directory} is initialized from
1275it. This variable was obsoleted in 23.1, please use
1276@code{temporary-file-directory} instead.
1277@end table
1278
1279 The following user options affect the general operation of 1266 The following user options affect the general operation of
1280@code{url} library. 1267@code{url} library.
1281 1268