diff options
| -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 | ||||
| -rw-r--r-- | etc/TODO | 1 | ||||
| -rw-r--r-- | lisp/hilit-chg.el | 4 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 2 |
6 files changed, 6 insertions, 20 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. @@ -216,7 +216,6 @@ Change them to use report-emacs-bug. **** lm-report-bug **** tramp-bug **** c-submit-bug-report -**** ffap-bug and ffap-submit-bug (obsoleted) [Do all of them need changing?] ** Allow fringe indicators to display a tooltip (provide a help-echo property?) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index de1ae0d4570..b8c1fc5a99b 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -300,9 +300,9 @@ modes only." (defcustom highlight-changes-global-changes-existing-buffers nil "If non-nil, toggling global Highlight Changes mode affects existing buffers. -Normally, `global-highlight-changes' affects only new buffers (to be +Normally, `global-highlight-changes-mode' affects only new buffers (to be created). However, if `highlight-changes-global-changes-existing-buffers' -is non-nil, then turning on `global-highlight-changes' will turn on +is non-nil, then turning on `global-highlight-changes-mode' will turn on Highlight Changes mode in suitable buffers, and turning the mode off will remove it from existing buffers." :type 'boolean diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index b35e6869d2e..9b9d3ce9adc 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -260,7 +260,7 @@ bit output with no translation." (cons xlfd-charset (cons windows-charset codepage)))) ;; The last charset we add becomes the "preferred" charset for the return -;; value from w32-select-font etc, so list the most important charsets last. +;; value from x-select-font etc, so list the most important charsets last. (w32-add-charset-info "iso8859-14" 'w32-charset-ansi 28604) (w32-add-charset-info "iso8859-15" 'w32-charset-ansi 28605) ;; The following two are included for pattern matching. |