From: Karoly Lorentey <lorentey@elte.hu>
Date: Fri, 28 Apr 2006 14:48:18 +0000 (+0000)
Subject: Merged from emacs@sv.gnu.org
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b33c71f58623306001d4d4fe4f7354d8c360edaa;p=emacs.git

Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-234
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-235
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-236
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-237
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-238
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-239
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-240
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-241
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-242
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-243
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-244
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-245
   (Ffield_beginning, find_field): Undo change of 2006-04-23.

 * emacs@sv.gnu.org/emacs--devo--0--patch-246
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-247
   Rcirc patch from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-248
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-249
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-250
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-251
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-87
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-88
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-89
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-90
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-91
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-92
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-93
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-94
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-95
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553
---

b33c71f58623306001d4d4fe4f7354d8c360edaa
diff --cc lisp/international/mule.el
index bf9a9570216,2a88c198a79..4ed05dd1d36
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -1295,11 -1288,11 +1295,11 @@@ On non-windowing terminals, this is se
  Setting this variable directly does not take effect;
  use either \\[customize] or \\[set-keyboard-coding-system]."
    :type '(coding-system :tag "Coding system")
-   :link '(info-link "(emacs)Specify Coding")
-   :link '(info-link "(emacs)Single-Byte Character Support")
+   :link '(info-link "(emacs)Terminal Coding")
+   :link '(info-link "(emacs)Unibyte Mode")
    :set (lambda (symbol value)
 -	 ;; Don't load encoded-kbd-mode unnecessarily.
 -	 (if (or value (boundp 'encoded-kbd-mode))
 +	 ;; Don't load encoded-kb unnecessarily.
 +	 (if (or value (boundp 'encoded-kbd-setup-display))
  	     (set-keyboard-coding-system value)
  	   (set-default 'keyboard-coding-system nil))) ; must initialize
    :version "22.1"