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

1409 commits

Author SHA1 Message Date
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
Francesco Potortì
11d2d983c4 *** empty log message *** 2007-02-26 13:20:57 +00:00
Chong Yidong
38008dcd92 Bump to version 22.0.94. 2007-02-23 17:37:28 +00:00
Glenn Morris
70e48c8616 Ulrich Mueller <ulm at kph.uni-mainz.de> (tiny change):
(EMACS, EMACSOPT): New variables.
(blessmail): Use `--no-site-file' when compiling.
2007-02-20 04:08:17 +00:00
Glenn Morris
0971f88779 *** empty log message *** 2007-02-20 04:07:28 +00:00
Juanma Barranquero
71b8f73572 Comment changes and clarifications. 2007-02-16 17:12:59 +00:00
Miles Bader
18c3672766 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 624-636)

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

 * gnus--rel--5.10  (patch 200-201)

   - Merge from emacs--devo--0
   - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171
2007-02-13 12:14:16 +00:00
Glenn Morris
5b87ad5540 Switch to standard GPL text for license. 2007-02-11 01:18:25 +00:00
Francesco Potortì
933ccc8cb8 Now --members is the default for etags, not for ctags yet. 2007-02-05 21:39:13 +00:00
Francesco Potortì
7806494867 (default_C_help, Cplusplus_help, PHP_help, print_help)
(main): Now --members is the default for etags, not for ctags yet.
2007-02-05 21:33:33 +00:00
Glenn Morris
d881944f98 *** empty log message *** 2007-02-05 09:07:32 +00:00
Juanma Barranquero
47dad44f54 *** empty log message *** 2007-02-04 23:49:41 +00:00
Francesco Potortì
953dea63cd etags.c fix by Per Cederqvist 2007-02-04 22:05:03 +00:00
Francesco Potortì
47fd18c650 (gperf, in_word_set): changed attribute for Java to (C_JAVA & ~C_PLPL).
The previous change introduced 2004-09-13 was broken, as (C_JAVA &
!C_PLPL) always evaluates to 0.  This caused import, package, extends,
implements and interface to be treated specially for all kinds of
C-style files, not just Java files. (by Per Cederqvist).
2007-02-04 22:03:09 +00:00
Glenn Morris
a423dfded7 Fix file local variables c-file-style specification. 2007-02-03 21:58:55 +00:00
Miles Bader
bb5b9e9dbe Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 615-621)

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

 * gnus--rel--5.10  (patch 197-199)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
2007-01-30 22:22:43 +00:00
Glenn Morris
d1e4cefd0b Add missing Copyright header. Years from date of installation in
public Emacs CVS to present.

[email from rms, 2007/1/22, "Copyright years": "That is copyright FSF.
Whoever added that failed to put in the proper copyright notice."]
2007-01-28 00:46:46 +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
Chong Yidong
e6e2db62bc Bump version to 22.0.93. 2007-01-23 00:47:29 +00:00