Mercurial > emacs
changeset 90785:8c2ef9d5d4a8
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 12 Mar 2007 00:42:43 +0000 |
| parents | 5d47178d1a18 (current diff) 6582d03c2a6e (diff) |
| children | ca12f314faac |
| files | etc/ChangeLog etc/Makefile etc/Xkeymap.txt etc/emacs.csh etc/ms-7bkermit etc/ulimit.hack lisp/ChangeLog lisp/diff-mode.el lisp/emacs-lisp/bytecomp.el lisp/mail/emacsbug.el lisp/progmodes/grep.el lisp/replace.el lisp/type-break.el src/ChangeLog src/macfns.c src/process.c |
| diffstat | 17 files changed, 514 insertions(+), 636 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/notes/copyright Fri Mar 09 03:30:57 2007 +0000 +++ b/admin/notes/copyright Mon Mar 12 00:42:43 2007 +0000 @@ -15,19 +15,26 @@ Summary for the impatient: -1. Don't add a file to Emacs written by someone other than yourself -without thinking about the legal aspect (make sure they have an -assignment, adjust the copyright statements in the file). NB the -ChangeLog entry should be in the name of the author of the code, not -the person who installs it. +1. Don't add code to Emacs written by someone other than yourself +without thinking about the legal aspect. Even if the changes are +trivial, consider if they combine with previous changes by the same +author to make a non-trivial total. If so, make sure they have an +assignment. If adding a whole file adjust the copyright statements in +the file. -2. With images, add the legal info to a README file in the directory +2. When installing code written by someone else, the ChangeLog entry +should be in the name of the author of the code, not the person who +installs it. I think it is helpful to put the author (if not yourself) +in the CVS log as well; and to not install any of your own changes in +the same commit. + +3. With images, add the legal info to a README file in the directory containing the image. -3. If you add a lot of text to a previously trivial file that had no +4. If you add a lot of text to a previously trivial file that had no legal notices, consider if you should add a copyright statement. -4. Please don't just add an FSF copyright without checking that is the +5. Please don't just add an FSF copyright without checking that is the right thing to do. @@ -133,11 +140,15 @@ src/m/news-r6.h public domain, leave alone. +etc/BABYL, ms-kermit + no notices (see below). + etc/edt-user.doc - update BOTH notices in this file etc/emacs.csh - - keep simple license for this simple file + - written by Michael DeCorte, who has no assignment. But trivial + enough to not need license. etc/future-bug - doesn't need a humourless disclaimer, because Karl Fogel says we @@ -159,6 +170,12 @@ licenses that they have. They are distributed with Emacs but they are not part of Emacs." +etc/HELLO + standard notices. Just a note that although the file itself is not + really copyrightable, in the wider context of it being part of + Emacs (and written by those with assignments), a standard notice is + fine. + etc/MAILINGLISTS rms: simple license is fine for this file @@ -361,6 +378,20 @@ ** Some notes on resolved issues, for historical information only +etc/TERMS +rms: "surely written either by me or by ESR. (If you can figure out +which year, I can probably tell you which.) Either way, we have papers +for it." Present in Emacs-16.56 (15-jul-85). + +etc/ulimit.hack + Very obsolete file removed March 2007. Doesn't say who the author +is, but web-search suggests Karl Kleinpaste, who has no Emacs +assignment. Trivial anyway. +http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\ +9f1df/7e5922c67b3a98fb +http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4 + (original 1987 source) + lisp/term/README - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was written by Eric Raymond. When asked by rms on 14 Feb 2007 he said: @@ -381,11 +412,16 @@ admin/check-doc-strings File says it's in the public domain, but that might not make it so. +etc/BABYL + File written long ago by authors with no assignment. Keep them + without notices for now, try and contact authors if possible. Be + ready to remove these files if the authors ever object. +etc/ms-kermit etc/e/eterm-color.ti src/acldef.h, chpdef.h, ndir.h On legal advice from Matt Norwood, the following comment was added - to these files in Feb 2007: + to these files in Feb/Mar 2007: The code here is forced by the interface, and is not subject to copyright, constituting the only possible expression of the @@ -396,6 +432,19 @@ and possibly add a list of all authors who have changed these files. (details in email from Matt Norwood to rms, 2007/02/03). +etc/ms-7bkermit + Says it was written by Andy Lowry and Joel Spolsky. No entry for +either in copyright.list. NB this file is not "constrained" like +ms-kermit (rms: "We know it isn't. A comment at the front says it has +other bindings which might be handy."). File removed March 2007. +Re-add if clear up status at some point. + +etc/Xkeymap.txt + No info on author. File removed March 2007. rms: "It says it is +RLK's way of remapping his keyboard, so it is not constrained. I think +it was written by RLK. Let's delete it; if we contact RLK again, we +can put it back." + src/m/mips4.h, news-risc.h, pmax.h src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h, @@ -493,11 +542,6 @@ noted in this file. -etc/BABYL - File says it was written in 1983 by Eugene Ciccarelli, who has no - assignment. RMS: "The lawyer said we can keep BABYL." - - REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico - Restore if find legal info. emacs21.ico is not due to Davenport. Voelker could not immediately recall anything, but will check and @@ -528,8 +572,7 @@ *** These are copyright issues still to be addressed: - -etc/ms-kermit - no copyright, but ms-7bkermit has one +Do we need an assignment from Kevin Rodgers? (rms)
--- a/etc/ChangeLog Fri Mar 09 03:30:57 2007 +0000 +++ b/etc/ChangeLog Mon Mar 12 00:42:43 2007 +0000 @@ -1,3 +1,14 @@ +2007-03-11 Glenn Morris <rgm@gnu.org> + + * ms-7bkermit, ulimit.hack, Xkeymap.txt: Remove files. + + * Makefile (SOURCES): ulimit.hack is removed. + +2007-03-04 David Kastrup <dak@gnu.org> + + * NEWS (fontification): Mention that the new default for + jit-lock-stealth-time is now nil. + 2007-03-01 Kim F. Storm <storm@cua.dk> * ORDERS: Reformat text. @@ -574,7 +585,7 @@ * NEWS.21, NEWS.20: ... new files for Emacs 21 and Emacs 20 news. * ONEWS, ONEWS.1, ONEWS.2, ONEWS.3, ONEWS.4: Remove (rename) files ... * NEWS.19, NEWS.18, NEWS.1-17: ... and organize news about older Emacs - versions in separte files. Update copyright notices. + versions in separate files. Update copyright notices. 2006-06-03 Eli Zaretskii <eliz@gnu.org>
--- a/etc/Makefile Fri Mar 09 03:30:57 2007 +0000 +++ b/etc/Makefile Mon Mar 12 00:42:43 2007 +0000 @@ -37,7 +37,7 @@ -rm -f DOC* core *.dvi *.log SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \ - spook-lines tasks.texi termcap.* ulimit.hack *.tex + spook-lines tasks.texi termcap.* *.tex unlock: chmod u+w $(SOURCES)
--- a/etc/Xkeymap.txt Fri Mar 09 03:30:57 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -# -*-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, /* ' */ -# -# 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
--- a/etc/emacs.csh Fri Mar 09 03:30:57 2007 +0000 +++ b/etc/emacs.csh Mon Mar 12 00:42:43 2007 +0000 @@ -1,22 +1,7 @@ ### emacs.csh -## Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -## Free Software Foundation, Inc. - ## Author: Michael DeCorte -## COPYING PERMISSIONS: - -## Permission is hereby granted, free of charge, to any person -## obtaining a copy of this file, to deal in the file without -## restriction, including without limitation the rights to use, copy, -## modify, merge, publish, distribute, sublicense, and/or sell copies -## of the file, and to permit persons to whom the file is furnished to -## do so, subject to the following condition: -## -## The above copyright notice and this permission notice shall be -## included in all copies or substantial portions of the file. - ### Commentary: ## This defines a csh command named `edit' which resumes an
--- a/etc/ms-7bkermit Fri Mar 09 03:30:57 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,333 +0,0 @@ -;;; 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
--- a/etc/ulimit.hack Fri Mar 09 03:30:57 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -#!/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
--- a/lisp/ChangeLog Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/ChangeLog Mon Mar 12 00:42:43 2007 +0000 @@ -1,3 +1,272 @@ +2007-03-11 Richard Stallman <rms@gnu.org> + + * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): + Correctly compute line number. + +2007-03-11 Guanpeng Xu <herberteuler@hotmail.com> + + * type-break.el (type-break-get-previous-count): + Repeat previous change here. + +2007-03-11 Dan Nicolaescu <dann@ics.uci.edu> + + * progmodes/grep.el (grep-find-ignored-directories): Add .git and + .bzr to list. + +2007-03-11 Andreas Schwab <schwab@suse.de> + + * diff-mode.el (diff-apply-hunk): Use proper format string for + error. + +2007-03-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * mail/emacsbug.el (report-emacs-bug): Don't hard code the "X" name. + +2007-03-10 Chong Yidong <cyd@stupidchicken.com> + + * faces.el (face-set-after-frame-default): Recalculate face + customizations after applying X resources. + +2007-03-10 Ryan Yeske <rcyeske@gmail.com> + + * net/rcirc.el (rcirc-timeout-seconds): New variable. + (rcirc-keepalive-seconds): Remove variable. + (rcirc-server-name, rcirc-timeout-timer, rcirc-connecting) + (rcirc-process, rcirc-user-disconnect): New variables. + (rcirc-connect): Initalize new variables. + (rcirc-keepalive): Don't send keepalive pings before connection + is completed. + (rcirc-sentinel): Do mark all channels with activity when + connection is dropped. Run hook with process buffer local. + (rcirc-reschedule-timeout, rcirc-delete-process): New functions. + (rcirc-buffer-process): Return value of rcirc-process if + rcirc-server-buffer is nil. + (rcirc-server-name): Return the reported server name. + (rcirc-update-prompt): Simplify computation of the server name. + (rcirc-format-response-string): Likewise. + (rcirc-handler-001): Mark server as connected, record the reported + server name, and schedule a timeout. + (rcirc-track-nick): Add a spec for the tty class. + (rcirc-user-non-nick): Remove function. + (rcirc-nick-prefix-chars): Add variable. + (rcirc-user-nick): Use above variable. + +2007-03-10 Johan Bockg,be(Brd <bojohan@dd.chalmers.se> + + * icomplete.el (icomplete-tidy, icomplete-exhibit): + Bind deactivate-mark to nil. + +2007-03-10 Martin Rudalics <rudalics@gmx.at> + + * complete.el (PC-do-completion): Bind dirlength to nil to avoid + that buffer contents get erased during completion. + +2007-03-10 Glenn Morris <rgm@gnu.org> + + * woman.el (woman-change-fonts): Add a hack to deal with + font-escape followed by "." at start of a line. + (woman2-IP): Add a hack to deal with consecutive requests. + (woman2-tagged-paragraph): Extend existing hack to handle "sp". + +2007-03-10 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-mode.el (c-before-change): Wrap in save-match-data. + +2007-03-09 Richard Stallman <rms@gnu.org> + + * abbrev.el (abbrev): Add `provide'. + +2007-03-09 Thien-Thi Nguyen <ttn@gnu.org> + + * net/ange-ftp.el (ange-ftp-try-passive-mode): Doc fix. + +2007-03-09 Martin Rudalics <rudalics@gmx.at> + + * complete.el (PC-try-completion): New function. + (PC-do-completion, read-file-name-internal): Use it instead of + try-completion. + +2007-03-08 Alan Mackenzie <acm@muc.de> + + Remove stale tokens from `c-found-types' cache. + + * progmodes/cc-mode.el (c-unfind-enclosing-token) + (c-unfind-coalesced-tokens, c-before-change): New functions. + (c-maybe-stale-found-type): New variable. + + * progmodes/cc-engine.el (c-partial-ws-p, c-unfind-type) + (c-trim-found-types): New functions. + +2007-03-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-remove-props): Don't mark the buffer modified. + (debug-ignored-errors): Add entry from smerge-match-conflict. + +2007-03-08 J.D. Smith <jdsmith@as.arizona.edu> + + * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit + special help topics for keywords. + (idlwave-help-assistant-command): Include ".exe" for ms-dos + etc. Assistant command. + +2007-03-08 Chong Yidong <cyd@stupidchicken.com> + + * replace.el (occur-engine): Move buffer-undo-list binding... + (occur-1): ...to here. + + * complete.el (PC-bindings): Rebind M-TAB in read-expression-map. + + * simple.el (minibuffer-completing-symbol): New var. + (eval-expression): Use it. + (completion-setup-function): Don't bind completion-base-size when + completing a symbol in the minibuffer. + +2007-03-08 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gdb): Pop up current GUD buffer if user + tries to start a second session in graphical mode. + +2007-03-07 Miles Bader <miles@gnu.org> + + * international/isearch-x.el + (isearch-process-search-multibyte-characters): + Strip text-properties from PROMPT to avoid an error from read-string. + +2007-03-07 Kim F. Storm <storm@cua.dk> + + * complete.el (PC-bindings): Remap lisp-complete-symbol to + PC-lisp-complete-symbol instead of binding M-TAB in global-map. + +2007-03-07 Micha,Ak(Bl Cadilhac <michael@cadilhac.name> + + * complete.el (PC-do-completion): Delete duplicates in the list of + possible completions. + +2007-03-07 Glenn Morris <rgm@gnu.org> + + * ses.el (ses-mode): Doc fix. + +2007-03-06 Kim F. Storm <storm@cua.dk> + + * isearch.el (isearch-message-prefix): Undo 2007-03-01 change. + +2007-03-06 Kenichi Handa <handa@m17n.org> + + * term/x-win.el (x-select-utf8-or-ctext): Improve the strategy. + +2007-03-06 Stefan Monnier <monnier@iro.umontreal.ca> + + * simple.el (completion-setup-function): Improve last fix so it doesn't + set it to a relative directory name either. + +2007-03-05 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * ps-print.el: Replace some (defvar VAR) by (defvar VAR nil). + +2007-03-05 Richard Stallman <rms@gnu.org> + + * emacs-lisp/re-builder.el (reb-re-syntax): Fix custom type. + + * files.el (find-file-noselect): No error if file no longer exists. + Display a message and avoid other questions. + +2007-03-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * pcomplete.el (pcomplete-show-completions): Improve last change, so + as not to use an invisible window and to create a window if none exist. + + * progmodes/python.el (python-send-command): Restart proc if necessary. + (python-proc): Simplify. + +2007-03-05 David Hansen <david.hansen@gmx.net> (tiny change) + + * pcomplete.el (pcomplete-show-completions): Search all frames for + completions buffer. + +2007-03-05 Chong Yidong <cyd@stupidchicken.com> + + * cus-edit.el (customize-save-variable): Clear customized-value + property (saved values are now put in theme-value property). + (customize-set-variable): Doc fix. + + * complete.el (PC-do-completion): If completion-ignore-case is + non-nil, replace field with completion string before exiting. + +2007-03-05 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-make-temp-file): New parameter FILENAME. + Append its extension to the resulting temporary file name. + (tramp-handle-file-local-copy, tramp-handle-write-region): Apply it. + + * net/tramp-smb.el (tramp-smb-handle-file-local-copy) + (tramp-smb-handle-write-region): Apply it. + +2007-03-05 Alin C. Soare <alinsoar@voila.fr> (tiny change) + + * emacs-lisp/lisp-mode.el (calculate-lisp-indent): + Redo previous change. + +2007-03-04 Kevin Rodgers <kevin.d.rodgers@gmail.com> + + * diff-mode.el (diff-mode): Doc fix. + +2007-03-05 Kenichi Handa <handa@m17n.org> + + * international/characters.el: Set category `l' (latin) + for more characters. + +2007-03-04 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/authors.el (authors-aliases): Add alias. + +2007-03-04 Glenn Morris <rgm@gnu.org> + + * progmodes/hideshow.el (hs-minor-mode): Turn mode off and show + all when switching major mode. + (hs-minor-mode, hs-c-start-regexp, hs-block-start-regexp) + (hs-block-start-mdata-select, hs-block-end-regexp) + (hs-forward-sexp-func, hs-adjust-block-beginning): + Do not make these variables permanent-local. + +2007-03-04 Richard Stallman <rms@gnu.org> + + * progmodes/cperl-mode.el (cperl-mode): + Modify cperl-compilation-error-regexp-alist by appending. + + * emacs-lisp/edebug.el (edebug-kill-buffer): New function. + (edebug-mode): Add the hook. + (edebug-recursive-edit): Remove the hook on exiting. + + * type-break.el (type-break-get-previous-time): + Handle end-of-file errors specially + so they don't get reported wrong in .emacs. + + * startup.el (fancy-splash-text): Clarify text. + + * simple.el (beginning-of-buffer, end-of-buffer): + Avoid treating plain C-u like numeric arg. + + * simple.el (completion-setup-function): Don't set + default-directory to nil. + + * shell.el (shell-dirstack-query): Doc fix. + + * mouse.el (mouse-drag-mode-line-1, mouse-drag-vertical-line): + Don't select the window -- pass it to primitives instead. + + * faces.el (minibuffer-prompt): Use medium blue by default. + +2007-03-04 David Kastrup <dak@gnu.org> + + * jit-lock.el (jit-lock-stealth-time): Change default to nil. + Preserve 16 as default value for "seconds" when customizing. + +2007-03-04 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-self-insert-command) + (orgtbl-self-insert-command, org-delete-char) + (org-delete-backward-char): Set the `flyspell-delayed' property. + 2007-03-03 Chong Yidong <cyd@stupidchicken.com> * international/mule.el (find-auto-coding): Don't search for @@ -116,7 +385,8 @@ 2007-02-26 Andrey Zhdanov <susuman@hotmail.com> (tiny change) - (gud-pdb-marker-regexp): Add optional <module> keyword for Python 2.5. + * progmodes/gud.el (gud-pdb-marker-regexp): Add optional <module> + keyword for Python 2.5. 2007-02-26 Romain Francoise <romain@orebokech.com> @@ -154,32 +424,32 @@ (org-table-toggle-coordinate-overlays): New functions. (org-table-overlay-coordinates, org-table-coordinate-overlays): New variables. - (org-startup-with-deadline-check): Option removed. + (org-startup-with-deadline-check): Remove option. (org-mode): Remove deadline check on startup. - (org-table-limit-column-width): Option removed. - (org-table-formula-numbers-only): Option removed. - (org-link-style, org-link-format): Options removed. - (org-select-agenda-window, org-fit-agenda-window): Options removed. + (org-table-limit-column-width): Remove option. + (org-table-formula-numbers-only): Remove option. + (org-link-style, org-link-format): Remove options. + (org-select-agenda-window, org-fit-agenda-window): Remove options. (org-export-ascii-show-new-buffer) - (org-export-html-show-new-buffer): Options removed. - (org-activate-links): Camel option removed. - (org-file-link-context-use-camel-case): Option removed. - (org-camel-regexp): Veriable removed. - (org-activate-camels): Function removed. - (org-store-link): Removed Camel stuff. - (org-make-org-heading-camel): Function removed. - (org-open-at-point): Removed camel stuff. - (org-link-search): Removed camel stuff. + (org-export-html-show-new-buffer): Remove options. + (org-activate-links): Remove camel option. + (org-file-link-context-use-camel-case): Remove option. + (org-camel-regexp): Remove variable. + (org-activate-camels): Remove function. + (org-store-link): Remove Camel stuff. + (org-make-org-heading-camel): Remove function. + (org-open-at-point): Remove camel stuff. + (org-link-search): Remove camel stuff. (org-camel-to-words): Function removed. (org-get-agenda-file-buffer): Make sure we prepare the base buffers, not any indirect buffers. (org-sort-entries): Sort top-level when not on a headline, and no active region. (org-in-regexp): New function. - (org-search-not-self): Renamed from `org-search-not-link'. + (org-search-not-self): Rename from `org-search-not-link'. (org-open-link-marker): New variable. (org-open-at-point): Set `org-open-link-marker'. - (org-print-icalendar-entries): Fixed bug with excluding DONE + (org-print-icalendar-entries): Fixe bug with excluding DONE entries from the exported list. (org-edit-formula-lisp-indent): New command. (orgtbl-to-texinfo, orgtbl-to-html): New functions. @@ -195,7 +465,7 @@ (org-upgrade-old-links) (org-table-modify-formulas, org-table-replace-in-formulas) (org-table-find-dataline) - (org-table-get-vertical-vector): Functions removed. + (org-table-get-vertical-vector): Remove functions. (org-table-remove-rectangle-highlight) (org-time-stamp-format, org-toggle-log-option) (org-table-highlight-rectangle) @@ -228,17 +498,17 @@ (org-table-edit-scroll, org-table-edit-scroll-down) (org-set-frame-title, org-show-reference) (org-unhighlight-once, org-verify-change-for-undo): New functions. - (org-show-variable): Command removed. + (org-show-variable): Remove command. (org-add-log-maybe): New arguments STATE, FINDPOS - (org-table-sort-lines): Rewritten from scratch. + (org-table-sort-lines): Rewrite from scratch. (org-link-search): New argument AVOID-POS. - (org-print-icalendar-entries): Argument CATEGORY removed. - (org-run-agenda-series): Argument WONDOW removed. + (org-print-icalendar-entries): Remove argument CATEGORY. + (org-run-agenda-series): Remove argument WONDOW. (org-next-link, org-previous-link): New commands. (org-agenda-date-format): New option. (org-table-iterate): New command. (org-table-modify-formulas) - (org-table-replace-in-formulas): Functions removed. + (org-table-replace-in-formulas): Remove functions. (org-table-fix-formulas): New function. (org-table-insert-column, org-table-delete-column) (org-table-move-column): Use `org-table-fix-formulas'. @@ -259,8 +529,8 @@ (org-read-date): Accept "+N" as input for a date relative to the current date. (org-remove-subtree-entries-from-agenda): New function. - (org-agenda-archive, org-agenda-kill): Use - `org-remove-subtree-entries-from-agenda'. + (org-agenda-archive, org-agenda-kill): + Use `org-remove-subtree-entries-from-agenda'. (org-do-sort, org-sort-entries): New functions. (org-sort): New command. (org-table-sort-lines): Use `org-do-sort'. @@ -268,7 +538,7 @@ (org-table-number-regexp): Require 0x... to identify as number in tables. (org-startup-options): New keywords for note taking. - (org-upgrade-old-links): Function removed. + (org-upgrade-old-links): Remove function. (org-get-repeat): New function. (org-show-context): Also show siblings on current level. (org-show-siblings): New function. @@ -397,7 +667,7 @@ * pgg-gpg.el (pgg-gpg-process-region): Make USE-AGENT nil if PASSPHRASE is given. -2007-02-17 Chris Moore <dooglus@gmail.com> +2007-02-17 Chris Moore <dooglus@gmail.com> * jka-cmpr-hook.el (jka-compr-compression-info-list): Recognize backups of bz2 compressed files. @@ -1412,8 +1682,7 @@ 2007-01-03 Alan Mackenzie <acm@muc.de> - * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy - patch. + * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy patch. 2007-01-03 Chris Moore <christopher.ian.moore@gmail.com> @@ -15669,7 +15938,7 @@ * progmodes/cc-defs.el (c-emacs-features): Don't assume point-min==1. -2005-12-06 Nozomu Ando <nand@mac.com> (tiny patch) +2005-12-06 Nozomu Ando <nand@mac.com> * mail/smtpmail.el (smtpmail-try-auth-methods): Make password prompts work for AUTH PLAIN. Also reported by Steve Allan @@ -29217,7 +29486,7 @@ * progmodes/python.el (python-close-block-statement-p) (python-outdent-p, python-current-defun): Use symbol-end. -2005-03-25 Karl Chen <quarl@cs.berkeley.edu> (tiny change) +2005-03-25 Karl Chen <quarl@cs.berkeley.edu> * files.el (save-some-buffers): Doc fix. @@ -31902,7 +32171,7 @@ * electric.el (Electric-pop-up-window): Use fit-window-to-buffer instead of calculating the right size. -2005-01-02 Karl Chen <quarl@cs.berkeley.edu> (tiny change) +2005-01-02 Karl Chen <quarl@cs.berkeley.edu> * vc-svn.el (vc-svn-diff): Stay local if possible.
--- a/lisp/diff-mode.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/diff-mode.el Mon Mar 12 00:42:43 2007 +0000 @@ -985,7 +985,9 @@ (define-derived-mode diff-mode fundamental-mode "Diff" "Major mode for viewing/editing context diffs. Supports unified and context diffs as well as (to a lesser extent) -normal diffs. +normal diffs. If you edit the buffer manually, diff-mode will try +to update the hunk headers for you on-the-fly. + When the buffer is read-only, the ESC prefix is not necessary. If you edit the buffer manually, diff-mode will try to update the hunk headers for you on-the-fly. @@ -993,7 +995,12 @@ You can also switch between context diff and unified diff with \\[diff-context->unified], or vice versa with \\[diff-unified->context] and you can also reverse the direction of a diff with \\[diff-reverse-direction]. -\\{diff-mode-map}" + +When the buffer is read-only, the Meta- modifier is not necessary +to run the Diff mode commands: + + \\{diff-mode-map}" + (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults) (set (make-local-variable 'outline-regexp) diff-outline-regexp) (set (make-local-variable 'imenu-generic-expression) @@ -1368,7 +1375,8 @@ (yes-or-no-p (format "Really apply this hunk to %s? " (file-name-nondirectory buffer-file-name))))))) - (error (substitute-command-keys + (error "%s" + (substitute-command-keys (format "Use %s\\[diff-apply-hunk] to apply it to the other file" (if (not reverse) "\\[universal-argument] "))))) ((and switched
--- a/lisp/emacs-lisp/bytecomp.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Mon Mar 12 00:42:43 2007 +0000 @@ -972,8 +972,10 @@ (pos (if (and byte-compile-current-file (integerp byte-compile-read-position)) (with-current-buffer byte-compile-current-buffer - (format "%d:%d:" (count-lines (point-min) - byte-compile-last-position) + (format "%d:%d:" + (save-excursion + (goto-char byte-compile-last-position) + (1+ (count-lines (point-min) (point-at-bol)))) (save-excursion (goto-char byte-compile-last-position) (1+ (current-column)))))
--- a/lisp/mail/emacsbug.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/mail/emacsbug.el Mon Mar 12 00:42:43 2007 +0000 @@ -139,7 +139,9 @@ (insert "\n\nIn " (emacs-version) "\n") (if (fboundp 'x-server-vendor) (condition-case nil - (insert "X server distributor `" (x-server-vendor) "', version " + ;; This is used not only for X11 but also W32 and others. + (insert "Windowing system distributor `" (x-server-vendor) + "', version " (mapconcat 'number-to-string (x-server-version) ".") "\n") (error t))) (if (and system-configuration-options @@ -281,5 +283,5 @@ (provide 'emacsbug) -;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 +;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 ;;; emacsbug.el ends here
--- a/lisp/progmodes/grep.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/progmodes/grep.el Mon Mar 12 00:42:43 2007 +0000 @@ -157,7 +157,8 @@ :type 'alist :group 'grep) -(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs") +(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs" + ".git" ".bzr") "*List of names of sub-directories which `rgrep' shall not recurse into." :type '(repeat string) :group 'grep)
--- a/lisp/replace.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/replace.el Mon Mar 12 00:42:43 2007 +0000 @@ -1049,7 +1049,9 @@ (with-current-buffer occur-buf (occur-mode) - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + ;; Don't generate undo entries for creation of the initial contents. + (buffer-undo-list t)) (erase-buffer) (let ((count (occur-engine regexp active-bufs occur-buf @@ -1086,8 +1088,6 @@ title-face prefix-face match-face keep-props) (with-current-buffer out-buf (let ((globalcount 0) - ;; Don't generate undo entries for creation of the initial contents. - (buffer-undo-list t) (coding nil)) ;; Map over all the buffers (dolist (buf buffers)
--- a/lisp/type-break.el Fri Mar 09 03:30:57 2007 +0000 +++ b/lisp/type-break.el Mon Mar 12 00:42:43 2007 +0000 @@ -562,9 +562,12 @@ (if file (timep ;; returns expected format, else nil (with-current-buffer (find-file-noselect file 'nowarn) - (save-excursion - (goto-char (point-min)) - (read (current-buffer)))))))) + (condition-case nil + (save-excursion + (goto-char (point-min)) + (read (current-buffer))) + (end-of-file + (error "End of file in `%s'" file)))))))) (defun type-break-get-previous-count () "Get previous keystroke count from `type-break-file-name'. @@ -576,10 +579,13 @@ (setq file (with-current-buffer (find-file-noselect file 'nowarn) - (save-excursion - (goto-char (point-min)) - (forward-line 1) - (read (current-buffer))))))) + (condition-case nil + (save-excursion + (goto-char (point-min)) + (forward-line 1) + (read (current-buffer))) + (end-of-file + (error "End of file in `%s'" file))))))) file 0)))
--- a/src/ChangeLog Fri Mar 09 03:30:57 2007 +0000 +++ b/src/ChangeLog Mon Mar 12 00:42:43 2007 +0000 @@ -1,12 +1,90 @@ +2007-03-11 Sam Steingold <sds@gnu.org> + + * process.c (sigchld_handler): Sleep before wait3 to avoid a busyloop. + +2007-03-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (Fx_server_vendor): Change vendor string to "Apple Inc.". + +2007-03-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore + mouse wheel movement on title bar or tool bar. + +2007-03-10 Chong Yidong <cyd@stupidchicken.com> + + * keyboard.c (help_form_saved_window_configs): New var. + (read_char_help_form_unwind): New function. + (read_char): Don't restore window configuration if a mouse click + arrives while the help form is being displayed. + +2007-03-10 Kim F. Storm <storm@cua.dk> + + * xdisp.c (redisplay_window): Don't automatically select a new window + start for a contination line during mouse-click. + +2007-03-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar. + +2007-03-09 Juanma Barranquero <lekktu@gmail.com> + + * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid. + +2007-03-08 Richard Stallman <rms@gnu.org> + + * keyboard.c (syms_of_keyboard): Doc fix. + +2007-03-08 Chong Yidong <cyd@stupidchicken.com> + + * minibuf.c (Ftry_completion): Don't short circuit if + completion-ignore-case is non-nil. + +2007-03-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers): + Undo 2006-03-06 changes. + + * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll + bar if its width is smaller than that of Aqua small scroll bar. + +2007-03-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as + to handle correctly prompts with read-only property. + +2007-03-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * sound.c (wav_play): Check header->data_length to see how much we + shall read. + (alsa_period_size): Convert ALSA period size in frames to bytes. + (alsa_write): Return if frames is zero. + +2007-03-06 Kenichi Handa <handa@m17n.org> + + * xselect.c (Vselection_coding_system): Documentation improved. + +2007-03-05 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if + USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS. + (x_set_window_size): Call SET_FRAME_GARBAGED. Clear window if + internal border width has changed. + + * macterm.h (struct mac_output): New member `internal_border_width'. + +2007-03-04 Richard Stallman <rms@gnu.org> + + * window.c (Fdisplay_buffer): Doc fix. + 2007-03-03 Glenn Morris <rgm@gnu.org> * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does not include -lX11 on Solaris. -2007-03-02 Stuart D. Herring <herring@lanl.gov> - - * keymap.c (Fkey_binding): Don't consider two-element lists as - events. +2007-03-02 Stuart D. Herring <herring@lanl.gov> + + * keymap.c (Fkey_binding): Don't consider one-element lists as events. 2007-03-01 Kenichi Handa <handa@m17n.org> @@ -35,8 +113,8 @@ (x_scroll_bar_create, XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle. - * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New - member `min_handle'. + * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: + New member `min_handle'. 2007-02-23 Kim F. Storm <storm@cua.dk> @@ -59,11 +137,11 @@ (mac_flush_display_optional) [USE_CG_DRAWING]: New function. (x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for flush_display_optional. - [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New - argument MOUSE_POS. All uses changed. Set bar->dragging to + [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): + New argument MOUSE_POS. All uses changed. Set bar->dragging to negative integer if scroll bar handle is pressed. - [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative - bar->dragging means scroll bar handle is not dragged. + [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): + Negative bar->dragging means scroll bar handle is not dragged. [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial offset of scroll bar handle from negative bar->dragging. (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll @@ -98,8 +176,7 @@ * w32menu.c (current_popup_menu): Make available globally. (menubar_selection_callback): Free menu strings before pushing the - menu event into the keyboard buffer. Remove - menu_command_in_progress. + menu event into the keyboard buffer. Remove menu_command_in_progress. * w32fns.c (current_popup_menu): Use from w32menu.c. (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active @@ -369,8 +446,8 @@ 2007-01-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use - DisableControl for disabled items. Set default button to first + * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: + Use DisableControl for disabled items. Set default button to first enabled one. Use icon of application in execution. 2007-01-13 Eli Zaretskii <eliz@gnu.org>
--- a/src/macfns.c Fri Mar 09 03:30:57 2007 +0000 +++ b/src/macfns.c Mon Mar 12 00:42:43 2007 +0000 @@ -1909,24 +1909,6 @@ #endif /* not MAC_OSX */ } -void -mac_set_scroll_bar_width (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; -{ -#ifdef MAC_OSX - if (INTEGERP (arg) && XINT (arg) > 0) - { - if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH - + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2) - XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH); - else - XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH); - } -#endif - x_set_scroll_bar_width (f, arg, oldval); -} - static void mac_set_font (f, arg, oldval) struct frame *f; @@ -3052,7 +3034,7 @@ (display) Lisp_Object display; { - return build_string ("Apple Computers"); + return build_string ("Apple Inc."); } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, @@ -4677,7 +4659,7 @@ x_set_menu_bar_lines, x_set_mouse_color, x_explicitly_set_name, - mac_set_scroll_bar_width, + x_set_scroll_bar_width, x_set_title, x_set_unsplittable, x_set_vertical_scroll_bars,
--- a/src/process.c Fri Mar 09 03:30:57 2007 +0000 +++ b/src/process.c Mon Mar 12 00:42:43 2007 +0000 @@ -6401,12 +6401,16 @@ #define WUNTRACED 0 #endif /* no WUNTRACED */ /* Keep trying to get a status until we get a definitive result. */ - do - { - errno = 0; - pid = wait3 (&w, WNOHANG | WUNTRACED, 0); - } - while (pid < 0 && errno == EINTR); + while (1) { + errno = 0; + pid = wait3 (&w, WNOHANG | WUNTRACED, 0); + if (! (pid < 0 && errno == EINTR)) + break; + /* avoid a busyloop: wait3 is a system call, so we do not want + to prevent the kernel from actually sending SIGCHLD to emacs + by asking for it all the time */ + sleep (1); + } if (pid <= 0) {