mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-28 10:56:36 +00:00
Merge from origin/emacs-28
14833cd9df
Improve wording when documenting other TRAMP syntaxes628df15da5
; * doc/misc/viper.texi (Rudimentary Changes): Avoid alias.85de996bbb
* lisp/vc/diff-mode.el: Don't mention XEmacs.
This commit is contained in:
commit
358ad0d30a
@ -3383,7 +3383,7 @@ names. Beside the @code{default} value, @var{syntax} can be
|
||||
@item @code{simplified}
|
||||
@cindex simplified syntax
|
||||
|
||||
The remote file name syntax is similar to the syntax used by Ange FTP@.
|
||||
This remote file name syntax is similar to the syntax used by Ange FTP@.
|
||||
A remote file name has the form
|
||||
@code{@value{prefix}user@@host@value{postfix}path/to/file}. The
|
||||
@code{user@@} part is optional, and the method is determined by
|
||||
@ -3395,7 +3395,7 @@ A remote file name has the form
|
||||
@clear unified
|
||||
@set separate
|
||||
@include trampver.texi
|
||||
The remote file name syntax is similar to the syntax used by XEmacs.
|
||||
This remote file name syntax originated in the XEmacs text editor.
|
||||
A remote file name has the form
|
||||
@code{@trampfn{method,user@@host,path/to/file}}. The @code{method}
|
||||
and @code{user@@} parts are optional.
|
||||
|
@ -1842,7 +1842,7 @@ usually most effective:
|
||||
(set-face-background viper-replace-overlay-face "yellow")
|
||||
@end smallexample
|
||||
For a complete list of colors available to you, evaluate the expression
|
||||
@code{(x-defined-colors)}. (Type it in the buffer @file{*scratch*} and then
|
||||
@code{(defined-colors)}. (Type it in the buffer @file{*scratch*} and then
|
||||
hit the @kbd{C-j} key.
|
||||
|
||||
@item viper-replace-overlay-cursor-color "Red"
|
||||
|
@ -27,8 +27,8 @@
|
||||
;; to the corresponding source file.
|
||||
|
||||
;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
|
||||
;; Some efforts were spent to have it somewhat compatible with XEmacs's
|
||||
;; diff-mode as well as with compilation-minor-mode
|
||||
;; Some efforts were spent to have it somewhat compatible with
|
||||
;; `compilation-minor-mode'.
|
||||
|
||||
;; Bugs:
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user