Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/Xkeymap.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e34d100fb2f20522af9b82d290eb60f39c6b085d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/etc/Xkeymap.txt
@@@ -1,0 -1,0 +1,120 @@@
++#                                             -*-Mode: Fundamental-*-
++# X keymap file for rlk with some emacsified bindings
++#
++# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++#   Free Software Foundation, Inc.
++# See the end of the file for license conditions.
++#
++# This file contains the default keyboard mapping.  The first column contains a X keyboard code; the other
++# 16 columns contain the mapping of the keycode to a character string, with various combinations
++# of the SHIFT, LOCK, META, and CONTROL keys down.  See the man page for "keycomp" for more information.
++#
++# Keycode constants for non-typewriter keys are found in <X/Xkeyboard.h>.
++#
++# It is easiest to edit this file with an EMACS window running across the entire width of the display, with
++# tab stop set to 4.
++#
++# E1=Find, E2=Insert Here, E3=Remove, E4=Select, E5=Prev Screen, E6=Next Screen
++#     uns   L     S     SL    M     ML    MS    MSL   C     CL    CS     CSL   CM    CML   CMS   CMSL
++0212  0023, 0023, 0023, 0023, 0223, 0223, 0223, 0223, 0022, 0022, 0022, 0022, 0222, 0222, 0222, 0222,  /* E1 */
++0213  U,    U,    U,    U,    U,    U,    U,    U,    U,    U,    U,     U,    U,    U,    U,    U,    /* E2 */
++0214  0004, 0004, 0177, 0177, 0304, 0304, 0377, 0377, 0004, 0004, 0177,  0177, 0204, 0204, 0377, 0377  /* E3 */
++0215  U,    U,    U,    U,    U,    U,    U,    U,    U,    U,    U,     U,    U,    U,    U,    U,    /* E4 */
++0216  0326, 0326, 0326, 0326, 0326, 0326, 0326, 0326, "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226"  /* E5 */
++0217  0026, 0026, 0026, 0026, 0026, 0026, 0026, 0026, 0226, 0226, 0226, 0226, 0226, 0226, 0226, 0226, /* E6 */
++0247  0002, 0002, 0002, 0002, 0302, 0302, 0302, 0302, 0202, 0202, 0202, 0202, 0202, 0202, 0202, 0202, /* Left arrow */
++0250  0006, 0006, 0006, 0006, 0306, 0306, 0306, 0306, 0206, 0206, 0206, 0206, 0206, 0206, 0206, 0206, /* Right arrow */
++0251  0016, 0016, 0016, 0016, 0316, 0316, 0316, 0316, 0216, 0216, 0216, 0216, 0216, 0216, 0216, 0216, /* Down arrow */
++0252  0020, 0020, 0020, 0020, 0320, 0320, 0320, 0320, 0220, 0220, 0220, 0220, 0220, 0220, 0220, 0220, /* Up arrow */
++0222  0260, '0',  0260, '0',  0260, '0',  0260, '0',  0260, '0',  0260, '0',  0260, '0',  0260, '0',  /* KP 0 */
++0224  0256, '.',  0256, '.',  0256, '.',  0256, '.',  0256, '.',  0256, '.',  0256, '.',  0256, '.',  /* KP . */
++0225  '\n', '\n', '\n', '\n', 0312, 0312, 0312, 0312, 0212, 0212, 0212, 0212, 0212, 0212, 0212, 0212, /* KP Enter */
++0226  0261, '1',  0261, '1',  0261, '1',  0261, '1',  0261, '1',  0261, '1',  0261, '1',  0261, '1',  /* KP 1 */
++0227  0262, '2',  0262, '2',  0262, '2',  0262, '2',  0262, '2',  0262, '2',  0262, '2',  0262, '2',  /* KP 2 */
++0230  0263, '3',  0263, '3',  0263, '3',  0263, '3',  0263, '3',  0263, '3',  0263, '3',  0263, '3',  /* KP 3 */
++0231  0264, '4',  0264, '4',  0264, '4',  0264, '4',  0264, '4',  0264, '4',  0264, '4',  0264, '4',  /* KP 4 */
++0232  0265, '5',  0265, '5',  0265, '5',  0265, '5',  0265, '5',  0265, '5',  0265, '5',  0265, '5',  /* KP 5 */
++0233  0266, '6',  0266, '6',  0266, '6',  0266, '6',  0266, '6',  0266, '6',  0266, '6',  0266, '6',  /* KP 6 */
++0234  0254, ',',  0254, ',',  0254, ',',  0254, ',',  0254, ',',  0254, ',',  0254, ',',  0254, ',',  /* KP , */
++0235  0267, '7',  0267, '7',  0267, '7',  0267, '7',  0267, '7',  0267, '7',  0267, '7',  0267, '7',  /* KP 7 */
++0236  0270, '8',  0270, '8',  0270, '8',  0270, '8',  0270, '8',  0270, '8',  0270, '8',  0270, '8',  /* KP 8 */
++0237  0271, '9',  0271, '9',  0271, '9',  0271, '9',  0271, '9',  0271, '9',  0271, '9',  0271, '9',  /* KP 9 */
++0240  0255, '-',  0255, '-',  0255, '-',  0255, '-',  0255, '-',  0255, '-',  0255, '-',  0255, '-',  /* KP - */
++0174  0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, /* F15/Help */
++0175  0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, /* F16/(Un)Do */
++0161  0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, /* F11/ESC */
++0162  '\b', '\b', '\b', '\b', '\b', '\b', U,    U,    '\b', '\b', U,    U,    U,    U,    U,    U,    /* F12/BS */
++0163  '\n', '\n', '\n', '\n', '\n', '\n', U,    U,    '\n', '\n', U,    U,    U,    U,    U,    U,    /* F13/LF */
++0274  0177, 0177, 0177, 0177, 0377, 0377, 0377, 0377, 0030, 0030, 0177, 0177, 0377, 0377, 0377, 0377, /* back */
++0275  '\r', '\r', '\r', '\r', 0215, 0215, 0215, 0215, '\r', '\r', U,    U,    U,    U,    U,    U,    /* Return */
++0276  '\t', '\t', '\t', '\t', 0211, 0211, 0211, 0211, "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" /* Tab */
++0277  '`',  '`',  '~',  '~',  0340, 0340, 0376, 0376, 0036, 0036, 0036, 0036, U,    U,    U,    U,    /* ` */
++0300  '1',  '1',  '!',  '!',  0261, 0261, 0241, 0241, '1',  '1',  '!',  '!',  U,    U,    U,    U,    /* 1 */
++0301  'q',  'Q',  'Q',  'Q',  0361, 0361, 0321, 0321, 0021, 0021, 0021, 0021, 0221, 0221, 0221, 0221, /* q */
++0302  'a',  'A',  'A',  'A',  0341, 0341, 0301, 0301, 0001, 0001, 0001, 0001, 0201, 0201, 0201, 0201, /* a */
++0303  'z',  'Z',  'Z',  'Z',  0372, 0372, 0332, 0332, 0032, 0032, 0032, 0032, 0232, 0232, 0232, 0232, /* z */
++0305  '2',  '2',  '@',  '@',  0262, 0262, 0300, 0300, 0000, 0000, 0000, 0000, 0262, 0262, 0200, 0200, /* 2 */
++0306  'w',  'W',  'W',  'W',  0367, 0367, 0327, 0327, 0027, 0027, 0027, 0027, 0227, 0227, 0227, 0227, /* w */
++0307  's',  'S',  'S',  'S',  0363, 0363, 0323, 0323, 0023, 0023, 0023, 0023, 0223, 0223, 0223, 0223, /* s */
++0310  'x',  'X',  'X',  'X',  0370, 0370, 0330, 0330, 0030, 0030, 0030, 0030, 0230, 0230, 0230, 0230, /* x */
++0311  '<',  '<',  '>',  '>',  0274, 0274, 0276, 0276, U,    U,    U,    U,    U,    U,    U,    U,    /* < */
++0313  '3',  '3',  '#',  '#',  0263, 0263, 0243, 0243, 0033, 0033, '#',  '#',  U,    U,    U,    U,    /* 3 */
++0314  'e',  'E',  'E',  'E',  0345, 0345, 0305, 0305, 0005, 0005, 0005, 0005, 0205, 0205, 0205, 0205, /* e */
++0315  'd',  'D',  'D',  'D',  0344, 0344, 0304, 0304, 0004, 0004, 0004, 0004, 0204, 0204, 0204, 0204, /* d */
++0316  'c',  'C',  'C',  'C',  0343, 0343, 0303, 0303, 0003, 0003, 0003, 0003, 0203, 0203, 0203, 0203, /* c */
++0320  '4',  '4',  '$',  '$',  0264, 0264, 0244, 0244, 0034, 0034,  '$', '$',  U,    U,    U,    U,    /* 4 */
++0321  'r',  'R',  'R',  'R',  0362, 0362, 0322, 0322, 0022, 0022, 0022, 0022, 0222, 0222, 0222, 0222, /* r */
++0322  'f',  'F',  'F',  'F',  0346, 0346, 0306, 0306, 0006, 0006, 0006, 0006, 0206, 0206, 0206, 0206, /* f */
++0323  'v',  'V',  'V',  'V',  0366, 0366, 0326, 0326, 0026, 0026, 0026, 0026, 0226, 0226, 0226, 0226, /* v */
++0324  ' ',  ' ',  ' ',  ' ',  0240, 0240, 0240, 0240, 0000, 0000, 0000, 0000, 0200, 0200, 0200, 0200, /* space */
++0326  '5',  '5',  '%',  '%',  0265, 0265, 0245, 0245, 0035, 0035,  '%', '%',  U,    U,    U,    U,    /* 5 */
++0327  't',  'T',  'T',  'T',  0364, 0364, 0324, 0324, 0024, 0024, 0024, 0024, 0224, 0224, 0224, 0224, /* t */
++0330  'g',  'G',  'G',  'G',  0347, 0347, 0307, 0307, 0007, 0007, 0007, 0007, 0207, 0207, 0207, 0207, /* g */
++0331  'b',  'B',  'B',  'B',  0342, 0342, 0302, 0302, 0002, 0002, 0002, 0002, 0202, 0202, 0202, 0202, /* b */
++0333  '6',  '6',  '^',  '^',  0266, 0266, 0336, 0336, 0036, 0036, 0036, 0036, U,    U,    U,    U,    /* 6 */
++0334  'y',  'Y',  'Y',  'Y',  0371, 0371, 0331, 0331, 0031, 0031, 0031, 0031, 0231, 0231, 0231, 0231, /* y */
++0335  'h',  'H',  'H',  'H',  0350, 0350, 0310, 0310, 0010, 0010, 0010, 0010, 0210, 0210, 0210, 0210, /* h */
++0336  'n',  'N',  'N',  'N',  0356, 0356, 0316, 0316, 0016, 0016, 0016, 0016, 0216, 0216, 0216, 0216, /* n */
++0340  '7',  '7',  '&',  '&',  0267, 0267, 0246, 0246, 0037, 0037,  '&', '&',  U,    U,    U,    U,    /* 7 */
++0341  'u',  'U',  'U',  'U',  0365, 0365, 0325, 0325, 0025, 0025, 0025, 0025, 0225, 0225, 0225, 0225, /* u */
++0342  'j',  'J',  'J',  'J',  0352, 0352, 0312, 0312, 0012, 0012, 0012, 0012, 0212, 0212, 0212, 0212, /* j */
++0343  'm',  'M',  'M',  'M',  0355, 0355, 0315, 0315, 0015, 0015, 0015, 0015, 0215, 0215, 0215, 0215, /* m */
++0345  '8',  '8',  '*',  '*',  0270, 0270, 0252, 0252, 0177, 0177,  '*', '*',  U,    U,    U,    U,    /* 8 */
++0346  'i',  'I',  'I',  'I',  0351, 0351, 0311, 0311, 0011, 0011, 0011, 0011, 0211, 0211, 0211, 0211, /* i */
++0347  'k',  'K',  'K',  'K',  0353, 0353, 0313, 0313, 0013, 0013, 0013, 0013, 0213, 0213, 0213, 0213, /* k */
++0350  ',',  ',',  '<',  '<',  0254, 0254, 0274, 0274, U,    U,    U,    U,    U,    U,    U,    U,    /* , */
++0352  '9',  '9',  '(',  '(',  0271, 0271, 0250, 0250, '9',  '9',  '(',  '(',  U,    U,    U,    U,    /* 9 */
++0353  'o',  'O',  'O',  'O',  0357, 0357, 0317, 0317, 0017, 0017, 0017, 0017, 0217, 0217, 0217, 0217, /* o */
++0354  'l',  'L',  'L',  'L',  0354, 0354, 0314, 0314, 0014, 0014, 0014, 0014, 0214, 0214, 0214, 0214, /* l */
++0355  '.',  '.',  '>',  '>',  0256, 0256, 0276, 0276, U,    U,    U,    U,    U,    U,    U,    U,    /* . */
++0357  '0',  '0',  ')',  ')',  0260, 0260, 0251, 0251, '0',  '0',  ')',  ')',  U,    U,    U,    U,    /* 0 */
++0360  'p',  'P',  'P',  'P',  0360, 0360, 0320, 0320, 0020, 0020, 0020, 0020, 0220, 0220, 0220, 0220, /* p */
++0362  ';',  ';',  ':',  ':',  0273, 0273, 0272, 0272, U,    U,    U,    U,    U,    U,    U,    U,    /* ; */
++0363  '/',  '/',  '?',  '?',  0257, 0257, 0277, 0277, 0037, 0037, 0037, 0037, 0237, 0237, 0237, 0237, /* / */
++0365  '=',  '=',  '+',  '+',  0275, 0275, 0253, 0253, U,    U,    U,    U,    U,    U,    U,    U,    /* = */
++0366  ']',  ']',  '}',  '}',  0335, 0335, 0376, 0376, 0035, 0035, 0035, 0035, 0335, 0335, 0335, 0335, /* ] */
++0367  '\\', '\\', '|',  '|',  0334, 0334, 0374, 0374, 0034, 0034, 0034, 0034, 0334, 0334, 0334, 0334, /* \ */
++0371  '-',  '-',  '_',  '_',  0255, 0255, 0337, 0337, 0037, 0037, 0037, 0037, 0337, 0337, 0337, 0337, /* - */
++0372  '[',  '[',  '{',  '{',  0333, 0333, 0373, 0373, 0033, 0033, 0033, 0033, 0333, 0333, 0333, 0333, /* [ */
++0373  '\'', '\'', '"',  '"',  0247, 0247, 0242, 0242, U,    U,    U,    U,    U,    U,    U,    U,    /* ' */
++#\f
++# local variables:
++# tab-width: 4
++# End:
++#
++# This document 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)
++# any later version.
++# 
++# This document is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this document; see the file COPYING.  If not, write to the
++# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
++#
++# arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64

