1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Commit graph

1427 commits

Author SHA1 Message Date
Miles Bader
b2e6b10fe2 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

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

 * emacs--rel--22  (patch 88-92)

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

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
2007-08-13 13:48:35 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
79f94cd0ab Replace `iff' in comments. 2007-08-08 07:12:39 +00:00
Miles Bader
e145a7fe95 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 832-838)

   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Update from CVS
   - Restore lisp/emacs-lisp/cl-loaddefs.el
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 75-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
2007-08-03 05:20:51 +00:00
Miles Bader
8f069875eb Update some .arch-inventory files
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-77
Creator:  Michael Olson <mwolson@gnu.org>
2007-07-30 05:36:46 +00:00
Miles Bader
5ef05ae3b2 Update some .arch-inventory files
* lib-src/.arch-inventory: Don't track the blessmail binary.

* lisp/emacs-lisp/cl-loaddefs.el: Don't track this.  It is autogenerated.

* lisp/emacs-lisp/.arch-inventory: Don't track cl-loaddefs.el.

* lisp/ps-print.el: Check in trivial changes to the autoloads section
  caused by the build process.  These autoloads really ought to be placed
  in a separate file, methinks.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-833
Creator:  Michael Olson <mwolson@gnu.org>
2007-07-30 05:33:47 +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
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

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

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Miles Bader
6eabc4c2f7 Merge from emacs--rel--22
Patches applied:

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

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * lib-src/COPYING: Switch to GPLv3.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:24:01 +00:00
Glenn Morris
cacc7b5131 Switch license to GPLv3 or later. 2007-07-25 07:11:02 +00:00
Glenn Morris
5c65bae26d Change to GPLv3. 2007-07-25 07:00:38 +00:00
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Eli Zaretskii
effb3d94de (clean): Don't delete *~. 2007-07-20 19:45:30 +00:00
Miles Bader
4dacf5c598 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 814-815)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
2007-07-18 22:15:15 +00:00
Francesco Potortì
172aa4c11b * etags.c (C_entries): Reset the fvdef machine when out of function.
(PRINT_UNDOCUMENTED_OPTIONS_HELP): #define as FALSE if undefined.
(print_help): Use it in if() rather than #if.
(print_help): Conditionally print help about --no-line-directive.
2007-07-17 15:13:24 +00:00
Francesco Potortì
21b2cdc7de *** empty log message *** 2007-07-17 15:03:54 +00:00
Francesco Potortì
180f5b99a7 *** empty log message *** 2007-07-17 14:55:40 +00:00
Eli Zaretskii
9724908a55 (clean): Don't delete *~. 2007-07-16 22:41:49 +00:00
Miles Bader
fb9a13e3dc Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 781-792)

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

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
2007-06-11 00:58:11 +00:00
Miles Bader
0114082988 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-790
2007-06-09 03:19:04 +00:00
Glenn Morris
5ee63e320f Fix typo in previous change. 2007-06-07 07:47:00 +00:00
Glenn Morris
d16c1140f4 (print_version): Add `emacs_copyright' string, for easier automatic
updating.
2007-06-07 07:25:14 +00:00
Glenn Morris
5cf9ca93e5 (main): Use `emacs-copyright' in --version output. 2007-06-07 07:23:36 +00:00
Jason Rumney
812099f3c8 *** empty log message *** 2007-06-06 20:28:01 +00:00
Jason Rumney
4086608a37 (obj): Add font.o and w32font.o 2007-06-06 20:27:53 +00:00
Chong Yidong
6e04fc9856 Bump version number to 22.1.50. 2007-06-04 20:42:53 +00:00
Chong Yidong
3d5724d8f1 Increment version number to 22.1. 2007-06-02 11:11:48 +00:00
Chong Yidong
7dfc4cda5d Version 22.1 released. 2007-06-02 11:07:00 +00:00
Miles Bader
262be72a9a Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 751-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 18-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-208
2007-05-24 21:31:10 +00:00
Francesco Potortì
cabfc1bcd6 etags.c updates. 2007-05-18 08:45:29 +00:00
Francesco Potortì
eac5078589 Extern definitions of some more pointer functions for
standalone compilation, especially important for 64bit platforms.
(main, print_help): --members is now the default for etags.
(C_entries): Parse start of C comment as a space == end of token.
This is not necessary for C++ comment, already parsed as newline.
2007-05-18 08:43:54 +00:00
Chong Yidong
ab43d1e484 Bump version to 22.0.990 2007-05-17 18:55:36 +00:00
Miles Bader
212c766631 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 713-725)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (base, patch 1-5)

   - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
   - Sync to CVS tag EMACS_22_BRANCHPOINT
   - Sync to CVS branch EMACS_22_BASE
   - Update from CVS

 * gnus--rel--5.10  (patch 217)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-202
2007-05-01 23:03:36 +00:00
Juanma Barranquero
2f2c687b8d *** empty log message *** 2007-04-26 14:22:04 +00:00
Miles Bader
c71cdfc123 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 711-712)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-199
2007-04-26 04:38:27 +00:00
Glenn Morris
0701603152 *** empty log message *** 2007-04-26 03:44:07 +00:00
Glenn Morris
5ba76e083b Increase version to 22.1.50. 2007-04-26 03:32:48 +00:00
Miles Bader
991a760232 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 698-710)

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

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
2007-04-24 21:56:25 +00:00
Chong Yidong
07ef6df709 Bump version to 22.0.99. 2007-04-24 02:28:19 +00:00
Chong Yidong
48742df4f4 Bump version to 22.0.98. 2007-04-17 01:38:44 +00:00
Miles Bader
57cb2e6f26 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
2007-04-11 00:17:47 +00:00
Chong Yidong
85adab9a0a Bump version to 22.0.97. 2007-04-04 00:42:38 +00:00
Miles Bader
d85d38392e Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 670-674)

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

 * gnus--rel--5.10  (patch 209-210)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
2007-03-21 13:33:07 +00:00
Chong Yidong
dd35811fe3 Bump version to 22.0.96. 2007-03-20 00:46:19 +00:00
Miles Bader
70fff7b100 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 653-661)

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

 * gnus--rel--5.10  (patch 203-206)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
2007-03-04 06:19:40 +00:00
Juanma Barranquero
d620ddb3d3 *** empty log message *** 2007-03-02 10:20:18 +00:00
Chong Yidong
c39706ff8b Bump to 22.0.95. 2007-03-01 23:19:21 +00:00
Glenn Morris
b7e1b21bd5 Add University of California copyright and revised BSDL license.
Remove Ken Arnold copyright.
(print_version): Remove Ken Arnold, refer to new file ETAGS.README.
2007-02-27 03:19:57 +00:00
Miles Bader
a73d7753f9 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 638-652)

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

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
2007-02-26 23:03:45 +00:00
Francesco Potortì
46861ec00b (etags, ctags): define EMACS_NAME as "GNU Emacs". 2007-02-26 13:21:16 +00:00