[Emacs-diffs] /srv/bzr/emacs/trunk r111868: Merge from emacs-24; up to r111297

[Glenn Morris]

------------------------------------------------------------
revno: 111868 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-02-24 11:45:17 -0800
message:
  Merge from emacs-24; up to r111297
modified:
  doc/lispref/ChangeLog
  doc/lispref/files.texi
  doc/misc/ChangeLog
  doc/misc/tramp.texi
  etc/TODO
  src/ChangeLog
  src/filelock.c
  src/xdisp.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-02-21 06:03:02 +0000
+++ b/doc/lispref/ChangeLog     2013-02-24 19:45:17 +0000
@@ -1,3 +1,7 @@
+2013-02-24  Eli Zaretskii  <address@hidden>
+
+       * files.texi (Magic File Names): Improve wording and indexing.
+
 2013-02-21  Glenn Morris  <address@hidden>
 
        * display.texi (Multi-Frame Images): Minor rephrasing.

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2013-01-19 09:59:51 +0000
+++ b/doc/lispref/files.texi    2013-02-24 19:45:17 +0000
@@ -2681,7 +2681,7 @@
 
   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 @@
 regular expression), plus a handler that implements all the primitive
 Emacs file operations for file names that match.
 
address@hidden 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

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-02-22 17:13:05 +0000
+++ b/doc/misc/ChangeLog        2013-02-24 19:45:17 +0000
@@ -1,3 +1,10 @@
+2013-02-24  Michael Albinus  <address@hidden>
+
+       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  <address@hidden>
 
        * flymake.texi (Syntax check statuses): Fix multitable continued rows.

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-02-22 17:13:05 +0000
+++ b/doc/misc/tramp.texi       2013-02-24 19:45:17 +0000
@@ -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.
 
address@hidden xxx address@hidden
address@hidden address@hidden
address@hidden xxx {one}
address@hidden \one\
 @end macro
 
address@hidden yyy {one, address@hidden
address@hidden yyy {one, two}
 @address@hidden
address@hidden address@hidden
address@hidden x
 address@hidden@c
 @end ifclear
address@hidden address@hidden
address@hidden x\one\
 @end macro
 
address@hidden trampfn {method, user, host, address@hidden
address@hidden@yyy{\method\,@address@hidden,@@address@hidden@c
address@hidden trampfn {method, user, host, localname}
address@hidden@c
address@hidden,@address@hidden
address@hidden,@@address@hidden
address@hidden
 @end macro
 
 @copying
@@ -2323,25 +2326,25 @@
 Some examples of @value{tramp} filenames are shown below.
 
 @table @file
address@hidden @trampfn{, , melancholia, .emacs}
address@hidden @address@hidden
 Edit the file @file{.emacs} in your home directory on the machine
 @code{melancholia}.
 
address@hidden @trampfn{, , melancholia.danann.net, .emacs}
address@hidden @address@hidden
 This edits the same file, using the fully qualified domain name of
 the machine.
 
address@hidden @trampfn{, , melancholia, ~/.emacs}
address@hidden @address@hidden/.emacs
 This also edits the same file; the @file{~} is expanded to your
 home directory on the remote machine, just like it is locally.
 
address@hidden @trampfn{, , melancholia, ~daniel/.emacs}
address@hidden @address@hidden/.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
 machine.
 
address@hidden @trampfn{, , melancholia, /etc/squid.conf}
address@hidden @address@hidden/etc/squid.conf
 This edits the file @file{/etc/squid.conf} on the machine
 @code{melancholia}.
 
@@ -2453,7 +2456,8 @@
 @key{TAB}}, @value{tramp} might give you as result the choice for
 
 @example
address@hidden address@hidden, , melancholia.danann.net,}} address@hidden, , 
192.168.0.1,}}
address@hidden @multitable address@hidden, , melancholia.danann.net,}} 
address@hidden, , 192.168.0.1,}}
address@hidden @columnfractions .5 .5
 @ifset emacs
 @item @address@hidden @tab tmp/
 @item @address@hidden @tab
@@ -2480,7 +2484,8 @@
 your @file{/etc/hosts} file, let's say
 
 @example
address@hidden address@hidden, , melancholia.danann.net,}} address@hidden, , 
192.168.0.1,}}
address@hidden @columnfractions .5 .5
address@hidden @multitable address@hidden, , melancholia.danann.net,}} 
address@hidden, , 192.168.0.1,}}
 @item @trampfn{telnet, , 127.0.0.1,} @tab @trampfn{telnet, , 192.168.0.1,}
 @item @trampfn{telnet, , @value{ipv6prefix}::address@hidden,} @tab 
@trampfn{telnet, , localhost,}
 @item @trampfn{telnet, , melancholia.danann.net,} @tab @trampfn{telnet, , 
melancholia,}

=== modified file 'etc/TODO'
--- a/etc/TODO  2013-02-17 19:01:46 +0000
+++ b/etc/TODO  2013-02-24 19:45:17 +0000
@@ -107,8 +107,6 @@
 ** 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-22 19:23:12 +0000
+++ b/src/ChangeLog     2013-02-24 19:45:17 +0000
@@ -1,3 +1,17 @@
+2013-02-24  Andreas Schwab  <address@hidden>
+
+       * xdisp.c (set_message): Only check for debug-on-message if STRING
+       is a string.  (Bug#13797)
+
+2013-02-24  Paul Eggert  <address@hidden>
+
+       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
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+       and diagnosed by Andreas Schwab in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+
 2013-02-22  Paul Eggert  <address@hidden>
 
        Assume C89 or better.

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2013-02-01 06:30:51 +0000
+++ b/src/filelock.c    2013-02-24 19:45:17 +0000
@@ -316,7 +316,7 @@
   p[1] = '.';
   p[2] = '#';
 
-  p = p + length + 2;
+  p = lockfile + length + 2;
 
   while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
     {

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-02-20 05:18:20 +0000
+++ b/src/xdisp.c       2013-02-24 19:45:17 +0000
@@ -10525,6 +10525,7 @@
   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));
 }