10 files changed, 87 insertions, 45 deletions

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index d9844554e0c..dbcc4c1fd1a 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1313,16 +1313,13 @@ accomplished with @dfn{directory-local variables}.
 
 @cindex @file{.dir-locals.el} file
   The usual way to define directory-local variables is to put a file
-named @file{.dir-locals.el}@footnote{ On MS-DOS, the name of this file
-should be @file{_dir-locals.el}, due to limitations of the DOS
-filesystems.  If the filesystem is limited to 8+3 file names, the name
-of the file will be truncated by the OS to @file{_dir-loc.el}.
-}@footnote{ You can also use @file{.dir-locals-2.el}, which
-is loaded in addition.  This is useful when @file{.dir-locals.el} is
-under version control in a shared repository and can't be used for
-personal customizations.  } in a
-directory.  Whenever Emacs visits any file in that directory or any of
-its subdirectories, it will apply the directory-local variables
+named @file{.dir-locals.el}@footnote{
+On MS-DOS, the name of this file should be @file{_dir-locals.el}, due
+to limitations of the DOS filesystems.  If the filesystem is limited
+to 8+3 file names, the name of the file will be truncated by the OS to
+@file{_dir-loc.el}.
+}in a directory.  Whenever Emacs visits any file in that directory or
+any of its subdirectories, it will apply the directory-local variables
 specified in @file{.dir-locals.el}, as though they had been defined as
 file-local variables for that file (@pxref{File Variables}).  Emacs
 searches for @file{.dir-locals.el} starting in the directory of the
@@ -1331,6 +1328,11 @@ this search is skipped for remote files.  If needed, the search can be
 extended for remote files by setting the variable
 @code{enable-remote-dir-locals} to @code{t}.
 
+  You can also use @file{.dir-locals-2.el}; if found, Emacs loads it
+in addition to @file{.dir-locals.el}.  This is useful when
+@file{.dir-locals.el} is under version control in a shared repository
+and can't be used for personal customizations.
+
   The @file{.dir-locals.el} file should hold a specially-constructed
 list, which maps major mode names (symbols) to alists
 (@pxref{Association Lists,,, elisp, The Emacs Lisp Reference Manual}).
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index dd434e200b2..ac52603ed7a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -183,7 +183,7 @@ are not shown in the @kbd{l} or @kbd{L} listings.
 @kindex DEL @r{(Gnus Group mode)}
 @item @key{DEL}
 Move point to the previous group containing unread articles
-(@code{gnus-group-prev-unread-group}.)
+(@code{gnus-group-prev-unread-group}).
 
 @kindex n @r{(Gnus Group mode)}
 @findex gnus-group-next-unread-group
@@ -686,7 +686,7 @@ either in the echo area (if it is short), or in an Emacs buffer named
 @file{*Shell Command Output*}, displayed in another window (if the
 output is long).  The variables @code{resize-mini-windows} and
 @code{max-mini-window-height} (@pxref{Minibuffer Edit}) control when
-the output is considered too long for the echo area.
+Emacs should consider the output to be too long for the echo area.
 
   For instance, one way to decompress a file named @file{foo.gz} is to
 type @kbd{M-! gunzip foo.gz @key{RET}}.  That shell command normally
@@ -1512,8 +1512,8 @@ interface is similar to the @code{more} program.
 @cindex Rlogin
 
   You can login to a remote computer, using whatever commands you
-would from a regular terminal (e.g., using the @code{ssh} or
-@code{telnet} or @code{rlogin} commands), from a Term window.
+would from a regular terminal (e.g., using the @command{ssh} or
+@command{telnet} or @code{rlogin} commands), from a Term window.
 
   A program that asks you for a password will normally suppress
 echoing of the password, so the password will not show up in the
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 13665358372..068111cab1e 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -999,8 +999,8 @@ summary buffer using @key{SPC} and @key{DEL}.  However, in the summary
 buffer scrolling past the end or the beginning of a message with
 @key{SPC} or @key{DEL} goes, respectively, to the next or previous
 undeleted message.  Customize the
-@code{rmail-summary-scroll-between-messages} option to nil to disable
-scrolling to next/previous messages.
+@code{rmail-summary-scroll-between-messages} option to @code{nil} to
+disable scrolling to next/previous messages.
 
 @findex rmail-summary-undelete-many
 @kbd{M-u} (@code{rmail-summary-undelete-many}) undeletes all deleted
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index bca8e1fff0a..81f26728e0a 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -245,6 +245,10 @@ This master menu first lists each chapter and index; then it lists
 every node in every chapter.
 @end ifnottex
 
+@c Uncomment the 3 lines below, starting with @iftex, if you want the
+@c pages of Preface to be numbered in roman numerals.  Use -9 instead
+@c of -11 for smallbook format.
+
 @c >>>> Set pageno appropriately <<<<
 
 @c The first page of the Preface is a roman numeral; it is the first
