Merge from origin/emacs-26

63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
This commit is contained in:
Paul Eggert 2018-01-01 01:13:04 -08:00
commit bb267f17f9
2639 changed files with 2879 additions and 2934 deletions

2
.gitattributes vendored
View file

@ -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.

2
.gitignore vendored
View file

@ -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.

View file

@ -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.
#

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.
#

View file

@ -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.

View file

@ -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.

View file

@ -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.

2
README
View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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)

View file

@ -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)

View file

@ -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

View file

@ -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>

View file

@ -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.

View file

@ -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

View file

@ -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>

View file

@ -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.

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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

View file

@ -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.

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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.

View file

@ -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.

View file

@ -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>

View file

@ -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)

View file

@ -1,6 +1,6 @@
#!/usr/bin/awk -f
## Copyright (C) 2015-2017 Free Software Foundation, Inc.
## Copyright (C) 2015-2018 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

View file

@ -1,6 +1,6 @@
;; unidata-gen.el -- Create files containing character property data.
;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)

View file

@ -1,6 +1,6 @@
;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts.
;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

View file

@ -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-2017 Free Software Foundation, Inc.
# Copyright 2013-2018 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
### update_autogen - update some auto-generated files in the Emacs tree
## Copyright (C) 2011-2017 Free Software Foundation, Inc.
## Copyright (C) 2011-2018 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

View file

@ -1,7 +1,7 @@
#!/bin/sh
### autogen.sh - tool to help build Emacs from a repository checkout
## Copyright (C) 2011-2017 Free Software Foundation, Inc.
## Copyright (C) 2011-2018 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>
## Maintainer: emacs-devel@gnu.org

View file

@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2017-11-07'
timestamp='2017-12-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -265,6 +265,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Redox:*:*)
echo ${UNAME_MACHINE}-unknown-redox
exit ;;
mips:OSF1:*.*)
echo mips-dec-osf1
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)

View file

@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2017-11-23'
@ -1416,7 +1416,7 @@ case $os in
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)

View file

@ -1,7 +1,7 @@
#!/bin/sh
# Check the format of GNU Emacs change log entries.
# Copyright 2014-2017 Free Software Foundation, Inc.
# Copyright 2014-2018 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
#!/bin/sh
# Check file names in git commits for GNU Emacs.
# Copyright 2014-2017 Free Software Foundation, Inc.
# Copyright 2014-2018 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -9,7 +9,7 @@ my $VERSION = '2017-09-13 06:45'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2008-2017 Free Software Foundation, Inc.
# Copyright (C) 2008-2018 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

View file

@ -2,7 +2,7 @@
# Convert git log output to ChangeLog format for GNU Emacs.
# Copyright (C) 2014-2017 Free Software Foundation, Inc.
# Copyright (C) 2014-2018 Free Software Foundation, Inc.
# Author: Paul Eggert

View file

@ -2,7 +2,7 @@
### make-info-dir - create info/dir, for systems without install-info
## Copyright (C) 2013-2017 Free Software Foundation, Inc.
## Copyright (C) 2013-2018 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>
## Maintainer: emacs-devel@gnu.org

View file

@ -8,7 +8,7 @@ VERSION='2017-09-13 06:45'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
# Copyright (C) 2002-2018 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

View file

@ -2,7 +2,7 @@
# Convert a MSYS path list to Windows-native format.
# Status is zero if successful, nonzero otherwise.
# Copyright (C) 2013-2017 Free Software Foundation, Inc.
# Copyright (C) 2013-2018 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

View file

@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"'
my $VERSION = '2017-09-13.06:45'; # UTC
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
# Copyright (C) 2009-2018 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

View file

@ -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-2017 Free Software
# Copyright (C) 1994-1995, 1997, 1999, 2001-2018 Free Software
# Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994-1999, 2001-2017 Free Software Foundation, Inc.
rem Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

View file

@ -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-2017 Free Software Foundation, Inc.
dnl Copyright (C) 1994-1996, 1999-2018 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
dnl
@ -4984,7 +4984,7 @@ fi
version=$PACKAGE_VERSION
copyright="Copyright (C) 2017 Free Software Foundation, Inc."
copyright="Copyright (C) 2018 Free Software Foundation, Inc."
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
[Short copyright string for this version of Emacs.])
AC_SUBST(copyright)
@ -5317,7 +5317,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2017
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2018
Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -10919,7 +10919,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.

