diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-13 13:49:05 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-13 13:49:05 -0400 |
| commit | a6437924f796c07ec15a13c7d1885e83d1b0b0cc (patch) | |
| tree | ee53fd56e719e30c2f60959e54ea4522ab6a8d44 /doc | |
| parent | 3060fb8f8118aa88ed13721fc042f22492b9d637 (diff) | |
| download | emacs-a6437924f796c07ec15a13c7d1885e83d1b0b0cc.tar.gz emacs-a6437924f796c07ec15a13c7d1885e83d1b0b0cc.tar.bz2 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.texi | 2 | ||||
| -rw-r--r-- | doc/misc/efaq-w32.texi | 4 | ||||
| -rw-r--r-- | doc/misc/url.texi | 13 |
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 @findex vc-revert @vindex vc-revert-show-diff If you want to discard all the changes you have made to the current -VC fileset, type @kbd{C-x v u} (@code{vc-revert-buffer}). This shows +VC fileset, type @kbd{C-x v u} (@code{vc-revert}). This shows you a diff between the work file(s) and the revision from which you started editing, and asks for confirmation for discarding the changes. If 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. @cindex font XLFD name format @cindex fontconfig font names in Emacs 23 @cindex font dialog, using to find font names -@findex w32-select-font +@findex x-select-font @findex x-list-fonts Fonts in Emacs 22 and earlier are named using the X Logical Font @@ -937,7 +937,7 @@ Fontconfig: Courier New-13 To find the XFLD name for a font, you can execute the following in the @file{*scratch*} buffer by pressing C-j at the end of the line: @example -(w32-select-font nil t) +(x-select-font nil t) @end example To 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. @node Customization @chapter Customization -@cindex environment variables - The following environment variables affect the @code{url} library's -operation at startup. - -@table @code -@item TMPDIR -@vindex TMPDIR -@vindex url-temporary-directory -If this is defined, @code{url-temporary-directory} is initialized from -it. This variable was obsoleted in 23.1, please use -@code{temporary-file-directory} instead. -@end table - The following user options affect the general operation of @code{url} library. |