Skip to content

Commit

Permalink
Merge from origin/emacs-26
Browse files Browse the repository at this point in the history 
63b04c1 Fix copyright years by hand
5c7dd8a Update copyright year to 2018
220a9ec Merge from Gnulib
312c565 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289 Allow customization of decoding of "man" command
f824081 * etc/NEWS: Add security consideration note on passphrase ...
0c78822 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c Fix problems with indexing in User manual
b240c78 * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a54 * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028 Improve documentation of 'inhibit-modification-hooks' and ...
7175496 Fix doc string of 'enable-recursive-minibuffers'
5b38406 Fix documentation of delsel and of killing text

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
  • Loading branch information
@eggert
eggert committed Jan 1, 2018
2 parents a5835df + 63b04c1 commit bb267f1
Show file tree
Hide file tree
Showing 2,639 changed files with 2,877 additions and 2,932 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Attributes of Emacs files in the Git repository.

# Copyright 2015-2017 Free Software Foundation, Inc.
# Copyright 2015-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Files that Git should ignore in the Emacs source directory.

# Copyright 2009-2017 Free Software Foundation, Inc.
# Copyright 2009-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2017 Free Software Foundation, Inc.
# Copyright (C) 2017-2018 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14700,7 +14700,7 @@
;; coding: utf-8
;; End:

Copyright (C) 1993-1999, 2001-2017 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes.
;; coding: utf-8
;; End:

Copyright (C) 2015-2017 Free Software Foundation, Inc.
Copyright (C) 2015-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51296,7 +51296,7 @@ See ChangeLog.1 for earlier changes.
;; coding: utf-8
;; End:

Copyright (C) 2015-2017 Free Software Foundation, Inc.
Copyright (C) 2015-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build Emacs from a fresh tarball or version-control checkout.

# Copyright (C) 2011-2017 Free Software Foundation, Inc.
# Copyright (C) 2011-2018 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996-1997, 2000-2017 Free Software Foundation,
Copyright (C) 1992, 1994, 1996-1997, 2000-2018 Free Software Foundation,
Inc.
See the end of the file for license conditions.

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.REPO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ never platform-specific.



Copyright (C) 2002-2017 Free Software Foundation, Inc.
Copyright (C) 2002-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### @configure_input@

# Copyright (C) 1992-2017 Free Software Foundation, Inc.
# Copyright (C) 1992-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.


Expand Down
2 changes: 1 addition & 1 deletion admin/ChangeLog.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2577,7 +2577,7 @@
;; coding: utf-8
;; End:

Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/README
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.


Expand Down
2 changes: 1 addition & 1 deletion admin/admin.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; admin.el --- utilities for Emacs administration

;; Copyright (C) 2001-2017 Free Software Foundation, Inc.
;; Copyright (C) 2001-2018 Free Software Foundation, Inc.

;; This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/alloc-colors.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Allocate X colors. Used for testing with dense colormaps.

Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.

This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/authors.el
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

;;; authors.el --- utility for maintaining Emacs's AUTHORS file

;; Copyright (C) 2000-2017 Free Software Foundation, Inc.
;; Copyright (C) 2000-2018 Free Software Foundation, Inc.

;; Author: Gerd Moellmann <gerd@gnu.org>
;; Maintainer: emacs-devel@gnu.org
Expand Down
2 changes: 1 addition & 1 deletion admin/build-configs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# Build Emacs in several different configurations.

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/bzrmerge.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; bzrmerge.el --- help merge one Emacs bzr branch to another

;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
;; Copyright (C) 2010-2018 Free Software Foundation, Inc.

;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint
Expand Down
2 changes: 1 addition & 1 deletion admin/charsets/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### @configure_input@

# Copyright (C) 2015-2017 Free Software Foundation, Inc.
# Copyright (C) 2015-2018 Free Software Foundation, Inc.

# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
Expand Down
2 changes: 1 addition & 1 deletion admin/charsets/mapconv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# Copyright (C) 2015-2017 Free Software Foundation, Inc.
# Copyright (C) 2015-2018 Free Software Foundation, Inc.

# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
Expand Down
2 changes: 1 addition & 1 deletion admin/charsets/mapfiles/README
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2009-2017 Free Software Foundation, Inc.
Copyright (C) 2009-2018 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
Expand Down
2 changes: 1 addition & 1 deletion admin/cus-test.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cus-test.el --- tests for custom types and load problems

;; Copyright (C) 1998, 2000, 2002-2017 Free Software Foundation, Inc.
;; Copyright (C) 1998, 2000, 2002-2018 Free Software Foundation, Inc.

;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
Expand Down
2 changes: 1 addition & 1 deletion admin/diff-tar-files
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/find-gc.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; find-gc.el --- detect functions that call the garbage collector

;; Copyright (C) 1992, 2001-2017 Free Software Foundation, Inc.
;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.

;; Maintainer: emacs-devel@gnu.org

Expand Down
2 changes: 1 addition & 1 deletion admin/gitmerge.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; gitmerge.el --- help merge one Emacs branch into another

