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

8 files changed, 13 insertions, 19 deletions

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 4c62c703462..94759173dd6 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -28,7 +28,7 @@ srcdir = @srcdir@
 buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
-# Directory with emacsver.texi.
+# Directory with docstyle.tex and emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
 prefix = @prefix@
@@ -80,6 +80,7 @@ PS_TARGETS = elisp.ps
 
 srcs = \
   $(srcdir)/elisp.texi \
+  $(emacsdir)/docstyle.texi \
   $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/anti.texi \
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index 5edfb671773..3433277ca0f 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -6,7 +6,7 @@
 @c %**start of header
 @setfilename back-cover
 @settitle GNU Emacs Lisp Reference Manual
-@documentencoding UTF-8
+@include docstyle.texi
 @c %**end of header
 .
 @sp 7
diff --git a/doc/lispref/book-spine.texi b/doc/lispref/book-spine.texi
index f58fb77dcc1..8c6381f3d81 100644
--- a/doc/lispref/book-spine.texi
+++ b/doc/lispref/book-spine.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename book-spine
 @settitle book-spine
-@documentencoding UTF-8
+@include docstyle.texi
 @c %**end of header
 
 @include emacsver.texi
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index bf1fc4db173..a32c69c1c2f 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -18,6 +18,7 @@
 @ifclear volflag
 @settitle GNU Emacs Lisp Reference Manual
 @end ifclear
+@include docstyle.texi
 
 @c %**end of header
 
@@ -115,8 +116,6 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@documentencoding UTF-8
-
 @dircategory Emacs lisp
 @direntry
 * Elisp: (elisp).               The Emacs Lisp Reference Manual.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 7ba45a6023f..7752bf0617c 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1994, 1998-2015 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
@@ -1717,14 +1717,14 @@ they usually will be in a Lisp file (@pxref{Loading Non-ASCII}), you
 must type the keys as multibyte too.  For instance, if you use this:
 
 @smallexample
-(global-set-key "@"o" 'my-function) ; bind o-umlaut
+(global-set-key "ö" 'my-function) ; bind o-umlaut
 @end smallexample
 
 @noindent
 or
 
 @smallexample
-(global-set-key ?@"o 'my-function) ; bind o-umlaut
+(global-set-key ?ö 'my-function) ; bind o-umlaut
 @end smallexample
 
 @noindent
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index 81755b6227f..947beeca23c 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -6,8 +6,8 @@
 @comment %**start of header
 @setfilename inner-covers.info
 @settitle Inner Covers
+@include docstyle.texi
 @smallbook
-@documentencoding UTF-8
 @comment %**end of header
 
 @headings off
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 05d5ca48043..28f90d9567a 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1998-1999, 2001-2015 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
@@ -1817,7 +1817,7 @@ original text:
 @example
 @group
 (decode-coding-string "Gr\374ss Gott" 'latin-1)
-     @result{} #("Gr@"uss Gott" 0 9 (charset iso-8859-1))
+     @result{} #("Grüss Gott" 0 9 (charset iso-8859-1))
 @end group
 @end example
 @end defun
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index c7d71d2aba9..c4c74ec7556 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software
 @c Foundation, Inc.
@@ -375,13 +375,7 @@ that, Emacs signals an error.
 codes.  A hexadecimal escape sequence consists of a backslash,
 @samp{x}, and the hexadecimal character code.  Thus, @samp{?\x41} is
 the character @kbd{A}, @samp{?\x1} is the character @kbd{C-a}, and
-@code{?\xe0} is the character
-@iftex
-@samp{@`a}.
-@end iftex
-@ifnottex
-@samp{a} with grave accent.
-@end ifnottex
+@code{?\xe0} is the character @kbd{à} (@kbd{a} with grave accent).
 You can use any number of hex digits, so you can represent any
 character code in this way.