Glenn Morris
565cb73650
* admin/notes/bzr: More bzrmerge notes.
2011-01-17 18:55:26 -08:00
Glenn Morris
acce4a473a
* admin/bzrmerge.el: Fix paren typo in previous.
2011-01-17 18:35:23 -08:00
Glenn Morris
b91f171d26
* admin/notes/bzr: Add some more bzrmerge details.
2011-01-17 18:22:36 -08:00
Paul Eggert
9092d18633
* notes/bzr (Installing changes from gnulib): New section.
...
Need for this suggested by Stefan Monnier.
2011-01-17 14:11:13 -08:00
Stefan Monnier
41f44310b3
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
...
an inconsistent state.
2011-01-17 16:18:00 -05:00
Paul Eggert
a3e44e7937
Merge from mainline.
2011-01-17 11:01:01 -08:00
Glenn Morris
e9bffc61f2
Refill some copyright headers.
2011-01-15 18:21:30 -08:00
Glenn Morris
0d9f702fd0
Nuke arch-tags.
2011-01-15 15:16:57 -08:00
Glenn Morris
2153c86209
* admin/charsets/cp51932.awk: No longer print arch-tag.
2011-01-15 14:46:51 -08:00
Glenn Morris
623717b76c
* admin/charsets/eucjp-ms.awk: No longer print arch-tag.
2011-01-15 14:44:52 -08:00
Glenn Morris
d0d4361dba
Add 2011 to remaining FSF/AIST copyright years.
2011-01-15 14:10:37 -08:00
Glenn Morris
4ebf3ee11c
* admin/notes/bzr: More on previous.
2011-01-15 13:51:36 -08:00
Glenn Morris
9aafb22b66
* admin/notes/bzr: Add an idiot's guide to merging between branches.
2011-01-15 13:47:46 -08:00
Glenn Morris
6fffc9003c
bzrmerge.el trivia.
...
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
2011-01-15 12:42:23 -08:00
Paul Eggert
8a1f4a98c1
Merge from mainline.
2011-01-14 10:14:17 -08:00
Glenn Morris
15a1cca8ec
ChangeLog merge fixes.
2011-01-14 09:42:40 -08:00
Stefan Monnier
77ab81d054
Merge from emacs-23
2011-01-14 12:18:41 -05:00
Paul Eggert
3720fa2b1a
Merge from mainline.
2011-01-13 21:07:26 -08:00
Glenn Morris
1851cac3e3
* admin/bzrmerge.el: Require cl when compiling.
...
(bzrmerge-merges): Doc fix.
2011-01-13 18:44:25 -08:00
Paul Eggert
7ea5475741
Merge from mainline.
2011-01-11 21:57:19 -08:00
Glenn Morris
529ee9edf2
* admin/bzrmerge.el: Standardize copyright and license headers.
2011-01-11 20:28:12 -08:00
Paul Eggert
e8c53d3abf
Update copyright notes to match recent gnulib-related changes.
...
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
arg-nonnull.h, c++defs.h, compile, depcomp, missing,
warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c,
lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now
subsumed by m4/*.m4 rule). config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
2011-01-09 00:42:24 -08:00
Paul Eggert
2b3f5bc80a
* install-sh, mkinstalldirs, move-if-change: Update from master
2011-01-07 12:42:11 -08:00
Paul Eggert
dfa36fa1a2
* notes/copyright: Report status more accurately for non-GPL files.
...
Report copyright status more accurately for mkinstalldirs,
configure, m4/getopt.m4, and msdos/sed*.inp.
2011-01-07 11:23:35 -08:00
Glenn Morris
287d4c2ca3
* admin/admin.el (set-copyright): Also handle \year in refcards/*.tex.
2011-01-02 16:35:01 -08:00
Glenn Morris
ca7e840863
Revert accidental update of non-FSF copyright from 2010-01-13T08:35:10Z!rgm@gnu.org.
2011-01-02 16:01:07 -08:00
Glenn Morris
5df4f04cd3
Add 2011 to FSF/AIST copyright years.
2011-01-02 15:50:46 -08:00
Chong Yidong
7c420169ba
Merge changes from emacs-23 branch
2011-01-02 15:31:19 -05:00
Eli Zaretskii
5be1c984b7
Fix bug #7716 with PNG image support libraries on Windows.
...
src/image.c <Qlibpng_version>: New variable.
(syms_of_image): Intern and staticpro it. Set its value to the
version of PNG library we were compiled with.
(my_png_error, png_load): Avoid GCC warnings about direct access
to png_ptr->jmpbuf.
lisp/term/w32-win.el (image-library-alist): Set up correctly for
libpng versions both before and after 1.4.0.
admin/nt/README.W32: Update the information about PNG support libraries.
nt/INSTALL: Update the information about PNG support libraries.
2010-12-31 14:38:06 +02:00
Stefan Monnier
9ebea0e746
* admin/bzrmerge.el: New file to help merge branches while skipping
...
some revisions (e.g. from emacs-23 to trunk).
2010-12-26 20:27:08 -05:00
Andreas Schwab
201ef780e0
Remove EXPLICIT_SIGN_EXTEND.
...
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.
2010-12-03 17:08:05 -05:00
Chong Yidong
903653532f
Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se.
2010-12-03 17:01:43 -05:00
Andreas Schwab
e5bd16703f
Remove EXPLICIT_SIGN_EXTEND.
...
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.
* CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.
2010-12-03 21:55:23 +01:00
Chong Yidong
07976ae3b8
Merge changes from emacs-23 branch
2010-11-27 15:04:57 -05:00
Eli Zaretskii
0c3b672775
bugtracker: REALLY correct locations of bzr *.conf files.
2010-11-22 05:52:49 +02:00
Eli Zaretskii
5b9b7ef448
bugtracker: Correct locations of bzr *.conf files.
2010-11-21 19:59:08 +02:00
Stefan Monnier
4a47c27573
Merge from emacs-23
2010-11-17 22:54:14 -05:00
Eli Zaretskii
43335389f1
The fixes' attribute does show in
bzr log'.
2010-11-12 18:42:12 +02:00
Eli Zaretskii
6173c5b551
Expand and clarify the description of bugtracker setting for bzr.
2010-11-12 10:37:27 +02:00
Glenn Morris
de4708cbd8
Comments related to `bzr commit --fixes'.
2010-11-09 20:50:31 -08:00
Chong Yidong
eea682b6d1
Notes about elpa.gnu.org for maintainers.
2010-11-04 13:00:43 -04:00
Glenn Morris
e63715a071
* admin/notes/bugtracker: Mention "found".
2010-10-30 17:38:13 -07:00
Glenn Morris
1a71dc4933
* admin/make-tarball.txt: Misc updates.
2010-10-21 20:28:21 -07:00
Juanma Barranquero
c0943d3db2
Fix typos in docstrings, comments and ChangeLogs.
...
* etc/tutorials/TUTORIAL.es: Fix typos.
* lisp/cedet/semantic/symref/list.el (semantic-symref-list-rename-open-hits):
Fix typo in message.
(semantic-symref-list-map-open-hits): Fix typo in docstring.
* lisp/erc/erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.
* lisp/international/mule.el (define-coding-system):
* lisp/international/titdic-cnv.el (quail-cxterm-package-ext-info):
* composite.el (compose-region): Fix typo in docstring.
* lisp/org/org-agenda.el (org-prefix-category-length)
(org-prefix-category-max-length): Fix typos in docstrings.
* src/font.c (Ffont_variation_glyphs):
* ccl.c (Fccl_execute_on_string): Fix typo in docstring.
2010-10-13 01:25:19 +02:00
Glenn Morris
16a0af11ec
Move nextstep/DEV-NOTES to admin/notes/nextstep.
2010-10-11 20:55:21 -07:00
Glenn Morris
f4f358f172
* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
...
* configure: Regenerate.
* .bzrignore: Remove doc/emacs/emacsver.texi.
* doc/emacs/Makefile.in (distclean): Do not delete emacsver.texi.
* doc/emacs/emacsver.texi: New file, replacing emacsver.texi.in.
* admin/admin.el (set-version): Add doc/emacs/emacsver.texi.
2010-10-09 10:59:55 -07:00
Glenn Morris
f7a31f1108
Set the version number in the texinfo manuals using configure.
...
* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.
* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.
* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.
* admin/admin.el (set-version): No need to act on doc/ files any more.
* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.
2010-10-08 18:41:21 -07:00
Glenn Morris
3fb78d1f33
Remove lib-src/b2m.c and b2m.pl.
...
Emacs does not use Babyl files since 23.1, and you can use M-x unrmail.
* msdos/mainmake.v2 (install): Remove b2m.
* lisp/emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.
* lib-src/b2m.c, lib-src/b2m.pl: Remove files.
* lib-src/Makefile.in (INSTALLABLES): Remove b2m.
* lib-src/makefile.w32-in ($(BLD)/b2m.$(O)): Remove.
* doc/emacs/ack.texi (Acknowledgments): No more b2m.c.
* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.
* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.
2010-10-08 18:15:15 -07:00
Juanma Barranquero
3b59c3511c
Fix typos in comments and ChangeLogs.
2010-09-14 22:32:35 +02:00
Juanma Barranquero
733946e777
Update to latest Unicode 6.0 beta data files.
...
* admin/unidata/BidiMirroring.txt: Update from
http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d2.txt
* admin/unidata/UnicodeData.txt: Update from
http://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d7.txt
* lisp/international/uni-bidi.el:
* lisp/international/uni-category.el:
* lisp/international/uni-combining.el:
* lisp/international/uni-decimal.el:
* lisp/international/uni-mirrored.el:
* lisp/international/uni-name.el: Regenerate.
* src/biditype.h: Regenerate.
2010-09-05 04:06:39 +02:00