aboutsummaryrefslogtreecommitdiffstats
path: root/admin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | strftime: import from gnulibPaul Eggert2011-01-302-1/+5
| |
* | Refill some long/short copyright headers.Glenn Morris2011-01-265-13/+6
| |
* | Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-242-2/+12
| | | | | | | | | | * admin/bzrmerge.el (bzrmerge-skip-regexp): New variable. (bzrmerge-missing): Use it.
* | Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-2421-30/+21
| |
* | * admin/notes/bzrmerge: Comment on skipped revisions.Glenn Morris2011-01-221-0/+5
| |
* | * make-tarball.txt: Suggest 'autoreconf -I m4 --force'Paul Eggert2011-01-192-2/+7
| | | | | | | | | | rather than doing rm and autoconf by hand. See <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
* | * admin/notes/bzr: Fix typos in previous.Glenn Morris2011-01-171-2/+2
| |
* | * admin/notes/bzr: More bzrmerge notes.Glenn Morris2011-01-171-4/+14
| |
* | * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-171-1/+1
| |
* | * admin/notes/bzr: Add some more bzrmerge details.Glenn Morris2011-01-171-4/+15
| |
* | * notes/bzr (Installing changes from gnulib): New section.Paul Eggert2011-01-172-0/+26
| | | | | | | | Need for this suggested by Stefan Monnier.
* | * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-172-0/+16
| | | | | | | | an inconsistent state.
* | Merge from mainline.Paul Eggert2011-01-1735-46/+49
|\ \
| * | Refill some copyright headers.Glenn Morris2011-01-151-2/+2
| | |
| * | Nuke arch-tags.Glenn Morris2011-01-1527-32/+0
| | |
| * | * admin/charsets/cp51932.awk: No longer print arch-tag.Glenn Morris2011-01-152-5/+1
| | |
| * | * admin/charsets/eucjp-ms.awk: No longer print arch-tag.Glenn Morris2011-01-152-3/+2
| | |
| * | Add 2011 to remaining FSF/AIST copyright years.Glenn Morris2011-01-152-2/+2
| | |
| * | * admin/notes/bzr: More on previous.Glenn Morris2011-01-151-0/+5
| | |
| * | * admin/notes/bzr: Add an idiot's guide to merging between branches.Glenn Morris2011-01-151-0/+29
| | |
| * | bzrmerge.el trivia.Glenn Morris2011-01-152-2/+8
| | | | | | | | | | | | | | | * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el.
* | | Merge from mainline.Paul Eggert2011-01-1431-43/+56
|\ \ \ | |/ /
| * | ChangeLog merge fixes.Glenn Morris2011-01-141-1/+0
| | |
| * | Merge from emacs-23Stefan Monnier2011-01-1431-43/+57
| |\ \ | | |/
| | * * admin/admin.el (set-copyright): Also handle \year in refcards/*.tex.Glenn Morris2011-01-022-15/+26
| | |
| | * Revert accidental update of non-FSF copyright from ↵Glenn Morris2011-01-021-1/+1
| | | | | | | | | | | | 2010-01-13T08:35:10Z!rgm@gnu.org.
| | * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-0233-35/+34
| | |
* | | Merge from mainline.Paul Eggert2011-01-132-5/+10
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-132-4/+9
| | | | | | | | | | | | (bzrmerge-merges): Doc fix.
* | | Merge from mainline.Paul Eggert2011-01-111-5/+5
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-111-5/+5
| | |
* | | Update copyright notes to match recent gnulib-related changes.Paul Eggert2011-01-092-10/+25
|/ / | | | | | | | | | | | | | | | | | | * 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.
* | * install-sh, mkinstalldirs, move-if-change: Update from masterPaul Eggert2011-01-072-3/+9
| |
* | * notes/copyright: Report status more accurately for non-GPL files.Paul Eggert2011-01-072-0/+16
| | | | | | | | | | Report copyright status more accurately for mkinstalldirs, configure, m4/getopt.m4, and msdos/sed*.inp.
* | Merge changes from emacs-23 branchChong Yidong2011-01-021-0/+5
|\ \ | |/
| * Fix bug #7716 with PNG image support libraries on Windows.Eli Zaretskii2010-12-312-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | * admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier2010-12-262-0/+301
| | | | | | | | some revisions (e.g. from emacs-23 to trunk).
* | Remove EXPLICIT_SIGN_EXTEND.Andreas Schwab2010-12-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se.Chong Yidong2010-12-032-4/+1
| |
* | Remove EXPLICIT_SIGN_EXTEND.Andreas Schwab2010-12-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge changes from emacs-23 branchChong Yidong2010-11-271-3/+3
|\ \ | |/
| * bugtracker: REALLY correct locations of bzr *.conf files.Eli Zaretskii2010-11-221-1/+1
| |
| * bugtracker: Correct locations of bzr *.conf files.Eli Zaretskii2010-11-211-2/+2
| |
* | Merge from emacs-23Stefan Monnier2010-11-171-7/+32
|\ \ | |/
| * The `fixes' attribute does show in `bzr log'.Eli Zaretskii2010-11-121-4/+4
| |
| * Expand and clarify the description of bugtracker setting for bzr.Eli Zaretskii2010-11-121-1/+24
| |
| * Comments related to `bzr commit --fixes'.Glenn Morris2010-11-091-2/+4
| |
| * Fix typos in docstrings, comments and ChangeLogs.Juanma Barranquero2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Notes about elpa.gnu.org for maintainers.Chong Yidong2010-11-041-0/+42
| |
* | * admin/notes/bugtracker: Mention "found".Glenn Morris2010-10-301-0/+8
| |