diff --cc etc/ms-7bkermit
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..091264fee143313526bca7994fcce6b83c22ca82
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/etc/ms-7bkermit
@@@ -1,0 -1,0 +1,333 @@@
++;;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++;;;   Free Software Foundation, Inc.
++
++;;; This file is designed for 7-bit connections.
++;;; Use the file ms-kermit if you have an 8-bit connection.
++
++;;; This kermit script maps the IBM-PC keyboard for use with Gnu Emacs.
++;;; The ALT key is used to generate Meta characters and, in conjunction
++;;; with the CTRL key, Control-Meta characters.  A few other useful
++;;; mappings are also performed.
++;;; Andy Lowry, May 1989
++
++;;; Exchange ESC and backquote... tilde stays put (shift-backquote)
++set key \27 `
++set key ` \27
++
++;;; BACKSPACE deletes backward one character
++set key scan \270 \127
++
++;;; The following mappings affect certain special keys... all the keys
++;;; are duplicated on the numeric keypad when NUM LOCK is off, but
++;;; the keypad versions are NOT mapped (string definition space too small
++;;; for that)
++
++;;; INSERT toggles overwrite mode
++set key scan \4434 \27xoverwrite-mode\13
++;;; HOME moves point to beginning of buffer
++set key scan \4423 \27<
++;;; PAGE-UP scrolls backward one screen
++set key scan \4425 \27v
++;;; DELETE deletes one character *forward*
++set key scan \4435 \4
++;;; END moves point to end of buffer
++set key scan \4431 \27>
++;;; PAGE-DOWN scrolls forward one screen
++set key scan \4433 \22
++;;; ARROW keys move in the appropriate directions
++set key scan \4424 \16
++set key scan \4427 \2
++set key scan \4432 \14
++set key scan \4429 \6
++
++;;; META versions of all the printing characters except uppercase
++;;; letters are generated by using the ALT key.  The definition string
++;;; consists of an ESC character followed by the META-ized character.
++;;; The characters are listed roughly left-to-right and top-to-bottom
++;;; as they appear on the keyboard
++set key scan \2345 \27`
++set key scan \2424 \27\o61    ; need to use char code, since digit
++set key scan \2425 \27\o62    ; would not terminate '\27'
++set key scan \2426 \27\o63
++set key scan \2427 \27\o64
++set key scan \2428 \27\o65
++set key scan \2429 \27\o66
++set key scan \2430 \27\o67
++set key scan \2431 \27\o70
++set key scan \2432 \27\o71
++set key scan \2433 \27\o60
++set key scan \2434 \27\45
++set key scan \2435 \27=
++set key scan \2857 \27~
++set key scan \2936 \27!
++set key scan \2937 \27@
++set key scan \2938 \27#
++set key scan \2939 \27$
++set key scan \2940 \27%
++set key scan \2941 \27^
++set key scan \2942 \27&
++set key scan \2943 \27*
++set key scan \2944 \27(
++set key scan \2945 \27)
++set key scan \2946 \27_
++set key scan \2947 \27+
++set key scan \2469 \27\9
++set key scan \2320 \27q
++set key scan \2321 \27w
++set key scan \2322 \27e
++set key scan \2323 \27r
++set key scan \2324 \27t
++set key scan \2325 \27y
++set key scan \2326 \27u
++set key scan \2327 \27i
++set key scan \2328 \27o
++set key scan \2329 \27p
++set key scan \2330 \27[
++set key scan \2842 \27{
++set key scan \2331 \27]
++set key scan \2843 \27}
++set key scan \2347 \27\
++set key scan \2859 \27|
++set key scan \2334 \27a
++set key scan \2335 \27s
++set key scan \2336 \27d
++set key scan \2337 \27f
++set key scan \2338 \27g
++set key scan \2339 \27h
++set key scan \2340 \27j
++set key scan \2341 \27k
++set key scan \2342 \27l
++set key scan \2343 \27\59
++set key scan \2855 \27:
++set key scan \2344 \27'
++set key scan \2856 \27"
++set key scan \2348 \27z
++set key scan \2349 \27x
++set key scan \2350 \27c
++set key scan \2351 \27v
++set key scan \2352 \27b
++set key scan \2353 \27n
++set key scan \2354 \27m
++set key scan \2355 \27,
++set key scan \2867 \27<
++set key scan \2356 \27.
++set key scan \2868 \27>
++set key scan \2357 \27/
++set key scan \2869 \27?
++
++;;; CONTROL-META characters are generated by using both the CTRL and
++;;; ALT keys simultaneously.  All the lowercase letters are included.
++;;; The definition string consists of an ESC character followed by
++;;; the control character corresponding to the letter.
++set key scan \3344 \27\17
++set key scan \3345 \27\23
++set key scan \3346 \27\5
++set key scan \3347 \27\18
++set key scan \3348 \27\20
++set key scan \3349 \27\25
++set key scan \3350 \27\21
++set key scan \3351 \27\9
++set key scan \3352 \27\15
++set key scan \3353 \27\16
++set key scan \3358 \27\1
++set key scan \3359 \27\19
++set key scan \3360 \27\4
++set key scan \3361 \27\6
++set key scan \3362 \27\7
++set key scan \3363 \27\8
++set key scan \3364 \27\10
++set key scan \3365 \27\11
++set key scan \3366 \27\12
++set key scan \3372 \27\26
++set key scan \3373 \27\24
++set key scan \3374 \27\3
++set key scan \3375 \27\22
++set key scan \3376 \27\2
++set key scan \3377 \27\14
++set key scan \3378 \27\13
++
++end of msiem2.ini
++------------------
++
++msiema.hlp
++-----------
++Date:     Wed, 14 Sep 88 05:20:08 GMT
++From:     spolsky@YALE.ARPA
++Subject:  Using MS kermit 2.31 with emacs
++Keywords: MS-DOS Kermit 2.31, EMACS, Meta Key
++
++If you are using kermit (version 2.31 only) with emacs on a mainframe, the
++following file may help you. It assigns all the Alt-keys so that the Alt key
++may be used as a "Meta" shift, e.g. Alt-x produces M-x, etc.  Note that it
++will distinguish correctly between upper and lower case and accepts all
++printables. (If anybody has the patience to do the Meta-Ctrl combinations,
++please post them!)  This actually sends "escapes" so you don't need 8 bits.
++This file also sets up the cursor keys to behave as expected.
++
++On extended keyboards (the ones with a separate cursor pad, like PS/2s) you
++also get assignments for Page Up/Down, Home, End, Insert, Delete, etc.
++
++Please let me know if you find any problems with this.
++
++Joel Spolsky             bitnet: spolsky@yalecs     uucp: ...!yale!spolsky
++Yale University          arpa:   spolsky@yale.edu   voicenet: 203-436-1483
++
++[Ed. - Thanks, Joel!  Your key definitions file has been put in the kermit
++distribution area as msiema.ini ("ms" for MS-Kermit, "i" because it's an
++initialization file, "ema" for EMACS), along with this message as msiema.hlp.]
++
++end of msiema.hlp
++-----------------
++
++
++msiema.ini
++------------
++; Emacs keyboard layout for Kermit 2.31
++; by Joel Spolsky, Yale Univ.  Save this in a file, then
++; initialize it by issuing the kermit command
++; take filename
++; It will set up the keyboard to allow ALT to be used
++; as a meta-key, and will allow cursor keys to be used
++; with emacs.
++
++; First, define all the ALT keys to send ESC+key
++; to simulate "meta"
++
++set key \2320 \27q  ;; letters: unshifted
++set key \2321 \27w
++set key \2322 \27e
++set key \2323 \27r
++set key \2324 \27t
++set key \2325 \27y
++set key \2326 \27u
++set key \2327 \27i
++set key \2328 \27o
++set key \2329 \27p
++set key \2334 \27a
++set key \2335 \27s
++set key \2336 \27d
++set key \2337 \27f
++set key \2338 \27g
++set key \2339 \27h
++set key \2340 \27j
++set key \2341 \27k
++set key \2342 \27l
++set key \2348 \27z
++set key \2349 \27x
++set key \2350 \27c
++set key \2351 \27v
++set key \2352 \27b
++set key \2353 \27n
++set key \2354 \27m
++set key \2832 \27Q ;; letters: shifted
++set key \2833 \27W
++set key \2834 \27E
++set key \2835 \27R
++set key \2836 \27T
++set key \2837 \27Y
++set key \2838 \27U
++set key \2839 \27I
++set key \2840 \27O
++set key \2841 \27P
++set key \2846 \27A
++set key \2847 \27S
++set key \2848 \27D
++set key \2849 \27F
++set key \2850 \27G
++set key \2851 \27H
++set key \2852 \27J
++set key \2853 \27K
++set key \2854 \27L
++set key \2860 \27Z
++set key \2861 \27X
++set key \2862 \27C
++set key \2863 \27V
++set key \2864 \27B
++set key \2865 \27N
++set key \2866 \27M
++set key \2857 \27\126    ; ALT + ~   ;; special symbols begin here
++set key \2345 \27\96     ; ALT + `
++set key \2936 \27\33     ; ALT + !
++set key \2937 \27\64     ; ALT + @
++set key \2938 \27\35     ; ALT + #
++set key \2939 \27\36     ; ALT + $
++set key \2940 \27\37     ; ALT + %
++set key \2941 \27\94     ; ALT + ^
++set key \2942 \27\38     ; ALT + &
++set key \2943 \27\42     ; ALT + *
++set key \2944 \27\40     ; ALT + (
++set key \2945 \27\41     ; ALT + )
++set key \2946 \27\95     ; ALT + _
++set key \2947 \27\43     ; ALT + +
++set key \2842 \27\123    ; ALT + {
++set key \2843 \27\125    ; ALT + }
++set key \2330 \27\91     ; ALT + [
++set key \2331 \27\93     ; ALT + ]
++set key \2859 \27\124    ; ALT + :
++set key \2347 \27\92     ; ALT + \
++set key \2867 \27<       ; ALT + <
++set key \2868 \27>       ; ALT + >
++set key \2343 \27\59     ; ALT + ;
++set key \2855 \27\58     ; ALT + :
++set key \2344 \27\39     ; ALT + '
++set key \2856 \27\34     ; ALT + "
++set key \2355 \27\44     ; ALT + ,
++set key \2356 \27\46     ; ALT + .
++set key \2357 \27\47     ; ALT + /
++set key \2869 \27\63     ; ALT + ?
++set key \2424 \27\49  ;; numbers
++set key \2425 \27\50
++set key \2426 \27\51
++set key \2427 \27\52
++set key \2428 \27\53
++set key \2429 \27\54
++set key \2430 \27\55
++set key \2431 \27\56
++set key \2432 \27\57
++set key \2433 \27\48
++
++;; These 6 special keys for extended (PS/2) keyboards:
++set key \4434 \25      ;; Insert is like ^Y - yank from kill ring
++set key \4435 \23      ;; Delete is like ^W - kill to ring
++set key \4423 \1       ;; Home is ^A
++set key \4431 \5       ;; End is ^E
++set key \4425 \27V     ;; Page up is Esc-V
++set key \4433 \22      ;; Page dn is ^v
++
++set key \328 \16       ;; up cursor is ^P
++set key \331 \2        ;; left cursor is ^B
++set key \333 \6        ;; right cursor is ^F
++set key \336 \14       ;; down cursor is ^N
++set key \4427 \2       ;; left cursor on extended kbd
++set key \4432 \14      ;; down cursor on extended kbd
++set key \4424 \16      ;; up cursor on extended kbd
++set key \4429 \6       ;; right cursor on extended kbd
++
++set key \5491 \27b     ;; ctrl-left cursor is M-b
++set key \5492 \27f     ;; ctrl-right cursor is M-f
++
++;; move kermit's screen scroll (playback) features to Alt- Home,End,PgUp,PgDn
++;; (this is an issue for extended keyboards only)
++
++set key \2455 \khomscn
++set key \2463 \kendscn
++set key \2457 \kupscn
++set key \2465 \kdnscn
++
++;;; COPYING PERMISSIONS:
++;;; 
++;;;   This document 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 of the License, or
++;;;   (at your option) any later version.
++;;;
++;;;   This program is distributed in the hope that it will be useful,
++;;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
++;;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;;;   GNU General Public License for more details.
++;;;
++;;;   You should have received a copy of the GNU General Public License
++;;;   along with this program; if not, write to the Free Software
++;;;   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++;;; arch-tag: b066a884-e956-4f46-9d9c-13502f6cf7a6

