2 files changed, 2 insertions, 2 deletions

diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 3b9a071d378..82cd99a114a 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -151,7 +151,7 @@ See backquote.el for details"
     (mapcar 'bq-iterative-list-builder (reverse form))
     (and state
          (cond ((eq state 'quote)
-                (list state tailmaker))
+                (list state (if (equal form tailmaker) form tailmaker)))
                ((= (length tailmaker) 1)
                 (funcall (bq-cadr (assq state bq-singles)) tailmaker))
                (t (cons state tailmaker))))))
diff --git a/src/term.c b/src/term.c
index 7e1db17b0e1..85e6bdc39e2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -120,7 +120,7 @@ int (*mouse_tracking_enable_hook) ( /* int ENABLE */ );
    screen; under X, this means it lies about where the focus is.
    This hook tells the window system code to re-decide where to put
    the highlight.  */
-extern void (*screen_rehighlight_hook) ( /* SCREEN_PTR s */ );
+void (*screen_rehighlight_hook) ( /* SCREEN_PTR s */ );
 
 /* Strings, numbers and flags taken from the termcap entry.  */