Merge from origin/emacs-25

[gnu-emacs] / doc / lispref / tips.texi

diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index ffce920bf4eb91df27b8b2b388db9064ca2bc5bc..a8589df031cda744dd11b8bfa982ab57baf507f0 100644 (file)
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1,6 +1,6 @@
 @c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1993, 1995, 1998-1999, 2001-2015 Free Software
+@c Copyright (C) 1990-1993, 1995, 1998-1999, 2001-2016 Free Software
 @c Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @node Tips
@@ -200,12 +200,12 @@ It is likewise a bad idea for one Lisp package to advise a function in
 another Lisp package (@pxref{Advising Functions}).
 
 @item
-Avoid using @code{eval-after-load} in libraries and packages
-(@pxref{Hooks for Loading}).  This feature is meant for personal
-customizations; using it in a Lisp program is unclean, because it
-modifies the behavior of another Lisp file in a way that's not visible
-in that file.  This is an obstacle for debugging, much like advising a
-function in the other package.
+Avoid using @code{eval-after-load} and @code{with-eval-after-load} in
+libraries and packages (@pxref{Hooks for Loading}).  This feature is
+meant for personal customizations; using it in a Lisp program is
+unclean, because it modifies the behavior of another Lisp file in a
+way that's not visible in that file.  This is an obstacle for
+debugging, much like advising a function in the other package.
 
 @item
 If a file does replace any of the standard functions or library
@@ -290,10 +290,11 @@ Sequences consisting of @kbd{C-c} followed by @kbd{@{}, @kbd{@}},
 @kbd{<}, @kbd{>}, @kbd{:} or @kbd{;} are also reserved for major modes.
 
 @item
-Sequences consisting of @kbd{C-c} followed by any other punctuation
-character are allocated for minor modes.  Using them in a major mode is
-not absolutely prohibited, but if you do that, the major mode binding
-may be shadowed from time to time by minor modes.
+Sequences consisting of @kbd{C-c} followed by any other
+@acronym{ASCII} punctuation or symbol character are allocated for
+minor modes.  Using them in a major mode is not absolutely prohibited,
+but if you do that, the major mode binding may be shadowed from time
+to time by minor modes.
 
 @item
 Don't bind @kbd{C-h} following any prefix character (including
@@ -678,8 +679,7 @@ which quotes symbols with grave accent @t{`} and apostrophe
 @t{'}: @t{`like-this'} rather than @t{‘like-this’}.  This
 older convention was designed for now-obsolete displays in which grave
 accent and apostrophe were mirror images.
-
-Documentation using either convention is converted to the user's
+Documentation using this convention is converted to the user's
 preferred format when it is copied into a help buffer.  @xref{Keys in
 Documentation}.
 
@@ -930,7 +930,7 @@ explains these conventions, starting with an example:
 @group
 ;;; foo.el --- Support for the Foo programming language
 
-;; Copyright (C) 2010-2015 Your Name
+;; Copyright (C) 2010-2016 Your Name
 @end group
 
 ;; Author: Your Name <yourname@@example.com>