View file

@ -1,6 +1,6 @@
### @configure_input@
# Copyright (C) 1994, 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1994, 1996-2018 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Abbrevs
@ -418,12 +418,11 @@ match in case. If the value is @code{case-fold-search} (the default),
then the variable @code{case-fold-search} controls whether to ignore
case while searching for expansions (@pxref{Lax Search}).
@vindex dabbrev-case-replace
Normally, dynamic abbrev expansion preserves the case pattern
@emph{of the dynamic abbrev you are expanding}, by converting the
expansion to that case pattern.
@vindex dabbrev-case-fold-search
@vindex dabbrev-case-replace
The variable @code{dabbrev-case-replace} controls whether to
preserve the case pattern of the dynamic abbrev. If it is @code{t},
the dynamic abbrev's case pattern is preserved in most cases; if it is

View file

@ -1,6 +1,6 @@
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1994-1997, 1999-2017 Free Software Foundation, Inc.
@c Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@node Acknowledgments

View file

@ -1,6 +1,6 @@
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 2005-2017 Free Software Foundation, Inc.
@c Copyright (C) 2005-2018 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Antinews

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2017 Free Software Foundation, Inc.
@c Copyright (C) 2004-2018 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

View file

@ -1,6 +1,6 @@
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic
@ -109,8 +109,8 @@ just like digits. Case is ignored.
@cindex Unicode characters, inserting
@cindex insert Unicode character
@cindex characters, inserting by name or code-point
@cindex curly quotes
@cindex curved quotes
@cindex curly quotes, inserting
@cindex curved quotes, inserting
A few common Unicode characters can be inserted via a command
starting with @kbd{C-x 8}. For example, @kbd{C-x 8 [} inserts @t{}
which is Unicode code-point @code{U+2018} LEFT SINGLE QUOTATION MARK,
@ -118,8 +118,8 @@ sometimes called a left single ``curved quote'' or ``curly quote''.
Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the
curved quotes @t{}, @t{“} and @t{”}, respectively. Also, a working
Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [}
and inserts @t{}. To see which characters have @kbd{C-x 8}
shorthands, type @kbd{C-x 8 C-h}.
and inserts `. To see which characters have @kbd{C-x 8} shorthands,
type @kbd{C-x 8 C-h}.
Alternatively, you can use the command @kbd{C-x 8 @key{RET}}
(@code{insert-char}). This prompts for the Unicode name or code-point
@ -242,9 +242,7 @@ Move to the beginning of the line (@code{move-beginning-of-line}).
Move to the end of the line (@code{move-end-of-line}).
@item M-f
@kindex M-f
@findex forward-word
Move forward one word (@code{forward-word}).
Move forward one word (@code{forward-word}). @xref{Words}.
@item C-@key{RIGHT}
@itemx M-@key{RIGHT}
@ -256,9 +254,7 @@ moves @emph{backward} by one word if the current paragraph is
right-to-left. @xref{Bidirectional Editing}.
@item M-b
@kindex M-b
@findex backward-word
Move backward one word (@code{backward-word}).
Move backward one word (@code{backward-word}). @xref{Words}.
@item C-@key{LEFT}
@itemx M-@key{LEFT}
@ -590,7 +586,6 @@ earlier, @kbd{C-n} (@code{next-line}) and @kbd{C-p}
(@code{previous-line}) are special exceptions: they move point down
and up, respectively, by one screen line (@pxref{Moving Point}).
@cindex truncation
@cindex line truncation, and fringes
Emacs can optionally @dfn{truncate} long logical lines instead of
continuing them. This means that every logical line occupies a single
@ -607,7 +602,6 @@ before they get too long, by inserting newlines. If you prefer, you
can make Emacs insert a newline automatically when a line gets too
long, by using Auto Fill mode. @xref{Filling}.
@cindex word wrap
Sometimes, you may need to edit files containing many long logical
lines, and it may not be practical to break them all up by adding
newlines. In that case, you can use Visual Line mode, which enables

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Buffers
@ -144,7 +144,7 @@ b} commands get the window and/or frame to display in.
file, can also be used to switch to an existing file-visiting buffer.
@xref{Visiting}.
@findex goto-line
@findex goto-line@r{, with an argument}
@kbd{C-u M-g M-g}, that is @code{goto-line} with a plain prefix
argument, reads a number @var{n} using the minibuffer, selects the
most recently selected buffer other than the current buffer in another
@ -454,7 +454,7 @@ Toggle the buffer's read-only status
@item t
@findex Buffer-menu-visit-tags-table
@kindex % @r{(Buffer Menu)}
@kindex t @r{(Buffer Menu)}
Visit the buffer as a tags table
(@code{Buffer-menu-visit-tags-table}). @xref{Select Tags Table}.
@end table

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Building

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
@c Copyright (C) 2004-2017 Free Software Foundation, Inc.
@c Copyright (C) 2004-2018 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
@ -791,7 +791,7 @@ For example, an anniversary diary entry can insert
the number of years since the anniversary date into the text of the
diary entry. Thus the @samp{%d} in this diary entry:
@findex diary-anniversary
@findex diary-anniversary@r{, and sexp diary entries}
@smallexample
%%(diary-anniversary 10 31 1948) Arthur's birthday (%d years old)
@end smallexample
@ -821,7 +821,7 @@ Arthur's 42nd birthday
Similarly, cyclic diary entries can interpolate the number of repetitions
that have occurred:
@findex diary-cyclic
@findex diary-cyclic@r{, and sexp diary entries}
@smallexample
%%(diary-cyclic 50 1 1 2012) Renew medication (%d%s time)
@end smallexample
@ -869,7 +869,7 @@ Rake leaves
@noindent
on October 22, November 22, and December 22 of every year.
@findex diary-float
@findex diary-float@r{, and sexp diary entries}
The function @code{diary-float} allows you to describe diary entries
that apply to dates like the third Friday of November, or the last
Tuesday in April. The parameters are the @var{month}, @var{dayname},
@ -1006,7 +1006,7 @@ diary entries:
@findex diary-hebrew-sabbath-candles
@cindex omer count
@findex diary-hebrew-omer
@cindex yahrzeits
@cindex yahrzeits, and sexp diary entries
@findex diary-hebrew-yahrzeit
@findex diary-hebrew-birthday
@table @code

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Calendar/Diary
@ -119,7 +119,7 @@ moves to the same day in the previous week.
@kindex C-x ] @r{(Calendar mode)}
@findex calendar-forward-year
@kindex C-x [ @r{(Calendar mode)}
@findex calendar-forward-year
@findex calendar-backward-year
The commands for motion by months and years work like those for
weeks, but move a larger distance. The month commands @kbd{M-@}} and
@kbd{M-@{} move forward or backward by an entire month. The year
@ -369,7 +369,7 @@ various page elements, header styles) via a stylesheet @file{cal.css} in
the directory containing the HTML files (see the value of the variable
@code{cal-html-css-default} for relevant style settings).
@kindex t @r{(Calendar mode)}
@kindex H @r{(Calendar mode)}
@table @kbd
@item H m
Generate a one-month calendar (@code{cal-html-cursor-month}).
@ -725,7 +725,7 @@ cycle, and to install a 10-day week in a rationalization measure similar to
the metric system. The French government officially abandoned this
calendar at the end of 1805.
@cindex Mayan calendar
@cindex Mayan calendars
The Maya of Central America used three separate, overlapping calendar
systems, the @emph{long count}, the @emph{tzolkin}, and the @emph{haab}.
Emacs knows about all three of these calendars. Experts dispute the
@ -847,7 +847,6 @@ other than Mayan; for the Mayan calendar, see the following section.
@kindex g @var{char} @r{(Calendar mode)}
@findex calendar-iso-goto-date
@findex calendar-iso-goto-week
@findex calendar-julian-goto-date
@findex calendar-astro-goto-day-number
@findex calendar-bahai-goto-date

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation
@ -310,13 +310,12 @@ option does this too, but other options like @samp{-q} do not.
@item --no-site-lisp
@opindex --no-site-lisp
@cindex @file{site-start.el} file, not loading
@cindex @file{site-lisp} files, not loading
Do not include the @file{site-lisp} directories in @code{load-path}
(@pxref{Init File}). The @samp{-Q} option does this too.
@item --no-splash
@opindex --no-splash
@vindex inhibit-startup-screen
@cindex splash screen
@cindex startup message
Do not display a startup screen. You can also achieve this effect by

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@ -21,8 +21,6 @@ input.
@cindex keyboard input
@cindex character set (keyboard)
@cindex @acronym{ASCII}
@cindex C-
@cindex Control
GNU Emacs is primarily designed for use with the keyboard. While it
is possible to use the mouse to issue editing commands through the

View file

@ -1,6 +1,6 @@
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Customization
@ -679,7 +679,7 @@ edit the variable values or face attributes in the same way as in a
normal customization buffer. To remove a face or variable from the
theme, uncheck the checkbox next to its name.
@vindex custom-theme-directory
@vindex custom-theme-directory@r{, saving theme files}
After specifying the Custom theme's faces and variables, type
@kbd{C-x C-s} (@code{custom-theme-write}) or use the buffer's
@samp{[Save Theme]} button. This saves the theme file, named
@ -915,7 +915,7 @@ customize the indentation of C code:
@end example
@cindex Prog mode
@cindex program editing
@cindex modes for editing programs
Major mode hooks also apply to other major modes @dfn{derived} from
the original mode (@pxref{Derived Modes,,, elisp, The Emacs Lisp
Reference Manual}). For instance, HTML mode is derived from Text mode
@ -1775,7 +1775,7 @@ and @kbd{C-c p} in Texinfo mode:
@node Modifier Keys
@subsection Modifier Keys
@cindex modifier keys
@cindex modifier keys, and key rebinding
The default key bindings in Emacs are set up so that modified
alphabetical characters are case-insensitive. In other words,
@ -1915,7 +1915,7 @@ because the terminal sends the same character in both cases.
@cindex click events
@cindex drag events
@cindex down events
@cindex button down events
@cindex button-down events
Emacs uses Lisp symbols to designate mouse buttons, too. The ordinary
mouse events in Emacs are @dfn{click} events; these happen when you
@ -2285,7 +2285,7 @@ buffer's local value, which is probably not what you want to do in an
init file.
@item
@vindex user-mail-address
@vindex user-mail-address@r{, in init file}
Specify your own email address, if Emacs can't figure it out correctly.
@example

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2017 Free Software Foundation, Inc.
@c Copyright (C) 2004-2018 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

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Dired
@ -122,7 +122,7 @@ use the @samp{--dired} option.
frame.
@kindex q @r{(Dired)}
@findex quit-window
@findex quit-window@r{, in Dired buffers}
Typing @kbd{q} (@code{quit-window}) buries the Dired buffer, and
deletes its window if the window was created just for that buffer.
@ -246,7 +246,7 @@ directory you are asked for confirmation; if you answer @code{all},
then all the remaining directories will be deleted without more
questions.
@vindex delete-by-moving-to-trash
@vindex delete-by-moving-to-trash@r{, and Dired}
If you change the variable @code{delete-by-moving-to-trash} to
@code{t}, the above deletion commands will move the affected files or
directories into the operating system's Trash, instead of deleting
@ -768,7 +768,6 @@ marked file is compressed into its own archive.
@findex dired-do-compress-to
@kindex c @r{(Dired)}
@cindex compressing files (in Dired)
@item c
Compress the specified files (@code{dired-do-compress-to}) into a
single archive anywhere on the file system. The compression algorithm

View file

@ -1,6 +1,6 @@
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@ -1545,8 +1545,8 @@ characters more prominent on display. @xref{Glyphless Chars,,
Glyphless Character Display, elisp, The Emacs Lisp Reference Manual},
for details.
@cindex curly quotes
@cindex curved quotes
@cindex curly quotes, and terminal capabilities
@cindex curved quotes, and terminal capabilities
@cindex homoglyph face
Emacs tries to determine if the curved quotes @samp{} and @samp{}
@ -1576,7 +1576,6 @@ cursor, and switches to it when you start or resume Emacs. If the
variable @code{visible-cursor} is @code{nil} when Emacs starts or
resumes, it uses the normal cursor.
@cindex cursor face
@vindex cursor-type
On a graphical display, many more properties of the text cursor can
be altered. To customize its color, change the @code{:background}
@ -1645,7 +1644,7 @@ global-hl-line-mode} enables or disables the same mode globally.
@section Line Truncation
@cindex truncation
@cindex line truncation, and fringes
@cindex line truncation
As an alternative to continuation (@pxref{Continuation Lines}),
Emacs can display long lines by @dfn{truncation}. This means that all
the characters that do not fit in the width of the screen or window do

View file

@ -16,7 +16,7 @@
@copying
This manual describes specialized features of Emacs.
Copyright @copyright{} 2004--2017 Free Software Foundation, Inc.
Copyright @copyright{} 2004--2018 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document

View file

@ -27,7 +27,7 @@ This is the @cite{GNU Emacs Manual},
@end ifnottex
updated for Emacs version @value{EMACSVER}.
Copyright @copyright{} 1985--1987, 1993--2017 Free Software Foundation, Inc.
Copyright @copyright{} 1985--1987, 1993--2018 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -235,9 +235,9 @@ Appendices
Indexes (each index contains a large menu)
* Key Index:: An item for each standard Emacs key sequence.
* Option Index:: An item for every command-line option.
* Command Index:: An item for each command name.
* Variable Index:: An item for each documented variable.
* Concept Index:: An item for each concept.
* Command Index:: An item for each standard command name.
* Variable Index:: An item for each variable documented in this manual.
* Concept Index:: An item for concepts and other general subjects.
@c Do NOT modify the following 3 lines! They must have this form to
@c be correctly identified by 'texinfo-multiple-files-update'. In

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2017 Free Software Foundation, Inc.
@c Copyright (C) 2004-2018 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

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Files
@ -66,9 +66,8 @@ completing up to a nonexistent file name, Emacs prints
Minibuffer history commands offer some special features for reading
file names, see @ref{Minibuffer History}.
@cindex default directory
@cindex default directory, of a buffer
@vindex default-directory
@vindex insert-default-directory
Each buffer has a @dfn{default directory}, stored in the
buffer-local variable @code{default-directory}. Whenever Emacs reads
a file name using the minibuffer, it usually inserts the default
@ -482,7 +481,6 @@ by simultaneous editing and requires your immediate attention.
@subsection Backup Files
@cindex backup file
@vindex make-backup-files
@vindex vc-make-backup-files
On most operating systems, rewriting a file automatically destroys all
record of what the file used to contain. Thus, saving a file from Emacs
@ -939,10 +937,10 @@ revert it automatically if it has changed---provided the buffer itself
is not modified. (If you have edited the text, it would be wrong to
discard your changes.)
@cindex Global Auto-Revert mode
@cindex mode, Global Auto-Revert
@cindex Auto-Revert mode
@cindex mode, Auto-Revert
@cindex Global Auto Revert mode
@cindex mode, Global Auto Revert
@cindex Auto Revert mode
@cindex mode, Auto Revert
@findex global-auto-revert-mode
@findex auto-revert-mode
@findex auto-revert-tail-mode
@ -1760,13 +1758,6 @@ requires the appropriate uncompression program.
@cindex Archive mode
@cindex mode, archive
@cindex @code{arc}
@cindex @code{jar}
@cindex @code{rar}
@cindex @code{zip}
@cindex @code{lzh}
@cindex @code{zoo}
@cindex @code{7z}
@pindex arc
@pindex jar
@pindex zip
@ -2066,7 +2057,7 @@ but Emacs should not). To disable ImageMagick entirely, change
@code{imagemagick-types-inhibit} to @code{t}.
@findex thumbs-mode
@findex mode, thumbs
@cindex mode, Thumbs
The Image-Dired package can also be used to view images as
thumbnails. @xref{Image-Dired}.

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Fixit

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2017 Free Software Foundation, Inc.
@c Copyright (C) 2004-2018 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

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames
@ -388,7 +388,6 @@ make any window smaller than the minimum height.
frame has only one window, it does nothing.
@item C-mouse-2
@kindex C-mouse-2 @r{(mode line)}
@kbd{C-mouse-2} on a mode line splits that window, producing two
side-by-side windows with the boundary running through the click
position (@pxref{Split Window}).
@ -465,7 +464,6 @@ error if there is only one frame.
@item C-z
@kindex C-z @r{(X windows)}
@findex suspend-frame
Minimize (or iconify) the selected Emacs frame
(@code{suspend-frame}). @xref{Exiting}.
@ -1301,11 +1299,11 @@ Operation}.
On graphical terminals, the mouse pointer may obscure the text in
the Emacs frame. Emacs provides two methods to avoid this problem.
@vindex make-pointer-invisible
Firstly, Emacs hides the mouse pointer each time you type a
self-inserting character, if the pointer lies inside an Emacs frame;
moving the mouse pointer makes it visible again. To disable this
feature, set the variable @code{make-pointer-invisible} to @code{nil}.
@xref{Display Custom}.
@vindex mouse-avoidance-mode
Secondly, you can use Mouse Avoidance mode, a minor mode, to keep

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary

View file

@ -1,4 +1,4 @@
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2018 Free Software
@c Foundation, Inc.
@c
@c Permission is granted to anyone to make or distribute verbatim copies

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Help
@ -451,7 +451,6 @@ you can go forward by using @kbd{C-c C-f} or @kbd{r}
@cindex help, viewing web pages
@cindex viewing web pages in help
@cindex web pages, viewing in help
@findex browse-url
A help buffer can also contain hyperlinks to Info manuals, source
code definitions, and URLs (web pages). The first two are opened in
Emacs, and the third using a web browser via the @code{browse-url}
@ -493,10 +492,11 @@ buffer (@pxref{Package Menu}).
@findex describe-package
@kindex C-h P
@kbd{C-h P} (@code{describe-package}) prompts for the name of a
package, and displays a help buffer describing the attributes of the
package and the features that it implements. The buffer lists the
keywords that relate to the package in the form of buttons. Click on
a button to see other packages related to that keyword.
package (@pxref{Packages}, and displays a help buffer describing the
attributes of the package and the features that it implements. The
buffer lists the keywords that relate to the package in the form of
buttons. Click on a button to see other packages related to that
keyword.
@node Language Help
@section Help for International Language Support
@ -666,7 +666,7 @@ Emacs (@code{describe-no-warranty}).
@node Help Echo
@section Help on Active Text and Tooltips
@cindex tooltips
@cindex tooltip help
@cindex balloon help
@cindex active text
In Emacs, stretches of @dfn{active text} (text that does something

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Indentation
@ -21,7 +21,8 @@ documentation about indenting in programming modes.
The simplest way to perform indentation is the @key{TAB} key. In
most major modes, this runs the command @code{indent-for-tab-command}.
(In C and related modes, @key{TAB} runs the command
@code{c-indent-line-or-region}, which behaves similarly).
@code{c-indent-line-or-region}, which behaves similarly, @pxref{C
Indent}).
@table @key
@item TAB
@ -200,7 +201,6 @@ are always displayed as empty spaces extending to the next
@node Just Spaces
@section Tabs vs.@: Spaces
@vindex tab-width
Normally, indentation commands insert (or remove) an optimal mix of
space characters and tab characters to align to the desired column.
Tab characters are displayed as a stretch of empty space extending to

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@ -200,8 +200,6 @@ key sequence @kbd{C-S-backspace}.
@node Other Kill Commands
@subsection Other Kill Commands
@findex kill-region
@kindex C-w
@table @kbd
@item C-w
@ -415,10 +413,10 @@ This is a line @point{}of sample text.
@noindent
with point shown by @point{}. If you type @kbd{M-d M-@key{DEL} M-d
M-@key{DEL}}, killing alternately forward and backward, you end up with
@samp{a line of sample} as one entry in the kill ring, and @samp{This
is@ @ text.} in the buffer. (Note the double space between @samp{is}
and @samp{text}, which you can clean up with @kbd{M-@key{SPC}} or
@kbd{M-q}.)
@samp{a line of sample} as one entry in the kill ring, and
@w{@samp{This is@ @ text.}} in the buffer. (Note the double space
between @samp{is} and @samp{text}, which you can clean up with
@kbd{M-@key{SPC}} or @kbd{M-q}.)
Another way to kill the same text is to move back two words with
@kbd{M-b M-b}, then kill all four words forward with @kbd{C-u M-d}.

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2017 Free Software
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2018 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Keyboard Macros

Some files were not shown because too many files have changed in this diff Show more