Commit 88bc8332 authored by K. Handa's avatar K. Handa
Browse files

Merge branch master of git.sv.gnu.org:/srv/git/emacs.

parents 3f79d313 95295df4

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
# Attributes of Emacs files in the Git repository.
# Copyright 2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# A few files use CRLF endings, even on non-Microsoft platforms.
# Do not warn about trailing whitespace with these files.
*.bat -whitespace
admin/charsets/mapfiles/PTCP154 -whitespace
leim/MISC-DIC/cangjie-table.b5 -whitespace
leim/MISC-DIC/cangjie-table.cns -whitespace
leim/MISC-DIC/pinyin.map -whitespace
lib-src/update-game-score.exe.manifest -whitespace
nt/nmake.defs -whitespace
# Some files should not be treated as text when diffing or merging.
*.gpg binary
*.gz binary
*.icns binary
*.ico binary
*.pbm binary
*.pdf binary
*.png binary
*.sig binary
*.tiff binary
test/automated/data/decompress/foo-gzipped binary
# Files that Git should ignore in the Emacs source directory.
# Copyright 2009-2014 Free Software Foundation, Inc.
# Copyright 2009-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
......
2015-01-06 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib
* lib/stdio.in.h, m4/stdio_h.m4: Update from gnulib, incorporating:
2015-01-05 stdio: fix use of PRIdMAX on modern mingw
2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
* INSTALL: Mention 'make WERROR_CFLAGS='.
Clarify 'make info'
* Makefile.in (info): Use GNU make conditional rather than
an '@' rule with a shell conditional, so that the builder can
see the submake.
Less 'make' chatter for VCSWITNESS
* Makefile.in (dirstate, VCSWITNESS): New macros.
(src): Use them to lessen 'make' chatter.
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2015-01-01 version-etc: new year
* .gitattributes: New file.
* autogen.sh: Port better to non-GNU 'cp'. Reported by Han Boetes.
2014-12-31 Paul Eggert <eggert@cs.ucla.edu>
Less 'make' chatter at top level
......@@ -8,39 +36,6 @@
Be less chatty when not verbose.
($(srcdir)/src/stamp-h.in): Simplify with '$@'.
2014-12-29 Paul Eggert <eggert@cs.ucla.edu>
system-name's returned value can vary
Also, the system-name variable is now obsolete.
Fixes Bug#19438.
* doc/lispref/os.texi (System Environment):
* etc/NEWS: Document this.
* doc/misc/efaq.texi:
(Displaying the current file name in the titlebar):
* lisp/desktop.el (desktop-save-frameset):
* lisp/dnd.el (dnd-get-local-file-uri):
* lisp/gnus/message.el (message-make-fqdn):
* lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers)
(nnvirtual-update-xref-header):
* lisp/nxml/rng-uri.el (rng-uri-file-name-1):
* lisp/org/org-clock.el (org-clock-save):
* src/filelock.c (current_lock_owner):
* src/xrdb.c (get_environ_db):
* src/xterm.c (same_x_server):
* src/xterm.c (x_term_init):
Prefer (system-name) to system-name, and avoid naming
locals 'system-name'.
* doc/misc/smtpmail.texi (Server workarounds): Fix grammar.
* lisp/startup.el (system-name): Now an obsolete variable.
* src/editfns.c (cached_system_name): New static var.
(init_and_cache_system_name): New function.
(init_editfns, Fsystem_name): Use it.
(syms_of_editfns): Initialize it and Vsystem_name to the same value.
* src/sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
(h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
(init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
Don't create a new string if the current value is already correct.
2014-12-28 Paul Eggert <eggert@cs.ucla.edu>
* build-aux/git-hooks/commit-msg: Allow tabs.
......@@ -58,32 +53,9 @@
2014-12-25 Paul Eggert <eggert@cs.ucla.edu>
Prefer stpcpy to strcat
* admin/merge-gnulib (GNULIB_MODULES): Add stpcpy.
Prefer stpcpy to strcat.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stpcpy.c, m4/stpcpy.m4: New files, from gnulib.
* lib-src/ebrowse.c (sym_scope_1, operator_name, open_file):
* lib-src/emacsclient.c (get_server_config, set_local_socket)
(start_daemon_and_retry_set_socket):
* lib-src/etags.c (main, C_entries, relative_filename):
* lib-src/pop.c (sendline):
* lib-src/update-game-score.c (main):
* lwlib/xlwmenu.c (resource_widget_value):
* src/callproc.c (child_setup):
* src/dbusbind.c (xd_signature_cat):
* src/doc.c (get_doc_string, Fsnarf_documentation):
* src/editfns.c (Fuser_full_name):
* src/frame.c (xrdb_get_resource):
* src/gtkutil.c (xg_get_file_with_chooser):
* src/tparam.c (tparam1):
* src/xfns.c (xic_create_fontsetname):
* src/xrdb.c (gethomedir, get_user_db, get_environ_db):
* src/xsmfns.c (smc_save_yourself_CB):
Rewrite to avoid the need for strcat, typically by using stpcpy
and/or lispstpcpy. strcat tends to be part of O(N**2) algorithms.
* src/doc.c (sibling_etc):
* src/xrdb.c (xdefaults):
Now a top-level static constant.
2014-12-24 Stephen Leake <stephen_leake@stephe-leake.org>
......@@ -98,17 +70,12 @@
2014-12-23 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib
Merge from gnulib.
2014-12-20 utimens: remove unnecessary assert
2014-12-16 stdalign: port better to HP compilers
2014-12-16 stdalign: work around Apple GCC 4.0 bug
* lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib.
2014-12-14 Paul Eggert <eggert@cs.ucla.edu>
Spelling fixes. All uses changed.
* src/regex.c (analyze_first): Rename from analyze_first.
2014-12-14 Glenn Morris <rgm@gnu.org>
* make-dist: No more lib-src/grep-changelog.
......@@ -121,22 +88,20 @@
2014-12-13 Paul Eggert <eggert@cs.ucla.edu>
Git ignore lib/std*.h
* .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and
stddef.h. Remove subsumed entries.
Add !lib/std*.in.h, so as to not ignore the .in.h files.
2014-12-13 Paul Eggert <eggert@cs.ucla.edu>
Port commit-msg to mawk
Problem reported by Ted Zlatanov in:
Port commit-msg to mawk. Reported by Ted Zlatanov in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html
* build-aux/git-hooks/commit-msg (space, non_space, non_print):
New vars. Use them as approximations to POSIX bracket expressions,
on implementations like mawk that do not support POSIX regexps.
Improve commit-msg messages and autosquash
Problem reported by Michal Nazarewicz in Bug#19337.
Improve commit-msg messages and autosquash.
Reported by Michal Nazarewicz in Bug#19337.
* build-aux/git-hooks/commit-msg: Add "commit message" to
diagnostics. Distinguish better between tabs and other
unprintable chars in diagnostics. Don't complain if a prefix
......@@ -145,7 +110,7 @@
2014-12-13 Paul Eggert <eggert@cs.ucla.edu>
Port commit-message checking to FreeBSD 9.
This fixes a bug reported by Jan Djärv in:
Reported by Jan Djärv in:
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html
along with some other issues I noticed while testing with FreeBSD.
* build-aux/git-hooks/commit-msg: Prefer gawk if available.
......@@ -160,7 +125,7 @@
2014-12-12 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib
Merge from gnulib.
2014-12-12 stddef: support C11's max_align_t
2014-12-11 unistd: fix iOS check conditional
2014-12-08 apply _GL_ATTRIBUTE_PURE to some inline functions
......@@ -345,7 +310,7 @@
build: port to GCC 4.6.4 + glibc 2.5
On platforms this old, building with _FORTIFY_SOURCE equal to 2
results in duplicate definitions of standard library functions.
Problem reported by Nelson H. F. Beebe.
Reported by Nelson H. F. Beebe.
* configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK.
By default, do not enable this unless GNULIB_PORTCHECK is defined.
This better matches the original intent, which as I recall was to
......@@ -1361,7 +1326,7 @@
Fix problem with MAKE and xcrun configuration.
* configure.ac: Don't set MAKE unless 'make' doesn't work.
Set it only in the environment, not in the makefile.
Problem reported by Glenn Morris in:
Reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html
2013-12-27 Paul Eggert <eggert@cs.ucla.edu>
......@@ -3055,7 +3020,7 @@
(bootstrap): Run ./configure, rather than trying to run config.status
if it exists. That builds src/epaths.h more reliably.
Run autogen/copy_autogen if autogen.sh fails,
to create 'configure'; problem reported by Andreas Schwab in
to create 'configure'. Reported by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
* autogen.sh: Exit with status 1 when failing due to missing tools,
reverting the 2012-09-10 change to this file.
......@@ -4387,8 +4352,7 @@
Check pkg-config exit status when configuring (Bug#10626).
* configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config
works; check its exit status. Problem reported by Jordi Gutiérrez
Hermoso in
works; check its exit status. Reported by Jordi Gutiérrez Hermoso in
<http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00787.html>.
2012-04-07 Glenn Morris <rgm@gnu.org>
......@@ -4546,7 +4510,7 @@
* configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852)
if the library is found. Otherwise, later configure-time tests,
such as the test for pthread_sigmask, generate the wrong results
on some platforms. Problem reported for FreeBSD by Nali Toja.
on some platforms. Reported by Nali Toja for FreeBSD.
2011-10-20 Paul Eggert <eggert@cs.ucla.edu>
......@@ -4777,7 +4741,7 @@
* m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB
test, which runs afoul of Automake installations where, for example,
/usr/share/aclocal contains a copy of gl_THREADLIB.
Problem reported by Sven Joachim in
Reported by Sven Joachim in
<http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
This is just a quick temporary fix, specific to Emacs; I'll work
with the other gnulib maintainers to get a more-permanent fix.
......@@ -5389,7 +5353,7 @@
* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
Sync from gnulib, which has been patched to fix the problem
with the license notices. Problem reported by Glenn Morris in
with the license notices. Reported by Glenn Morris in
<http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
2011-02-09 Stefan Monnier <monnier@iro.umontreal.ca>
......@@ -5543,7 +5507,7 @@
used. The code already assumed two's complement, so there's
no need to test for alternatives. All uses removed.
(TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by
the C standard. Problem reported by Rich Felker in
the C standard. Reported by Rich Felker in
<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00488.html>.
(twos_complement_arithmetic): Also check long_int and time_t.
(time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions.
......@@ -14534,7 +14498,7 @@
;; coding: utf-8
;; End:
Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
# Build Emacs from a fresh tarball or version-control checkout.
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
# Copyright (C) 2011-2015 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
......
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996-1997, 2000-2014 Free Software Foundation, Inc.
Copyright (C) 1992, 1994, 1996-1997, 2000-2015 Free Software Foundation,
Inc.
See the end of the file for license conditions.
......@@ -311,7 +312,9 @@ Use --enable-gcc-warnings to enable compile-time checks that warn
about possibly-questionable C code. This is intended for developers
and is useful with GNU-compatible compilers. On a recent GNU system
there should be no warnings; on older and on non-GNU systems the
generated warnings may still be useful.
generated warnings may still be useful, though you may prefer building
with 'make WERROR_CFLAGS=' so that the warnings are not treated as
errors.
Use --enable-silent-rules to cause 'make' to chatter less. This is
helpful when combined with options like --enable-gcc-warnings that
......
......@@ -62,7 +62,7 @@ never platform-specific.
Copyright (C) 2002-2014 Free Software Foundation, Inc.
Copyright (C) 2002-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
### @configure_input@
# Copyright (C) 1992-2014 Free Software Foundation, Inc.
# Copyright (C) 1992-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
......@@ -389,15 +389,13 @@ lib lib-src lisp nt: Makefile
# repository pull. In git there is no single file that guarantees
# this, but the local log for the current head should be close enough.
#
# Note the use of single quotes in the value of vcswitness.
# This passes an unexpanded $srcdir to src's Makefile, which then
# Pass an unexpanded $srcdir to src's Makefile, which then
# expands it using its own value of srcdir (which points to the
# source directory of src/).
dirstate = .git/logs/HEAD
VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
src: Makefile
dirstate='.git/logs/HEAD'; \
vcswitness='$$(srcdir)/../'$$dirstate; \
[ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \
$(MAKE) -C $@ all VCSWITNESS="$$vcswitness"
$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
blessmail: Makefile src
$(MAKE) -C lib-src maybe-blessmail
......@@ -1045,11 +1043,9 @@ uninstall-ps: $(UNINSTALL_PS)
# and it's not worth it. This case is only relevant if you download a
# release, then change the .texi files.
info:
@if test "$(HAVE_MAKEINFO)" = "no"; then \
echo "Configured --without-makeinfo, not building manuals" ; \
else \
$(MAKE) info-real info-dir; \
fi
ifneq ($(HAVE_MAKEINFO),no)
$(MAKE) info-real info-dir
endif
## build-aux/make-info-dir expects only certain dircategories.
check-info: info
......
Copyright (C) 2001-2014 Free Software Foundation, Inc.
Copyright (C) 2001-2015 Free Software Foundation, Inc.
See the end of the file for license conditions.
......
2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
Less 'make' chatter for admin/grammars
* grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN)
(am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_)
(am__v_at_0, am__v_at_1): New macros, from src/Makefile.in.
(${bovinedir}/%-by.el, ${bovinedir}/scm-by.el)
(${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el)
(${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them.
Less chatter in batch mode
* unidata/unidata-gen.el (unidata-gen-files):
Don't output messages like "Generating ..." in batch mode.
2015-01-02 Paul Eggert <eggert@cs.ucla.edu>
Less 'make' chatter for unidata
* unidata/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0, am__v_at_1):
New macros, from ../src/Makefile.in.
(${top_srcdir}/src/macuvs.h, %.elc, unidata.txt)
(${unidir}/charprop.el, unifiles): Use them.
(PHONY_EXTRAS): New macro.
(.PHONY, ${unidir}/charprop.el): Use it.
(FORCE): Remove; all uses replaced by PHONY_EXTRAS manipulation.
(${unidir}/charprop.el, extraclean):
Use 'make' conditionals rather than shell.
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
* update-copyright (emacsver): Change to emacsver.tex.in.
2014-12-25 Paul Eggert <eggert@cs.ucla.edu>
* merge-gnulib (GNULIB_MODULES): Add stpcpy.
2014-12-24 Glenn Morris <rgm@gnu.org>
* authors.el (authors-obsolete-files-regexps)
......@@ -2502,7 +2538,7 @@
;; coding: utf-8
;; End:
Copyright (C) 2001-2014 Free Software Foundation, Inc.
Copyright (C) 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
Copyright (C) 2001-2014 Free Software Foundation, Inc.
Copyright (C) 2001-2015 Free Software Foundation, Inc.
See the end of the file for license conditions.
......
;;; admin.el --- utilities for Emacs administration
;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
;; Copyright (C) 2001-2015 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
......
/* Allocate X colors. Used for testing with dense colormaps.
Copyright (C) 2001-2014 Free Software Foundation, Inc.
Copyright (C) 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*-
;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
;; Maintainer: Kim F. Storm <storm@cua.dk>
......
#! /usr/bin/perl
# Build Emacs in several different configurations.
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
......
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint
......
Copyright (C) 2009-2014 Free Software Foundation, Inc.
Copyright (C) 2009-2015 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
......
;;; cus-test.el --- tests for custom types and load problems
;; Copyright (C) 1998, 2000, 2002-2014 Free Software Foundation, Inc.
;; Copyright (C) 1998, 2000, 2002-2015 Free Software Foundation, Inc.
;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
......
#! /bin/sh
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
......
;;; find-gc.el --- detect functions that call the garbage collector
;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
;; Copyright (C) 1992, 2001-2015 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
......
;;; gitmerge.el --- help merge one Emacs branch into another
;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
;; Authors: David Engster <deng@randomsample.de>
;; Stefan Monnier <monnier@iro.umontreal.ca>
......
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