From 39ef03af997b197fd313abd38f3eef866e38d7ca Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Feb 2013 12:55:13 +0200 Subject: [PATCH 1/5] Minor improvements in the ELisp manual. doc/lispref/files.texi (Magic File Names): Improve wording and indexing. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/files.texi | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9d541978cbc..722e741a119 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-02-23 Eli Zaretskii + + * files.texi (Magic File Names): Improve wording and indexing. + 2013-02-19 Glenn Morris * text.texi (Change Hooks): Fix typo. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index c976f5b2ec4..49269d71bf9 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2643,7 +2643,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 @@ -2651,6 +2651,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 From da35c2b26f55a329329792f21a297aa8ad08fb95 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 23 Feb 2013 13:15:54 -0800 Subject: [PATCH 2/5] TODO update --- etc/TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/TODO b/etc/TODO index d584168b263..59aa48ffd6d 100644 --- a/etc/TODO +++ b/etc/TODO @@ -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 http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg01346.html From 1938d88c74281393f180f7ac3c77418b926ed6e6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 23 Feb 2013 16:21:06 -0800 Subject: [PATCH 3/5] 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 . --- src/ChangeLog | 9 +++++++++ src/filelock.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 99b5e8734e9..914c005a046 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +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-18 Eli Zaretskii * w32proc.c (new_child): Avoid leaking handles if the subprocess diff --git a/src/filelock.c b/src/filelock.c index f21240f8340..ba55c1c146a 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -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)) { From 51aa2a8b797cefbbee597b5c33ff955c0e470855 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 24 Feb 2013 09:09:24 +0100 Subject: [PATCH 4/5] Fixes: debbugs:13797 * xdisp.c (set_message): Only check for debug-on-message if STRING is a string. --- src/ChangeLog | 5 +++++ src/xdisp.c | 1 + 2 files changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 914c005a046..42a2fd0dcac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/src/xdisp.c b/src/xdisp.c index 55d1272faaf..d42862b190a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10636,6 +10636,7 @@ set_message (const char *s, 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)); } From c0c2eb8295bb99b6ac0bbf8c1e06b60220074a5b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 24 Feb 2013 18:58:55 +0100 Subject: [PATCH 5/5] Port 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. --- doc/misc/ChangeLog | 8 ++++++++ doc/misc/tramp.texi | 33 +++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0d6e0785c09..63cbcdc5a15 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,11 @@ +2013-02-24 Michael Albinus + + Port 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. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 616b32806f4..493c69da052 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -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} @xxx{x\one\}@c -@ifclear x@c +@ifclear x \one\@w{}\two\@c @end ifclear -@clear x\one\@c +@clear x\one\ @end macro -@macro trampfn {method, user, host, localname}@c -@value{prefix}@yyy{\method\,@value{postfixhop}}@yyy{\user\,@@}\host\@value{postfix}\localname\@c +@macro trampfn {method, user, host, localname} +@value{prefix}@c +@yyy{\method\,@value{postfixhop}}@c +@yyy{\user\,@@}@c +\host\@value{postfix}\localname\ @end macro @copying @@ -2268,25 +2271,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 @code{melancholia}. -@item @trampfn{, , melancholia.danann.net, .emacs} +@item @value{prefix}melancholia.danann.net@value{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{~} construct is expanded to the home directory of that user on the remote machine. -@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 @code{melancholia}. @@ -2396,7 +2399,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 @example -@multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}} +@c @multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}} +@multitable @columnfractions .5 .5 @ifset emacs @item @value{prefixhop}telnet@value{postfixhop} @tab tmp/ @item @value{prefixhop}toto@value{postfix} @tab @@ -2423,7 +2427,8 @@ Next @kbd{@key{TAB}} brings you all machine names @value{tramp} detects in your @file{/etc/hosts} file, let's say @example -@multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}} +@multitable @columnfractions .5 .5 +@c @multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}} @item @trampfn{telnet, , 127.0.0.1,} @tab @trampfn{telnet, , 192.168.0.1,} @item @trampfn{telnet, , @value{ipv6prefix}::1@value{ipv6postfix},} @tab @trampfn{telnet, , localhost,} @item @trampfn{telnet, , melancholia.danann.net,} @tab @trampfn{telnet, , melancholia,}