master 80ceb246326 2/2: Merge remote-tracking branch 'savannah/master' into master-android-1

[Po Lu]

branch: master
commit 80ceb246326d1d0ddff4af9273305bc67e946b95
Merge: 6684d3af3b0 eba0f091d9c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'savannah/master' into master-android-1
---
 admin/MAINTAINERS             |  6 ++++++
 doc/lispref/commands.texi     | 19 +++++++++++++------
 lisp/emacs-lisp/cl-generic.el |  8 ++++----
 lisp/emacs-lisp/pp.el         |  6 ++++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 1273e9a976b..cea1aa56cde 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -160,6 +160,12 @@ Po Lu
 
        Haiku battery support in lisp/battery.el
 
+Jim Porter
+       Eshell
+           lisp/eshell/*
+           test/lisp/eshell/*
+           doc/misc/eshell.texi
+
 ==============================================================================
 2. Areas that someone is willing to maintain, although he would not
 necessarily mind if someone else was the official maintainer.
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 2991799e668..741d98655d0 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1255,12 +1255,19 @@ A device used by the XTEST extension to report input.
 @cindex @code{display} property, and point display
 @cindex @code{composition} property, and point display
 
-  Emacs cannot display the cursor when point is in the middle of a
-sequence of text that has the @code{display} or @code{composition}
-property, or is invisible.  Therefore, after a command finishes and
-returns to the command loop, if point is within such a sequence, the
-command loop normally moves point to the edge of the sequence, making this
-sequence effectively intangible.
+  When a sequence of text has the @code{display} or @code{composition}
+property, or is invisible, there can be several buffer positions that
+result in the cursor being displayed at same place on the screen.
+Therefore, after a command finishes and returns to the command loop,
+if point is in such a sequence, the command loop normally moves point
+to try and make this sequence effectively intangible.
+
+This @emph{point adjustment} follows the following general rules: first, the
+adjustment should not change the overall direction of the command;
+second if the command moved point, the adjustment tries to ensure the
+cursor is also moved; third, Emacs prefers the edges of an intangible
+sequence and among those edges it prefers the non sticky ones, such
+that newly inserted text is visible.
 
   A command can inhibit this feature by setting the variable
 @code{disable-point-adjustment}:
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index b062c280a41..dec14bd5df6 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -1101,10 +1101,10 @@ MET-NAME is as returned by 
`cl--generic-load-hist-format'."
          (qualifiers   (cl--generic-method-qualifiers method))
          (call-con     (cl--generic-method-call-con method))
          (function     (cl--generic-method-function method))
-         (args (help-function-arglist (if (not (eq call-con 'curried))
-                                          function
-                                        (funcall function #'ignore))
-                                      'names))
+         (function (if (not (eq call-con 'curried))
+                              function
+                            (funcall function #'ignore)))
+         (args (help-function-arglist function 'names))
          (docstring (documentation function))
          (qual-string
           (if (null qualifiers) ""
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 550fab2f4b3..95ad222cc4d 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -226,8 +226,10 @@ it inserts and pretty-prints that arg at point."
                     (if (eq lif 'defun) (setq lif 2))
                     (when (natnump lif)
                       (goto-char (match-end 0))
-                      (forward-sexp lif)
-                      (funcall newline)))))
+                      ;; Do nothing if there aren't enough args.
+                      (ignore-error scan-error
+                        (forward-sexp lif)
+                        (funcall newline))))))
               (save-excursion
                 (pp-fill (1+ paired) (1- (point)))))
             ;; Now the sexp either ends beyond `fill-column' or is