master 0d315102fe: Improve pp-emacs-lisp-code for #'

[Lars Ingebrigtsen]

branch: master
commit 0d315102fed8cecccbac15232304000df5b66406
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Improve pp-emacs-lisp-code for #'
    
    * lisp/emacs-lisp/pp.el (pp--insert-lisp): Format (function ...)
    as #'.
---
 lisp/emacs-lisp/pp.el                               | 6 ++++--
 test/lisp/emacs-lisp/pp-resources/code-formats.erts | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index a4dbd63755..d199716b2c 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -24,6 +24,7 @@
 
 ;;; Code:
 
+(require 'cl-lib)
 (defvar font-lock-verbose)
 
 (defgroup pp nil
@@ -233,13 +234,14 @@ Use the `pp-max-width' variable to control the desired 
line length."
     (cons (cond
            ((consp (cdr sexp))
             (if (and (length= sexp 2)
-                     (eq (car sexp) 'quote))
+                     (memq (car sexp) '(quote function)))
                 (cond
                  ((symbolp (cadr sexp))
                   (let ((print-quoted t))
                     (prin1 sexp (current-buffer))))
                  ((consp (cadr sexp))
-                  (insert "'")
+                  (insert (if (eq (car sexp) 'quote)
+                              "'" "#'"))
                   (pp--format-list (cadr sexp)
                                    (set-marker (make-marker) (1- (point))))))
               (pp--format-list sexp)))
diff --git a/test/lisp/emacs-lisp/pp-resources/code-formats.erts 
b/test/lisp/emacs-lisp/pp-resources/code-formats.erts
index 2b2001d096..002a5cf165 100644
--- a/test/lisp/emacs-lisp/pp-resources/code-formats.erts
+++ b/test/lisp/emacs-lisp/pp-resources/code-formats.erts
@@ -122,3 +122,9 @@ Name: code-formats11
 (lambda ()
   [(foo bar) (foo bar)])
 =-=-=
+
+Name: code-formats12
+
+=-=
+(global-set-key (kbd "s-x") #'kill-region)
+=-=-=