* xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for

	remote default-directory.

* buffer.c (mode-line-format): Update doc string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f233d6296709980d5f838ce731f6ad436874f32e..cc48a350decedee6fdc66963ae6de2a233184bcb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-28  Nick Roberts  <nickrob@snap.net.nz>
+
+       * bindings.el (mode-line-remote): Use updated %@ construct.
+
 2007-07-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * calendar/cal-bahai.el (calendar-bahai-month-name-array)

diff --git a/src/buffer.c b/src/buffer.c
index 2ded9857455701352f37b8c53960e45dff05b0c9..127bfba44e0113d6faad8950ce55be158ae203c4 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5501,12 +5501,12 @@ A string is printed verbatim in the mode line except for %-constructs:
   %P -- print percent of buffer above bottom of window, perhaps plus Top,
         or print Bottom or All.
   %n -- print Narrow if appropriate.
-  %R -- print R or hyphen.  R means that default-directory is on a
-        remote machine.
   %t -- visited file is text or binary (if OS supports this distinction).
   %z -- print mnemonics of keyboard, terminal, and buffer coding systems.
   %Z -- like %z, but including the end-of-line format.
   %e -- print error message about full memory.
+  %@ -- print @ or hyphen.  @ means that default-directory is on a
+        remote machine.
   %[ -- print one [ for each recursive editing level.  %] similar.
   %% -- print %.   %- -- print infinitely many dashes.
 Decimal digits after the % specify field width to which to pad.  */);

diff --git a/src/xdisp.c b/src/xdisp.c
index 41105456d950974693c0fab9def4bfc1348280d4..14a55720877c1ff687d1dc5f12366aee9e8016fd 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17994,7 +17994,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
 #endif
       break;
 
-    case 'R':
+    case '@':
       {
        Lisp_Object val;
        val = call1 (intern ("file-remote-p"), current_buffer->directory);