Commit 1abfd3e8 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-22T19:09:52Z!

parents 4b9f0b67 c0c2eb82
2013-02-24 Eli Zaretskii <>
* files.texi (Magic File Names): Improve wording and indexing.
2013-02-21 Glenn Morris <>
* display.texi (Multi-Frame Images): Minor rephrasing.
......@@ -2681,7 +2681,7 @@ no prefix argument is given, and @code{nil} otherwise.
You can implement special handling for certain file names. This is
called making those names @dfn{magic}. The principal use for this
feature is in implementing remote file names (@pxref{Remote Files,,
feature is in implementing access to remote files (@pxref{Remote Files,,
Remote Files, emacs, The GNU Emacs Manual}).
To define a kind of magic file name, you must supply a regular
......@@ -2689,6 +2689,7 @@ expression to define the class of names (all those that match the
regular expression), plus a handler that implements all the primitive
Emacs file operations for file names that match.
@cindex file handler
@vindex file-name-handler-alist
The variable @code{file-name-handler-alist} holds a list of handlers,
together with regular expressions that determine when to apply each
2013-02-24 Michael Albinus <>
Port Tramp documentation to Texinfo 5.0.
* tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
(Filename Syntax): Do not use @trampfn{} in @item.
(Filename completion): Use @columnfractions in @multitable.
2013-02-22 Glenn Morris <>
* flymake.texi (Syntax check statuses): Fix multitable continued rows.
......@@ -20,20 +20,23 @@
@c xxx and yyy are auxiliary macros in order to omit leading and
@c trailing whitespace. Not very elegant, but I don't know it better.
@macro xxx {one}@c
@set \one\@c
@macro xxx {one}
@set \one\
@end macro
@macro yyy {one, two}@c
@macro yyy {one, two}
@ifclear x@c
@ifclear x
@end ifclear
@clear x\one\@c
@clear x\one\
@end macro
@macro trampfn {method, user, host, localname}@c
@macro trampfn {method, user, host, localname}
@end macro
......@@ -2323,25 +2326,25 @@ using the default method. @xref{Default Method}.
Some examples of @value{tramp} filenames are shown below.
@table @file
@item @trampfn{, , melancholia, .emacs}
@item @value{prefix}melancholia@value{postfix}.emacs
Edit the file @file{.emacs} in your home directory on the machine
@item @trampfn{, ,, .emacs}
@item @value{prefix}{postfix}.emacs
This edits the same file, using the fully qualified domain name of
the machine.
@item @trampfn{, , melancholia, ~/.emacs}
@item @value{prefix}melancholia@value{postfix}~/.emacs
This also edits the same file; the @file{~} is expanded to your
home directory on the remote machine, just like it is locally.
@item @trampfn{, , melancholia, ~daniel/.emacs}
@item @value{prefix}melancholia@value{postfix}~daniel/.emacs
This edits the file @file{.emacs} in the home directory of the user
@code{daniel} on the machine @code{melancholia}. The @file{~<user>}
construct is expanded to the home directory of that user on the remote
@item @trampfn{, , melancholia, /etc/squid.conf}
@item @value{prefix}melancholia@value{postfix}/etc/squid.conf
This edits the file @file{/etc/squid.conf} on the machine
......@@ -2453,7 +2456,8 @@ If you, for example, type @kbd{C-x C-f @value{prefix}t
@key{TAB}}, @value{tramp} might give you as result the choice for
@multitable {@trampfn{telnet, ,,}} {@trampfn{telnet, ,,}}
@c @multitable {@trampfn{telnet, ,,}} {@trampfn{telnet, ,,}}
@multitable @columnfractions .5 .5
@ifset emacs
@item @value{prefixhop}telnet@value{postfixhop} @tab tmp/
@item @value{prefixhop}toto@value{postfix} @tab
......@@ -2480,7 +2484,8 @@ Next @kbd{@key{TAB}} brings you all machine names @value{tramp} detects in
your @file{/etc/hosts} file, let's say
@multitable {@trampfn{telnet, ,,}} {@trampfn{telnet, ,,}}
@multitable @columnfractions .5 .5
@c @multitable {@trampfn{telnet, ,,}} {@trampfn{telnet, ,,}}
@item @trampfn{telnet, ,,} @tab @trampfn{telnet, ,,}
@item @trampfn{telnet, , @value{ipv6prefix}::1@value{ipv6postfix},} @tab @trampfn{telnet, , localhost,}
@item @trampfn{telnet, ,,} @tab @trampfn{telnet, , melancholia,}
......@@ -107,8 +107,6 @@ for users to customize.
** Distribute a bar cursor of width > 1 evenly between the two glyphs
on each side of the bar (what to do at the edges?).
** buffer-offer-save should be a permanent local.
** revert-buffer should eliminate overlays and the mark.
For related problems consult the thread starting with
2013-02-24 Andreas Schwab <>
* xdisp.c (set_message): Only check for debug-on-message if STRING
is a string. (Bug#13797)
2013-02-24 Paul Eggert <>
Fix regression introduced by July 10 filelock.c patch.
* filelock.c (fill_in_lock_file_name): Fix crash caused by the
2012-07-10 patch to this file. Reported by Eli Zaretskii in
and diagnosed by Andreas Schwab in
2013-02-22 Paul Eggert <>
Assume C89 or better.
......@@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn)
p[1] = '.';
p[2] = '#';
p = p + length + 2;
p = lockfile + length + 2;
while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
......@@ -10525,6 +10525,7 @@ set_message (Lisp_Object string)
help_echo_showing_p = 0;
if (STRINGP (Vdebug_on_message)
&& STRINGP (string)
&& fast_string_match (Vdebug_on_message, string) >= 0)
call_debugger (list2 (Qerror, string));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment