feature/android 8356412d625 3/8: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 8356412d6259a8fbfa83380ae0f96361d7223f03
Merge: 86f10534dcc c94011ed568
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 configure.ac                | 1 +
 lisp/emacs-lisp/bytecomp.el | 2 +-
 lisp/help-fns.el            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e6a8c760b10..4aa8945b8ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7420,6 +7420,7 @@ AC_DEFINE_UNQUOTED([EMACS_CONFIG_FEATURES], 
["${emacs_config_features}"],
 
 AS_ECHO(["  Does Emacs use -lXaw3d?                                 
${HAVE_XAW3D}
   Does Emacs use Android?                                 ${ANDROID}
+  Does Emacs use the X Double Buffer Extension?           ${HAVE_XDBE}
   Does Emacs use -lXpm?                                   ${HAVE_XPM}
   Does Emacs use -ljpeg?                                  ${HAVE_JPEG}
   Does Emacs use -ltiff?                                  ${HAVE_TIFF}
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index b1410fc2646..b0c9667dc19 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3443,7 +3443,7 @@ lambda-expression."
                                      (format "; %s"
                                              (substitute-command-keys
                                               interactive-only)))
-                                    ((and (symbolp 'interactive-only)
+                                    ((and (symbolp interactive-only)
                                           (not (eq interactive-only t)))
                                      (format-message "; use `%s' instead."
                                                       interactive-only))
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 84266e02901..50e60b68e17 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -778,7 +778,7 @@ the C sources, too."
                    ;; Cf byte-compile-form.
                    (cond ((stringp interactive-only)
                           (format ";\n  in Lisp code %s" interactive-only))
-                         ((and (symbolp 'interactive-only)
+                         ((and (symbolp interactive-only)
                                (not (eq interactive-only t)))
                           (format-message ";\n  in Lisp code use `%s' instead."
                                           interactive-only))