Commit a3e44e79 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from mainline.

parents 7f818df9 721be9cd

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
This avoids building ftoastr and ldtoastr, which aren't needed. See
......@@ -104,6 +104,14 @@
* make-dist: Also put into the distribution aclocal.m4,
compile, depcomp, missing, and the files under lib/.
2011-01-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (epaths-force): No more arch-tag to edit.
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
* configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603).
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
* make-dist: Distribute test/ files too.
......@@ -8813,8 +8821,9 @@
;; coding: utf-8
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
......@@ -300,8 +300,7 @@ epaths-force: FRC
-e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
-e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
-e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
-e 's;/[*] *arch-tag:.*;/*;') && \
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
# For parallel make, src should be built before leim.
......
......@@ -382,4 +382,3 @@ wait
write
xfree
# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
Update copyright notes to match recent gnulib-related changes.
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
......@@ -9,6 +9,13 @@
subsumed by m4/*.m4 rule). config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
2011-01-15 Glenn Morris <rgm@gnu.org>
* charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag.
* bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
2011-01-14 Glenn Morris <rgm@gnu.org>
* admin.el (set-copyright): Also handle \year in refcards/*.tex.
......
......@@ -216,4 +216,3 @@ src/xrdb.c
src/xselect.c
src/xterm.c
;;; arch-tag: 869126d4-4851-41b2-8470-14dd492a3c98
......@@ -90,4 +90,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463
......@@ -112,5 +112,3 @@ main (int argc, char **argv)
return 0;
}
/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
(do not change this comment) */
......@@ -97,4 +97,3 @@
# mode: cperl
# End:
# arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30
......@@ -115,7 +115,7 @@ are both lists of revnos, in oldest-first order."
(re-search-forward "^message:\n")
(while (and (not skip)
(re-search-forward
"back[- ]?port\\|merge\\|re-?generate\\|bump version" nil t))
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t))
(let ((str (buffer-substring (line-beginning-position)
(line-end-position))))
(when (string-match "\\` *" str)
......@@ -173,7 +173,8 @@ are both lists of revnos, in oldest-first order."
))
;; Try to resolve the conflicts.
(cond
((member file '("configure" "lisp/ldefs-boot.el"))
((member file '("configure" "lisp/ldefs-boot.el"
"lisp/emacs-lisp/cl-loaddefs.el"))
(call-process "bzr" nil t nil "revert" file)
(revert-buffer nil 'noconfirm))
(t
......
......@@ -307,4 +307,3 @@ install:
clean:
rm -f ${CHARSETS} ${TRANS_TABLE}
# arch-tag: 90b3bf30-1fef-45bf-b30c-665c30c22310
......@@ -70,4 +70,3 @@ function decode_big5(big5) {
}
# arch-tag: 36f08d21-0d24-4b67-852d-a9a51299586d
......@@ -120,4 +120,3 @@ END {
}
}
# arch-tag: 7e6f57c3-8e62-4af3-8916-ca67bca3a0ce
......@@ -52,8 +52,4 @@ END {
print " (setcar x (cdr x)) (setcdr x tmp)))";
print " map)";
print " (define-translation-table 'cp51932-encode map))";
print "";
print ";; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3";
}
# arch-tag: bbae996b-2d1c-4e85-bb55-ac30146d7504
......@@ -114,4 +114,3 @@ END {
}
}
# arch-tag: 998dc444-759d-43ef-87e3-2ab205011394
......@@ -106,8 +106,5 @@ END {
print " (setcar x (cdr x)) (setcdr x tmp)))";
print " map)";
print " (define-translation-table 'eucjp-ms-encode map))";
print "";
print ";; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a";
}
# arch-tag: d9cc7af7-2d6e-48cd-8eed-a6d25226de7c
......@@ -98,4 +98,3 @@ END {
index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
}
# arch-tag: d7dbad89-a512-41a4-8ee0-ba1a4505b8c1
......@@ -120,4 +120,3 @@ END {
}
}
# arch-tag: 8e5a22ae-610e-411f-ae17-d6e528b30d71
......@@ -4,4 +4,3 @@
printf "0x%02X%02X %s\n", ku, ten, $2;
}
# arch-tag: dade6b45-b4c5-42ab-9d49-d6bf23a710b6
......@@ -143,4 +143,3 @@ else
exit 1
fi
# arch-tag: c33acb47-7eb6-4872-b871-15e1447e8f0e
......@@ -54,4 +54,3 @@
(map-charset-chars 'func (cdr elt))
(write-file (car elt))))
;;; arch-tag: 515989d7-2e2d-41cc-9163-05ad472fede4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment