Merge from emacs--rel--22

[bpt/emacs.git] / lisp / bindings.el

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 93a28e9..e38cc5b 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -10,7 +10,7 @@
 
 ;; 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,
@@ -250,7 +250,7 @@ Normally nil in most modes, since there is no process to display.")
 
 (defvar mode-line-remote
   (list (propertize
-        "%1R"
+        "%1@"
         'help-echo (purecopy (lambda (window object point)
                                (format "%s"
                                        (save-selected-window
@@ -493,7 +493,7 @@ Menu of mode operations in the mode line.")
 (defvar minor-mode-alist nil "\
 Alist saying how to show minor modes in the mode line.
 Each element looks like (VARIABLE STRING);
-STRING is included in the mode line iff VARIABLE's value is non-nil.
+STRING is included in the mode line if VARIABLE's value is non-nil.
 
 Actually, STRING need not be a string; any possible mode-line element
 is okay.  See `mode-line-format'.")