;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
;; Copyright (C) 2010-2018 Free Software Foundation, Inc.

;; Authors: David Engster <deng@randomsample.de>
;; Stefan Monnier <monnier@iro.umontreal.ca>
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### @configure_input@

## Copyright (C) 2013-2017 Free Software Foundation, Inc.
## Copyright (C) 2013-2018 Free Software Foundation, Inc.

## This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/c.by
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
;;; c.by -- LL grammar for C/C++ language specification
;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/grammar.wy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
;;
;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/java-tags.wy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; java-tags.wy -- Semantic LALR grammar for Java

;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/js.wy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; javascript-jv.wy -- LALR grammar for Javascript

;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
;; Copyright (C) 1998-2011 Ecma International.

;; Author: Joakim Verona
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/make.by
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; make.by -- BY notation for Makefiles.

;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>
Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/python.wy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; python.wy -- LALR grammar for Python

;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009, 2010 Python Software Foundation; All Rights Reserved

Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/scheme.by
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; scheme.by -- Scheme BNF language specification

;; Copyright (C) 2001-2017 Free Software Foundation, Inc.
;; Copyright (C) 2001-2018 Free Software Foundation, Inc.

;; This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/grammars/srecode-template.wy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; srecode-template.wy --- Semantic Recoder Template parser

;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
;; Copyright (C) 2005-2018 Free Software Foundation, Inc.

;; Author: Eric Ludlam <zappo@gnu.org>
;; Keywords: syntax
Expand Down
2 changes: 1 addition & 1 deletion admin/last-chance.el
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*-

;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
;; Copyright (C) 2016-2018 Free Software Foundation, Inc.

;; Author: Thien-Thi Nguyen <ttn@gnu.org>
;; Maintainer: emacs-devel@gnu.org
Expand Down
2 changes: 1 addition & 1 deletion admin/make-emacs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Build Emacs with various options for profiling, debugging,
# with and without warnings enabled etc.

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/merge-gnulib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# admin/merge-gnulib

# Copyright 2012-2017 Free Software Foundation, Inc.
# Copyright 2012-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/merge-pkg-config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# admin/merge-pkg-config

# Copyright 2014-2017 Free Software Foundation, Inc.
# Copyright 2014-2018 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/notes/copyright
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2007-2017 Free Software Foundation, Inc.
Copyright (C) 2007-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.


Expand Down
2 changes: 1 addition & 1 deletion admin/notes/font-backend
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2002-2017 Free Software Foundation, Inc.
Copyright (C) 2002-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.


Expand Down
2 changes: 1 addition & 1 deletion admin/notes/hydra
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-*- mode: outline; coding: utf-8 -*-

Copyright (C) 2013-2017 Free Software Foundation, Inc.
Copyright (C) 2013-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
Expand Down
2 changes: 1 addition & 1 deletion admin/notes/multi-tty
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-*- coding: utf-8; mode: text; -*-

Copyright (C) 2007-2017 Free Software Foundation, Inc.
Copyright (C) 2007-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

From README.multi-tty in the multi-tty branch.
Expand Down
2 changes: 1 addition & 1 deletion admin/notes/unicode
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-*-mode: text; coding: utf-8;-*-

Copyright (C) 2002-2017 Free Software Foundation, Inc.
Copyright (C) 2002-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

Importing a new Unicode Standard version into Emacs
Expand Down
2 changes: 1 addition & 1 deletion admin/notes/www
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-*- outline -*-

Copyright (C) 2013-2017 Free Software Foundation, Inc.
Copyright (C) 2013-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

NOTES FOR EMACS WWW PAGES
Expand Down
2 changes: 1 addition & 1 deletion admin/nt/README-UNDUMP.W32
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

Emacs for Windows
Expand Down
2 changes: 1 addition & 1 deletion admin/nt/README-ftp-server
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copyright (C) 2001-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.

Precompiled Distributions of
Expand Down
2 changes: 1 addition & 1 deletion admin/nt/dist-build/build-dep-zips.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python3

## Copyright (C) 2017 Free Software Foundation, Inc.
## Copyright (C) 2017-2018 Free Software Foundation, Inc.

## This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/nt/dist-build/build-zips.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

## Copyright (C) 2017 Free Software Foundation, Inc.
## Copyright (C) 2017-2018 Free Software Foundation, Inc.

## This file is part of GNU Emacs.

Expand Down
2 changes: 1 addition & 1 deletion admin/quick-install-emacs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly

## Copyright (C) 2001-2017 Free Software Foundation, Inc.
## Copyright (C) 2001-2018 Free Software Foundation, Inc.

## Author: Miles Bader <miles@gnu.org>

Expand Down
2 changes: 1 addition & 1 deletion admin/unidata/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### @configure_input@

# Copyright (C) 2012-2017 Free Software Foundation, Inc.
# Copyright (C) 2012-2018 Free Software Foundation, Inc.

# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
Expand Down
Loading

0 comments on commit bb267f1

Please sign in to comment.