diff --cc etc/ulimit.hack
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..674a9613b60c71faabed087926c90b0b06e1689d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/etc/ulimit.hack
@@@ -1,0 -1,0 +1,59 @@@
++#!/bin/sh
++#
++# ulimit.hack: Create an intermediate program for use in
++# between kernel initialization and init startup.
++# This is needed on a 3b system if the standard CDLIMIT is
++# so small that the dumped Emacs file cannot be written.
++# This program causes everyone to get a bigger CDLIMIT value
++# so that the dumped Emacs can be written out.
++#
++# Users of V.3.1 and later should not use this; see etc/MACHINES
++# and reconfig your kernel's CDLIMIT parameter instead.
++#
++# Caveat: Heaven help you if you screw this up.  This puts
++# a new program in as /etc/init, which then execs the real init.
++#
++cat > ulimit.init.c << \EOF
++main(argc, argv)
++int argc;
++char *argv[];
++{
++      ulimit(2, 262144L);     /* "2" is the "set" command. */
++      /* 262,144 allows for 128Mb files to be written. */
++      /* If that value isn't suitable, roll your own.  */
++      execv("/etc/real.init", argv);
++}
++EOF
++#
++# Compile it and put it in place of the usual init program.
++#
++cc ulimit.init.c -o ulimit.init
++mv /etc/init /etc/real.init
++mv ulimit.init /etc/ulimit.init
++ln /etc/ulimit.init /etc/init
++mv ulimit.init.c /etc/ulimit.init.c   # to keep src for this hack nearby.
++chmod 0754 /etc/init
++exit 0
++#
++# Upon system reboot, all processes will inherit the new large ulimit.
++
++# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++#   Free Software Foundation, Inc.
++
++# COPYING PERMISSIONS:
++#
++#   This document 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 of the License, or
++#   (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful,
++#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#   GNU General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program; if not, write to the Free Software
++#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++# arch-tag: 6f9a7072-9d07-4431-b0bb-e867648ad0b4

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/term/x-win.el
Simple merge

