1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Commit graph

42 commits

Author SHA1 Message Date
Glenn Morris
b9b1cc1463 Switch to recommended form of GPLv3 permissions notice. 2008-05-15 03:28:14 +00:00
Miles Bader
5bc6ddff00 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
2008-04-05 23:01:26 +00:00
Kenichi Handa
7a1dd8de8f (struct ccl_program): New member quit_silently. 2008-03-10 12:16:47 +00:00
Stefan Monnier
02dfeba8a4 (smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
2008-02-13 15:10:57 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Glenn Morris
8cabe764e9 Add 2008 to copyright years. 2008-01-08 04:37:27 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
Glenn Morris
1427aa658e Remove license from trivial file. 2007-07-25 07:49:39 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
2007-01-26 06:16:11 +00:00
Glenn Morris
7cdc02a62a Add 2007 to copyright. 2007-01-21 20:49:59 +00:00
Miles Bader
4bc5d7668e Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 545-562)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - erc-iswitchb: Temporarily enable iswitchb mode

 * gnus--rel--5.10  (patch 172-176)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
2006-12-16 01:29:26 +00:00
Kenichi Handa
7976eda061 Update AIST copyright years. 2006-12-13 01:13:58 +00:00
Miles Bader
41882805d6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
2006-01-16 08:37:27 +00:00
Kenichi Handa
ce03bf76b9 Copyright fixed 2005-12-19 07:04:44 +00:00
Miles Bader
d3e4babdd1 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 459-473)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 86-87)

   - Update from CVS
2005-07-07 12:43:14 +00:00
Lute Kamstra
4fc5845fe8 Update FSF's address. 2005-07-04 16:49:24 +00:00
Miles Bader
fdffd34626 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 324-352)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - etc/emacs-buffer.gdb: Remove RCS keywords

 * gnus--rel--5.10  (patch 70-79)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
2005-06-06 02:39:45 +00:00
Kenichi Handa
7cf49add81 *** empty log message *** 2005-05-27 11:28:42 +00:00
Kenichi Handa
6b61353c0a Sync to HEAD 2004-04-16 12:51:06 +00:00
Kenichi Handa
8f924df7df *** empty log message *** 2003-09-08 12:53:41 +00:00
Kenichi Handa
463f5630a5 New directory 2003-09-08 11:56:09 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Kenichi Handa
034060e4e7 (struct ccl_program) <eight_bit_control: Comment fixed. 2003-05-30 07:58:37 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Kenichi Handa
5cac9fd684 (ccl_driver): Prototype adjusted. 2003-01-30 02:19:36 +00:00
Kenichi Handa
d2bc5a70e9 (struct ccl_program): Members eol_type and multibyte
deleted.  New members src_multibyte, dst_multibyte, consumed, and
produced.
(struct ccl_spec): Members decoder and encoder deleted.  New
memeber ccl.
(CODING_SPEC_CCL_PROGRAM): New macro.
(ccl_driver): Prototype updated.
(Qccl, Qcclp, Fccl_program_p): Extern them.
(CHECK_CCL_PROGRAM): New macro.
2002-03-01 01:14:37 +00:00
Kenichi Handa
5829aace4e (struct ccl_program): New member eight_bit_control. 2001-02-27 03:29:08 +00:00
Kenichi Handa
64068fbfc1 (sturct ccl_program): New member suppress_error. 2001-01-24 23:29:42 +00:00
Kenichi Handa
898f33125f (struct ccl_spec): New member eight_bit_carryover. 2000-12-28 07:03:19 +00:00
Kenichi Handa
f455f068fb (struct ccl_program): New member cr_consumed. 2000-12-22 00:07:09 +00:00
Kenichi Handa
975ddbf53c (struct ccl_program): New member multibyte. 2000-08-11 05:45:10 +00:00
Kenichi Handa
8538ed9a98 (struct ccl_program): New member eol_type.
(struct ccl_spec): New member cr_carryover.
2000-06-19 05:15:51 +00:00
Kenichi Handa
265702b7c5 (EMACS_CCL_H): Renamed from _CCL_H. 2000-06-11 23:40:14 +00:00
Kenichi Handa
e5e6d6fbaf (setup_ccl_program): The type is changed to `int'. 1999-07-26 11:55:53 +00:00
Kenichi Handa
e05645eeb8 (struct ccl_program): New member stack_idx. 1999-05-04 05:43:41 +00:00
Kenichi Handa
a35fd731c7 (ccl_spec): New member valid_codes. 1998-08-02 01:06:57 +00:00
Kenichi Handa
1cfae2bf37 (Vccl_program_table, Qccl_program_idx): Extern them. 1998-04-15 07:12:49 +00:00
Kenichi Handa
eacba2473e Definition of macros CCL_STAT_XXX are moved from ccl.c to here.
(struct ccl_program): New member private_state.
1998-01-22 01:26:45 +00:00
Andreas Schwab
58068210c5 Add declaration of setup_ccl_program and ccl_driver. 1997-11-21 14:30:34 +00:00
Richard M. Stallman
75c8c59233 Change copyright notices. 1997-06-20 06:30:29 +00:00
Karl Heuer
369314dc63 Fix FSF address in comment. 1997-02-23 09:20:52 +00:00
Karl Heuer
4ed4686978 Initial revision 1997-02-20 07:02:49 +00:00