@@ -822,10 +826,10 @@ programming language, the examples and guided tours will give you an
 opportunity to get acquainted with Emacs as a Lisp programming
 environment.  GNU Emacs supports programming and provides tools that
 you will want to become comfortable using, such as @kbd{M-.} (the key
-which invokes the @code{find-tag} command).  You will also learn about
-buffers and other objects that are part of the environment.
-Learning about these features of Emacs is like learning new routes
-around your home town.
+which invokes the @code{xref-find-definitions} command).  You will
+also learn about buffers and other objects that are part of the
+environment.  Learning about these features of Emacs is like learning
+new routes around your home town.
 
 @ignore
 In addition, I have written several programs as extended examples.
@@ -1012,6 +1016,8 @@ bob@@gnu.org
 @c makes a link to something in the first 4 pages though?).
 @c E.g., note that the Emacs manual has a preface, but does not bother
 @c resetting the page numbers back to 1 after that.
+@c Alternatively, uncomment the 3 lines above (search for ``pageno'')
+@c to have the preface numbered in roman numerals.
 @iftex
 @headings off
 @evenheading @thispage @| @| @thischapter
@@ -5357,7 +5363,7 @@ Here is a brief summary of the various functions discussed in this chapter.
 Print the documentation for a function or variable.
 Conventionally bound to @kbd{C-h f} and @kbd{C-h v}.
 
-@item find-tag
+@item xref-find-definitions
 Find the file containing the source for a function or variable and
 switch buffers to it, positioning point at the beginning of the item.
 Conventionally bound to @kbd{M-.} (that's a period following the
@@ -5411,8 +5417,8 @@ Use @code{if} and @code{get-buffer} to write a function that prints a
 message telling you whether a buffer exists.
 
 @item
-Using @code{find-tag}, find the source for the @code{copy-to-buffer}
-function.
+Using @code{xref-find-definitions}, find the source for the
+@code{copy-to-buffer} function.
 @end itemize
 
 @node More Complex
@@ -14754,10 +14760,11 @@ creating one if none already exists."
 
 @noindent
 (The most recent version of the @code{find-file} function definition
-permits you to specify optional wildcards to visit multiple files; that
-makes the definition more complex and we will not discuss it here,
-since it is not relevant.  You can see its source using either
-@kbd{M-.} (@code{find-tag}) or @kbd{C-h f} (@code{describe-function}).)
+permits you to specify optional wildcards to visit multiple files;
+that makes the definition more complex and we will not discuss it
+here, since it is not relevant.  You can see its source using either
+@kbd{M-.} (@code{xref-find-definitions}) or @kbd{C-h f}
+(@code{describe-function}).)
 
 @ignore
 In Emacs 22
@@ -18544,8 +18551,8 @@ introduction, it comes as a Texinfo source file, so you can read it
 on your computer and as a typeset, printed book.)
 
 Go to the other built-in help that is part of GNU Emacs: the built-in
-documentation for all functions and variables, and @code{find-tag},
-the program that takes you to sources.
+documentation for all functions and variables, and
+@code{xref-find-definitions}, the program that takes you to sources.
 
 Here is an example of how I explore the sources.  Because of its name,
 @file{simple.el} is the file I looked at first, a long time ago.  As
@@ -18581,7 +18588,7 @@ contains the name of the library containing the function's source.
 You can put point over the name of the library and press the @key{RET} key,
 which in this situation is bound to @code{help-follow}, and be taken
 directly to the source, in the same way as @kbd{M-.}
-(@code{find-tag}).
+(@code{xref-find-definitions}).
 
 The definition for @code{describe-function} illustrates how to
 customize the @code{interactive} expression without using the standard
@@ -18589,13 +18596,14 @@ character codes; and it shows how to create a temporary buffer.
 
 (The @code{indent-to} function is written in C rather than Emacs Lisp;
 it is a built-in function.  @code{help-follow} takes you to its
-source as does @code{find-tag}, when properly set up.)
-
-You can look at a function's source using @code{find-tag}, which is
-bound to @kbd{M-.}  Finally, you can find out what the Reference
-Manual has to say by visiting the manual in Info, and typing @kbd{i}
-(@code{Info-index}) and the name of the function, or by looking up the
-function in the index to a printed copy of the manual.
+source as does @code{xref-find-definitions}, when properly set up.)
+
+You can look at a function's source using
+@code{xref-find-definitions}, which is bound to @kbd{M-.}  Finally,
+you can find out what the Reference Manual has to say by visiting the
+manual in Info, and typing @kbd{i} (@code{Info-index}) and the name of
+the function, or by looking up the function in the index to a printed
+copy of the manual.
 
 Similarly, you can find out what is meant by
 @code{insert-and-inherit}.
diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi
index ddd46a55edd..f7d33eafa34 100644
--- a/doc/lispref/hash.texi
+++ b/doc/lispref/hash.texi
@@ -293,8 +293,8 @@ This function returns a hash code for Lisp object @var{obj}.  Its
 result reflects identity of @var{obj}, but not its contents.
 
 If two objects @var{obj1} and @var{obj2} are @code{eq}, then
-@code{(xhash @var{obj1})} and @code{(xhash @var{obj2})} are the same
-integer.
+@code{(sxhash-eq @var{obj1})} and @code{(sxhash-eq @var{obj2})} are
+the same integer.
 @end defun
 
 @defun sxhash-eql obj
@@ -304,8 +304,8 @@ except for the case where the object is a float number, in which case
 hash code is generated for the value.
 
 If two objects @var{obj1} and @var{obj2} are @code{eql}, then
-@code{(xhash @var{obj1})} and @code{(xhash @var{obj2})} are the same
-integer.
+@code{(sxhash-eql @var{obj1})} and @code{(sxhash-eql @var{obj2})} are
+the same integer.
 @end defun
 
   This example creates a hash table whose keys are strings that are
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 77ecb667f4f..adf554e8436 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2335,7 +2335,7 @@ to be outputting to an erasable screen.  The idea is that you specify
 Lisp programs to run; when they are finished, Emacs should exit.  The
 way to specify the programs to run is with @samp{-l @var{file}}, which
 loads the library named @var{file}, or @samp{-f @var{function}}, which
-calls @var{function} with no arguments, or @samp{--eval @var{form}}.
+calls @var{function} with no arguments, or @samp{--eval=@var{form}}.
 
   Any Lisp program output that would normally go to the echo area,
 either using @code{message}, or using @code{prin1}, etc., with
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index 4b1f673a7cc..812394f11d8 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -719,6 +719,13 @@ breakpoint (e.g. with "f" and "o") by customizing the new option
 This allows you to enlarge the maximum recursion depth when
 instrumenting code.
 
+*** 'edebug-prin1-to-string' now aliases 'cl-prin1-to-string'.
+This means edebug output is affected by variables 'cl-print-readably'
+and 'cl-print-compiled'.  To completely restore the previous printing
+behavior, use
+
+    (fset 'edebug-prin1-to-string #'prin1-to-string)
+
 ** Eshell
 
 *** 'eshell-input-filter's value is now a named function
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 8fb3d746102..d42539061be 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3196,6 +3196,15 @@ them to DOS 8+3 limits.  To be useful on NT, the MSDOS port of Emacs
 must be unzipped by a DOS utility, so that long file names are
 properly truncated.
 
+** Apple Macintosh operating systems
+
+*** OS X 10.9 and earlier: symlinks autocomplete as directories
+
+Autocompleting the name of a symbolic link incorrectly appends "/".
+Building and running Emacs on OS X 10.10 (or later) fixes the problem.
+Older operating systems are no longer supported by Apple.
+https://bugs.gnu.org/31305
+
 ** Archaic window managers and toolkits
 
 *** Open Look: Under Open Look, the Emacs window disappears when you type M-q.
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 4403e887069..76a9095e4ae 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -288,6 +288,9 @@ a special meaning:
 If PLACE is a symbol, its `default-value' will be affected.
 Use (local \\='SYMBOL) if you want to apply FUNCTION to SYMBOL buffer-locally.
 Use (var VAR) if you want to apply FUNCTION to the (lexical) VAR.
+If you are trying to modify an existing named function rather
+than a function value, you probably want to use `advice-add'
+instead (see Info node `(elisp) Advising Named Functions').
 
 If one of FUNCTION or OLDFUN is interactive, then the resulting function
 is also interactive.  There are 3 cases:
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 64651aff114..0700c228c35 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4254,9 +4254,22 @@ the call to \\[sql-product-interactive] with
                 (funcall (sql-get-product-feature product :sqli-comint-func)
                          product
                          (sql-get-product-feature product :sqli-options)
-                         (if (and new-name (string-prefix-p "SQL" new-name t))
-                             new-name
-                           (concat "SQL: " new-name))))
+                         (cond
+                          ((null new-name)
+                           "*SQL*")
+                          ((stringp new-name)
+                           (if (string-prefix-p "*SQL: " new-name t)
+                               new-name
+                             (concat "*SQL: " new-name "*")))
+                          ((equal new-name '(4))
+                           (concat
+                            "*SQL: "
+                            (read-string
+                             "Buffer name (\"*SQL: XXX*\"; enter `XXX'): "
+                             sql-alternate-buffer-name)
+                            "*"))
+                          (t
+                           (format "*SQL: %s*" new-name)))))
 
               ;; Set SQLi mode.
               (let ((sql-interactive-product product))