mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-28 19:42:02 +00:00
merge master
This commit is contained in:
jave
commit
db4613576d
40
.gitattributes
vendored
Normal file
40
.gitattributes
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
# 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
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,6 +1,6 @@
|
||||
# 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.
|
||||
|
||||
|
||||
10
CONTRIBUTE
10
CONTRIBUTE
@ -180,10 +180,12 @@ by following links from http://savannah.gnu.org/mail/?group=emacs .
|
||||
|
||||
Any change that matters to end-users should have an entry in etc/NEWS.
|
||||
|
||||
Think about whether your change requires updating the documentation
|
||||
(both manuals and doc-strings). If you know it does not, mark the NEWS
|
||||
entry with "---". If you know that *all* the necessary documentation
|
||||
updates have been made, mark the entry with "+++". Otherwise do not mark it.
|
||||
Doc-strings should be updated together with the code.
|
||||
|
||||
Think about whether your change requires updating the manuals. If you
|
||||
know it does not, mark the NEWS entry with "---". If you know
|
||||
that *all* the necessary documentation updates have been made, mark
|
||||
the entry with "+++". Otherwise do not mark it.
|
||||
|
||||
** Understanding Emacs Internals.
|
||||
|
||||
|
||||
32
ChangeLog
32
ChangeLog
@ -1,3 +1,33 @@
|
||||
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix copyright years by hand
|
||||
These are dates that admin/update-copyright did not update, or
|
||||
updated incorrectly. Also, back out the copyright-date change to
|
||||
doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
|
||||
|
||||
Update copyright year to 2015
|
||||
Run admin/update-copyright.
|
||||
|
||||
Merge from gnulib, incorporating:
|
||||
2015-01-01 version-etc: new year
|
||||
|
||||
* .gitattributes: New file.
|
||||
|
||||
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* autogen.sh: Port better to non-GNU 'cp'.
|
||||
Problem reported by Han Boetes.
|
||||
|
||||
2014-12-31 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Less 'make' chatter at top level
|
||||
* 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, copied from src/Makefile.in.
|
||||
($(srcdir)/src/config.in, ${srcdir}/info/dir):
|
||||
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
|
||||
@ -14524,7 +14554,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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
3
INSTALL
3
INSTALL
@ -1,5 +1,6 @@
|
||||
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.
|
||||
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
25
Makefile.in
25
Makefile.in
@ -1,6 +1,6 @@
|
||||
### @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.
|
||||
|
||||
@ -94,6 +94,19 @@ configuration=@configuration@
|
||||
### The nt/ subdirectory gets built only for MinGW
|
||||
NTDIR=@NTDIR@
|
||||
|
||||
# 'make' verbosity.
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
|
||||
# ==================== Where To Install Things ====================
|
||||
|
||||
# Location to install Emacs.app under GNUstep / Mac OS X.
|
||||
@ -441,11 +454,11 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
|
||||
@ # because stamp-h.in has changed (since building stamp-h.in
|
||||
@ # refreshes config.in as well), but if config.in is missing
|
||||
@ # then we really need to do something more.
|
||||
[ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
|
||||
$(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER))
|
||||
$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
|
||||
cd ${srcdir} && ${AUTOHEADER}
|
||||
rm -f $(srcdir)/src/stamp-h.in
|
||||
echo timestamp > $(srcdir)/src/stamp-h.in
|
||||
rm -f $@
|
||||
echo timestamp > $@
|
||||
|
||||
# ==================== Installation ====================
|
||||
|
||||
@ -964,8 +977,8 @@ info_dir_deps = \
|
||||
## but then we would need to depend on info-real, which would
|
||||
## slow down parallelization.
|
||||
${srcdir}/info/dir: ${info_dir_deps}
|
||||
${MKDIR_P} ${srcdir}/info
|
||||
tempfile=info-dir.$$$$; \
|
||||
$(AM_V_at)${MKDIR_P} ${srcdir}/info
|
||||
$(AM_V_GEN)tempfile=info-dir.$$$$; \
|
||||
rm -f $${tempfile}; \
|
||||
(cd ${srcdir}/doc && \
|
||||
AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
|
||||
|
||||
2
README
2
README
@ -1,4 +1,4 @@
|
||||
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.
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
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-24 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* authors.el (authors-obsolete-files-regexps)
|
||||
@ -2502,7 +2520,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.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
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.
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* 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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#! /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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#! /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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; 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>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
### @configure_input@
|
||||
|
||||
## Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||||
|
||||
## This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
;;; c.by -- LL grammar for C/C++ language specification
|
||||
;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
|
||||
;;
|
||||
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
||||
;; David Ponce <david@dponce.com>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
|
||||
;;
|
||||
;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
;;
|
||||
;; Author: David Ponce <david@dponce.com>
|
||||
;; Maintainer: David Ponce <david@dponce.com>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; java-tags.wy -- Semantic LALR grammar for Java
|
||||
|
||||
;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
;;
|
||||
;; Author: David Ponce <david@dponce.com>
|
||||
;; Maintainer: David Ponce <david@dponce.com>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; javascript-jv.wy -- LALR grammar for Javascript
|
||||
|
||||
;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1998-2011 Ecma International.
|
||||
|
||||
;; Author: Joakim Verona
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; make.by -- BY notation for Makefiles.
|
||||
|
||||
;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
|
||||
;;
|
||||
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
||||
;; David Ponce <david@dponce.com>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; python.wy -- LALR grammar for Python
|
||||
|
||||
;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
|
||||
;; 2009, 2010 Python Software Foundation; All Rights Reserved
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; scheme.by -- Scheme BNF language specification
|
||||
|
||||
;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; srecode-template.wy --- Semantic Recoder Template parser
|
||||
|
||||
;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Eric Ludlam <zappo@gnu.org>
|
||||
;; Keywords: syntax
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Build Emacs with various options for profiling, debugging,
|
||||
# with and without warnings enabled etc.
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
# admin/merge-gnulib
|
||||
|
||||
# Copyright 2012-2014 Free Software Foundation, Inc.
|
||||
# Copyright 2012-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
# admin/merge-pkg-config
|
||||
|
||||
# Copyright 2014 Free Software Foundation, Inc.
|
||||
# Copyright 2014-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2007-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-*- outline -*-
|
||||
|
||||
Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-*- coding: utf-8; mode: text; -*-
|
||||
|
||||
Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2007-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
From README.multi-tty in the multi-tty branch.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-*-mode: text; coding: utf-8;-*-
|
||||
|
||||
Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
Importing a new Unicode Standard version into Emacs
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-*- outline -*-
|
||||
|
||||
Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
NOTES FOR EMACS WWW PAGES
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
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.
|
||||
|
||||
Emacs for Windows
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
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.
|
||||
|
||||
Precompiled Distributions of
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
|
||||
|
||||
## Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
||||
|
||||
## Author: Miles Bader <miles@gnu.org>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
### @configure_input@
|
||||
|
||||
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2012-2015 Free Software Foundation, Inc.
|
||||
|
||||
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
# National Institute of Advanced Industrial Science and Technology (AIST)
|
||||
@ -31,6 +31,19 @@ EMACS = ${top_builddir}/src/emacs
|
||||
unidir = ${top_srcdir}/lisp/international
|
||||
emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
|
||||
|
||||
# 'make' verbosity.
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
|
||||
.PHONY: all unifiles
|
||||
|
||||
all: ${top_srcdir}/src/macuvs.h unifiles
|
||||
@ -40,28 +53,31 @@ all: ${top_srcdir}/src/macuvs.h unifiles
|
||||
## Same with charprop.el below.
|
||||
${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
|
||||
${srcdir}/uvs.elc
|
||||
${emacs} -L ${srcdir} -l uvs \
|
||||
$(AM_V_GEN)${emacs} -L ${srcdir} -l uvs \
|
||||
--eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \
|
||||
> $@
|
||||
|
||||
%.elc: %.el
|
||||
${emacs} -f batch-byte-compile $<
|
||||
$(AM_V_GEN)${emacs} -f batch-byte-compile $<
|
||||
|
||||
unidata.txt: ${srcdir}/UnicodeData.txt
|
||||
sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@
|
||||
$(AM_V_GEN)sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' \
|
||||
< $< > $@
|
||||
|
||||
FORCE =
|
||||
FORCE:
|
||||
.PHONY: FORCE
|
||||
PHONY_EXTRAS =
|
||||
.PHONY: $(PHONY_EXTRAS)
|
||||
|
||||
${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el \
|
||||
${unidir}/charprop.el: ${srcdir}/unidata-gen.el \
|
||||
${srcdir}/UnicodeData.txt ${srcdir}/BidiMirroring.txt \
|
||||
${srcdir}/BidiBrackets.txt | \
|
||||
${srcdir}/unidata-gen.elc unidata.txt
|
||||
-if [ -f "$@" ]; then \
|
||||
cd ${unidir} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
|
||||
fi
|
||||
${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
|
||||
ifneq (,$(wildcard $@))
|
||||
$(AM_V_at)cd $(unidir) && \
|
||||
for f in charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; do \
|
||||
[ ! -f $$f ] || [ -w $$f ] || chmod +w $$f || exit; \
|
||||
done
|
||||
endif
|
||||
$(AM_V_GEN)${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
|
||||
${srcdir} "${unidir}"
|
||||
|
||||
## Check for deleted uni- files, and if any such, force a rebuild.
|
||||
@ -69,8 +85,8 @@ ${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el \
|
||||
## to generate a Makefile fragment explicitly listing the uni- files,
|
||||
## which this file could include. If no fragment, rebuild everything.
|
||||
unifiles: ${unidir}/charprop.el
|
||||
for f in `sed -n 's/^;; FILE: //p' < $<`; do \
|
||||
[ -f ${unidir}/$$f ] || { ${MAKE} $< FORCE=FORCE || exit 1; break; };\
|
||||
$(AM_V_GEN)for f in `sed -n 's/^;; FILE: //p' < $<`; do \
|
||||
[ -f $(unidir)/$$f ] || exec $(MAKE) PHONY_EXTRAS=$< $<; \
|
||||
done
|
||||
|
||||
.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
|
||||
@ -90,7 +106,7 @@ maintainer-clean: distclean
|
||||
## Cf leim/ja-dic (which is much slower).
|
||||
extraclean:
|
||||
rm -f ${top_srcdir}/src/macuvs.h
|
||||
if test -f ${unidir}/charprop.el; then \
|
||||
(cd ${unidir} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
|
||||
rm -f ${unidir}/charprop.el; \
|
||||
fi
|
||||
ifneq (,$(wildcard $(unidir)/charprop.el))
|
||||
cd $(unidir) && \
|
||||
rm -f `sed -n 's/^;; FILE: //p' < charprop.el` charprop.el
|
||||
endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;; unidata-gen.el -- Create files containing character property data.
|
||||
|
||||
;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
;; National Institute of Advanced Industrial Science and Technology (AIST)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts.
|
||||
|
||||
;; Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2014-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# By default, this script uses the local-time calendar year.
|
||||
# Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
|
||||
|
||||
# Copyright 2013-2014 Free Software Foundation, Inc.
|
||||
# Copyright 2013-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
@ -37,7 +37,7 @@ export UPDATE_COPYRIGHT_USE_INTERVALS
|
||||
: ${UPDATE_COPYRIGHT_YEAR=$(date +%Y)}
|
||||
export UPDATE_COPYRIGHT_YEAR
|
||||
|
||||
emacsver=etc/refcards/emacsver.tex
|
||||
emacsver=etc/refcards/emacsver.tex.in
|
||||
sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \
|
||||
$emacsver >$emacsver.aux &&
|
||||
{ cmp -s $emacsver $emacsver.aux ||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
### update_autogen - update some auto-generated files in the Emacs tree
|
||||
|
||||
## Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2011-2015 Free Software Foundation, Inc.
|
||||
|
||||
## Author: Glenn Morris <rgm@gnu.org>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
### autogen.sh - tool to help build Emacs from a repository checkout
|
||||
|
||||
## Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2011-2015 Free Software Foundation, Inc.
|
||||
|
||||
## Author: Glenn Morris <rgm@gnu.org>
|
||||
## Maintainer: emacs-devel@gnu.org
|
||||
@ -237,7 +237,7 @@ if test -d .git/hooks; then
|
||||
*--backup*--verbose*)
|
||||
cp_options='--backup=numbered --verbose';;
|
||||
*)
|
||||
cp_options='';;
|
||||
cp_options='-f';;
|
||||
esac
|
||||
|
||||
if test -n "$tailored_hooks"; then
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Check the format of GNU Emacs change log entries.
|
||||
|
||||
# Copyright 2014 Free Software Foundation, Inc.
|
||||
# Copyright 2014-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Check file names in git commits for GNU Emacs.
|
||||
|
||||
# Copyright 2014 Free Software Foundation, Inc.
|
||||
# Copyright 2014-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
### make-info-dir - create info/dir, for systems without install-info
|
||||
|
||||
## Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||||
|
||||
## Author: Glenn Morris <rgm@gnu.org>
|
||||
## Maintainer: emacs-devel@gnu.org
|
||||
|
||||
@ -8,7 +8,7 @@ VERSION='2012-01-06 07:23'; # UTC
|
||||
# If you change this file with Emacs, please let the write hook
|
||||
# do its job. Otherwise, update this string manually.
|
||||
|
||||
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Convert a MSYS path list to Windows-native format.
|
||||
# Status is zero if successful, nonzero otherwise.
|
||||
|
||||
# Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* A C macro for declaring that specific arguments must not be NULL.
|
||||
Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* C++ compatible function declaration macros.
|
||||
Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* A C macro for emitting warnings if a function is used.
|
||||
Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published
|
||||
|
||||
@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
|
||||
|
||||
my $VERSION = '2013-01-03.09:41'; # UTC
|
||||
|
||||
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Write into $1/subdirs.el a list of subdirs of directory $1.
|
||||
|
||||
# Copyright (C) 1994-1995, 1997, 1999, 2001-2014 Free Software
|
||||
# Copyright (C) 1994-1995, 1997, 1999, 2001-2015 Free Software
|
||||
# Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@echo off
|
||||
rem ----------------------------------------------------------------------
|
||||
rem Configuration script for MSDOS
|
||||
rem Copyright (C) 1994-1999, 2001-2014 Free Software Foundation, Inc.
|
||||
rem Copyright (C) 1994-1999, 2001-2015 Free Software Foundation, Inc.
|
||||
|
||||
rem This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ dnl autoconf
|
||||
dnl in the directory containing this script.
|
||||
dnl If you changed any AC_DEFINES, also run autoheader.
|
||||
dnl
|
||||
dnl Copyright (C) 1994-1996, 1999-2014 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1994-1996, 1999-2015 Free Software Foundation, Inc.
|
||||
dnl
|
||||
dnl This file is part of GNU Emacs.
|
||||
dnl
|
||||
@ -4685,7 +4685,7 @@ fi
|
||||
|
||||
version=$PACKAGE_VERSION
|
||||
|
||||
copyright="Copyright (C) 2014 Free Software Foundation, Inc."
|
||||
copyright="Copyright (C) 2015 Free Software Foundation, Inc."
|
||||
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
|
||||
[Short copyright string for this version of Emacs.])
|
||||
AC_SUBST(copyright)
|
||||
@ -5009,7 +5009,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
|
||||
|
||||
AH_TOP([/* GNU Emacs site configuration template file.
|
||||
|
||||
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2014
|
||||
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2015
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
2014-12-31 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Less 'make' chatter for Emacs doc
|
||||
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
|
||||
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
|
||||
(ENVADD, $(buildinfodir)/emacs.info, emacs.html):
|
||||
Use them.
|
||||
|
||||
2014-12-27 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* buffers.texi (Kill Buffer): Improve indexing.
|
||||
@ -10859,7 +10867,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.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
### @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1996-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
@ -73,8 +73,15 @@ TEXI2DVI = texi2dvi
|
||||
TEXI2PDF = texi2pdf
|
||||
DVIPS = dvips
|
||||
|
||||
# 'make' verbosity.
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
|
||||
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
|
||||
ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
|
||||
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
|
||||
|
||||
DVI_TARGETS = emacs.dvi emacs-xtra.dvi
|
||||
@ -162,7 +169,7 @@ ${buildinfodir}:
|
||||
# There is no provision for Info files to exist in the build directory.
|
||||
# In a distribution of Emacs, the Info files should be up to date.
|
||||
$(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir}
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
|
||||
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
|
||||
|
||||
emacs.dvi: ${EMACSSOURCES}
|
||||
$(ENVADD) $(TEXI2DVI) $<
|
||||
@ -171,7 +178,7 @@ emacs.pdf: ${EMACSSOURCES}
|
||||
$(ENVADD) $(TEXI2PDF) $<
|
||||
|
||||
emacs.html: ${EMACSSOURCES}
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
|
||||
$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
|
||||
|
||||
emacs-xtra.dvi: $(EMACS_XTRA)
|
||||
$(ENVADD) $(TEXI2DVI) $<
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Abbrevs
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@c -*- coding: utf-8 -*-
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1994-1997, 1999-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 1994-1997, 1999-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@node Acknowledgments
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2005-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
|
||||
@node Antinews
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Basic
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Buffers
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Building
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Calendar/Diary
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Emacs Invocation
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@iftex
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Customization
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Dired
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
|
||||
@c See file emacs.texi for copying conditions.
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
@copying
|
||||
This manual describes specialized features of Emacs.
|
||||
|
||||
Copyright @copyright{} 2004--2014 Free Software Foundation, Inc.
|
||||
Copyright @copyright{} 2004--2015 Free Software Foundation, Inc.
|
||||
|
||||
@quotation
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
|
||||
@ -26,7 +26,7 @@ This is the @cite{GNU Emacs Manual},
|
||||
@end ifnottex
|
||||
updated for Emacs version @value{EMACSVER}.
|
||||
|
||||
Copyright @copyright{} 1985--1987, 1993--2014 Free Software Foundation, Inc.
|
||||
Copyright @copyright{} 1985--1987, 1993--2015 Free Software Foundation, Inc.
|
||||
|
||||
@quotation
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@iftex
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Files
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Fixit
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Frames
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Glossary
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c
|
||||
@c Permission is granted to anyone to make or distribute verbatim copies
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Help
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Indentation
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Keyboard Macros
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node M-x
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Mac OS / GNUstep
|
||||
@appendix Emacs and Mac OS / GNUstep
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual., Abbrevs, This is part of the Emacs manual., Top
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Maintaining
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#### -*- Makefile -*- for the Emacs Manual
|
||||
|
||||
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Mark
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Minibuffer
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014
|
||||
@c Free Software Foundation, Inc.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@iftex
|
||||
@chapter Miscellaneous Commands
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
|
||||
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
|
||||
@c Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@node Modes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@c This is part of the Emacs manual.
|
||||
@c Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
@c See file emacs.texi for copying conditions.
|
||||
@c
|
||||
@c This file is included either in emacs-xtra.texi (when producing the
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user