diff --cc man/ChangeLog
index ad357f99680fd5c2f8376404578d680453e35334,a580fd001aea05692c51ef574d39d038a3cb5fd0..7666c91261cc26b62bbd0b695a8fe6a03526a23f
--- 1/man/ChangeLog
--- 2/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,3 -1,12 +1,18 @@@
++2007-03-11  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
++
++      * gnus.texi (Mail and Post): Update documentation for gnus-user-agent.
++      The variable now uses a list of symbols instead of just a symbol.
++      Reported by Christoph Conrad <christoph.conrad@gmx.de>.
++
+ 2007-03-06  Romain Francoise  <romain@orebokech.com>
+ 
+       * faq.texi (New in Emacs 22): Don't say "now" too much.  Add MH-E to
+       new packages, and mention Gnus update.
+ 
+ 2007-03-04  Richard Stallman  <rms@gnu.org>
+ 
+       * custom.texi (Safe File Variables): Minor correction.
+ 
  2007-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * gnus.texi (NNTP): Mention nntp-never-echoes-commands and

diff --cc man/gnus.texi
index e2adfae22539db044ae7fa141a1dc6a78b138b23,e2adfae22539db044ae7fa141a1dc6a78b138b23..2ca1d225786160cedd34550e3ee490b347bb8b93
--- 1/man/gnus.texi
--- 2/man/gnus.texi
+++ b/man/gnus.texi
@@@ -11799,12 -11799,12 +11799,12 @@@ still a pain, though
  @cindex User-Agent
  
  This variable controls which information should be exposed in the
--User-Agent header.  It can be one of the symbols @code{gnus} (show only
--Gnus version), @code{emacs-gnus} (show only Emacs and Gnus versions),
--@code{emacs-gnus-config} (same as @code{emacs-gnus} plus system
--configuration), @code{emacs-gnus-type} (same as @code{emacs-gnus} plus
--system type) or a custom string.  If you set it to a string, be sure to
--use a valid format, see RFC 2616.
++User-Agent header.  It can be a list of symbols or a string.  Valid
++symbols are @code{gnus} (show Gnus version) and @code{emacs} (show Emacs
++version).  In addition to the Emacs version, you can add @code{codename}
++(show (S)XEmacs codename) or either @code{config} (show system
++configuration) or @code{type} (show system type).  If you set it to a
++string, be sure to use a valid format, see RFC 2616.
  
  @end table
  

diff --cc src/ChangeLog
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge