[Emacs-diffs] master c8109d9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit c8109d9c4057d8cac79e2c139758cadd410e7446
Merge: 3690680 6de0715
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    6de0715 Properly reject malformed or empty package sigs
    edae7d9 Remove buggy non-native image scrolling
---
 lisp/emacs-lisp/package.el |    2 +-
 lisp/xwidget.el            |   43 +++++++++----------------------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fea184d..8afe18f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1218,7 +1218,7 @@ errors."
           (unless (and (eq package-check-signature 'allow-unsigned)
                        (eq (epg-signature-status sig) 'no-pubkey))
             (setq had-fatal-error t))))
-      (when (and (null good-signatures) had-fatal-error)
+      (when (or (null good-signatures) had-fatal-error)
         (package--display-verify-error context sig-file)
         (signal 'bad-signature (list sig-file)))
       good-signatures)))
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 19f631f..7a0ca8b 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -34,13 +34,6 @@
 (require 'cl-lib)
 (require 'bookmark)
 
-(defcustom xwidget-webkit-scroll-behavior 'native
-  "Scrolling behavior of the webkit instance.
-The possible values are: `native' or `image'."
-  :version "25.1"
-  :group 'frames   ; TODO add xwidgets group if more options are added
-  :type '(choice (const native) (const image)))
-
 (declare-function make-xwidget "xwidget.c"
                   (type title width height arguments &optional buffer))
 (declare-function xwidget-set-adjustment "xwidget.c"
@@ -141,40 +134,24 @@ Interactively, URL defaults to the string looking like a 
url around point."
   "Keymap for `xwidget-webkit-mode'.")
 
 (defun xwidget-webkit-scroll-up ()
-  "Scroll webkit up.
-Depending on the value of `xwidget-webkit-scroll-behavior',
-this scrolls in `native' fashion, or like `image-mode' would."
+  "Scroll webkit up."
   (interactive)
-  (if (eq xwidget-webkit-scroll-behavior 'native)
-      (xwidget-set-adjustment (xwidget-webkit-last-session) 'vertical t 50)
-    (image-scroll-up)))
+  (xwidget-set-adjustment (xwidget-webkit-last-session) 'vertical t 50))
 
 (defun xwidget-webkit-scroll-down ()
-  "Scroll webkit down.
-Depending on the value of `xwidget-webkit-scroll-behavior',
-this scrolls in `native' fashion, or like `image-mode' would."
+  "Scroll webkit down."
   (interactive)
-  (if (eq xwidget-webkit-scroll-behavior 'native)
-      (xwidget-set-adjustment (xwidget-webkit-last-session) 'vertical t -50)
-    (image-scroll-down)))
+  (xwidget-set-adjustment (xwidget-webkit-last-session) 'vertical t -50))
 
 (defun xwidget-webkit-scroll-forward ()
-  "Scroll webkit forwards.
-Depending on the value of `xwidget-webkit-scroll-behavior',
-this scrolls in `native' fashion, or like `image-mode' would."
+  "Scroll webkit forwards."
   (interactive)
-  (if (eq xwidget-webkit-scroll-behavior 'native)
-      (xwidget-set-adjustment (xwidget-webkit-last-session) 'horizontal t 50)
-    (xwidget-webkit-scroll-forward)))   ; FIXME infloop!
+  (xwidget-set-adjustment (xwidget-webkit-last-session) 'horizontal t 50))
 
 (defun xwidget-webkit-scroll-backward ()
-  "Scroll webkit backwards.
-Depending on the value of `xwidget-webkit-scroll-behavior',
-this scrolls in `native' fashion, or like `image-mode' would."
+  "Scroll webkit backwards."
   (interactive)
-  (if (eq xwidget-webkit-scroll-behavior 'native)
-      (xwidget-set-adjustment (xwidget-webkit-last-session) 'horizontal t -50)
-    (xwidget-webkit-scroll-backward))) ; FIXME infloop!
+  (xwidget-set-adjustment (xwidget-webkit-last-session) 'horizontal t -50))
 
 
 ;; The xwidget event needs to go into a higher level handler
@@ -417,9 +394,7 @@ For example, use this to display an anchor."
 (defun xwidget-webkit-adjust-size-dispatch ()
   "Adjust size according to mode."
   (interactive)
-  (if (eq xwidget-webkit-scroll-behavior 'native)
-      (xwidget-webkit-adjust-size-to-window)
-    (xwidget-webkit-adjust-size-to-content))
+  (xwidget-webkit-adjust-size-to-window)
   ;; The recenter is intended to correct a visual glitch.
   ;; It errors out if the buffer isn't visible, but then we don't get
   ;; the glitch, so silence errors.