From 684d6f5bccb1f3f4e4935a5d9c95b2c5f6f5b8a1 Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Wed, 25 Jul 2007 05:19:07 +0000
Subject: Switch license to GPLv3 or later.

---
 src/buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index 368da4763a5..554ca145b79 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
-- 
cgit v1.2.1


From f716503448936e55acf3f32d0e8ddd8d407ca4e1 Mon Sep 17 00:00:00 2001
From: Nick Roberts
Date: Sat, 28 Jul 2007 01:16:18 +0000
Subject: * xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for 
 remote default-directory.

* buffer.c (mode-line-format): Update doc string.
---
 src/buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index 2ded9857455..127bfba44e0 100644
--- 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.  */);
-- 
cgit v1.2.1