4 files changed, 17 insertions, 21 deletions

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b837fb4e5ea..e8b5e6755ea 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1842,7 +1842,8 @@ Optional arg HOW-TO determines how to treat the target.
       rfn-list  - list of the relative names for the marked files.
       fn-list   - list of the absolute names for the marked files.
       target    - the name of the target itself.
-      The rest of into-dir are optional arguments.
+    The rest of elements of the list returned by HOW-TO are optional
+    arguments for the function that is the first element of the list.
    For any other return value, TARGET is treated as a directory."
   (or op1 (setq op1 operation))
   (let* ((fn-list (dired-get-marked-files nil arg nil nil t))
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index cbd78137622..44c4989ad06 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -150,30 +150,18 @@ This can be slightly disconcerting, but some people prefer it."
 
 ;;; For tilt-scroll
 ;;;
-(defcustom mwheel-tilt-scroll-p nil
+(defcustom mouse-wheel-tilt-scroll nil
   "Enable scroll using tilting mouse wheel."
   :group 'mouse
   :type 'boolean
   :version "26.1")
 
-(defcustom mwheel-flip-direction nil
+(defcustom mouse-wheel-flip-direction nil
   "Swap direction of 'wheel-right and 'wheel-left."
   :group 'mouse
   :type 'boolean
   :version "26.1")
 
-(defcustom mwheel-scroll-left-function 'scroll-left
-  "Function that does the job of scrolling left."
-  :group 'mouse
-  :type 'function
-  :version "26.1")
-
-(defcustom mwheel-scroll-right-function 'scroll-right
-  "Function that does the job of scrolling right."
-  :group 'mouse
-  :type 'function
-  :version "26.1")
-
 (eval-and-compile
   (if (fboundp 'event-button)
       (fset 'mwheel-event-button 'event-button)
@@ -211,6 +199,12 @@ This can be slightly disconcerting, but some people prefer it."
 (defvar mwheel-scroll-down-function 'scroll-down
   "Function that does the job of scrolling downward.")
 
+(defvar mwheel-scroll-left-function 'scroll-left
+  "Function that does the job of scrolling left.")
+
+(defvar mwheel-scroll-right-function 'scroll-right
+  "Function that does the job of scrolling right.")
+
 (defvar mouse-wheel-left-event
   (if (or (featurep 'w32-win) (featurep 'ns-win))
       'wheel-left
@@ -293,13 +287,13 @@ non-Windows systems."
                    ;; Make sure we do indeed scroll to the end of the buffer.
                    (end-of-buffer (while t (funcall mwheel-scroll-up-function)))))
                 ((eq button mouse-wheel-left-event) ; for tilt scroll
-                 (when mwheel-tilt-scroll-p
-                   (funcall (if mwheel-flip-direction
+                 (when mouse-wheel-tilt-scroll
+                   (funcall (if mouse-wheel-flip-direction
                                 mwheel-scroll-right-function
                               mwheel-scroll-left-function) amt)))
                 ((eq button mouse-wheel-right-event) ; for tilt scroll
-                 (when mwheel-tilt-scroll-p
-                   (funcall (if mwheel-flip-direction
+                 (when mouse-wheel-tilt-scroll
+                   (funcall (if mouse-wheel-flip-direction
                                 mwheel-scroll-left-function
                               mwheel-scroll-right-function) amt)))
                 (t (error "Bad binding in mwheel-scroll"))))
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index caac96a4859..66b1767b563 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1532,7 +1532,8 @@ Differences in #targets are ignored."
                   eww-download-directory)))
       (goto-char (point-min))
       (re-search-forward "\r?\n\r?\n")
-      (write-region (point) (point-max) file)
+      (let ((coding-system-for-write 'no-conversion))
+        (write-region (point) (point-max) file))
       (message "Saved %s" file))))
 
 (defun eww-decode-url-file-name (string)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index bc2be4aadb4..175c82f8c00 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -898,7 +898,7 @@ non-nil, otherwise in local time."
              (insert (if use-hard-newlines hard-newline "\n")
                      (if use-hard-newlines hard-newline "\n"))
              (forward-line -2)
-             (indent-relative-maybe))
+             (indent-relative-first-indent-point))
             (t
              ;; Make a new item.
              (while (looking-at "\\sW")