[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 762ea10 4/4: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 762ea10 4/4: Merge from origin/emacs-26 |
Date: |
Fri, 2 Mar 2018 14:59:55 -0500 (EST) |
branch: master
commit 762ea10d7ff483d3528c2c85b42596178ccc2a34
Merge: e943b9b 0213c8b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
0213c8b (origin/emacs-26) mwheel minor consistency fix
82f12b2 * src/window.c (Frecenter): Improve commentary.
04da8f4 Fix downloading non-text files in EWW
832b9ec ; Spelling fixes
dd88499 ; Spelling fixes
3968f72 Rename some mwheel options, for consistency
d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387 Improve the Emacs manual
56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3...
Conflicts:
etc/NEWS
lisp/mwheel.el
---
ChangeLog.3 | 20 ++++++++++----------
doc/emacs/custom.texi | 2 ++
doc/emacs/frames.texi | 10 +++++-----
doc/emacs/xresources.texi | 7 ++++---
etc/NEWS.26 | 4 ++--
lisp/dired-aux.el | 3 ++-
lisp/mwheel.el | 30 ++++++++++++------------------
lisp/net/eww.el | 3 ++-
lisp/vc/add-log.el | 2 +-
src/window.c | 3 +++
10 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/ChangeLog.3 b/ChangeLog.3
index f68ba58..5b68559 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -20930,7 +20930,7 @@
2017-04-24 Alan Third <address@hidden>
- Fix XBM colour rendering in NS port (bug#22060)
+ Fix XBM color rendering in NS port (bug#22060)
src/nsimage.m (setXBMColor): Fix calculation of xbm_fg.
@@ -38136,7 +38136,7 @@
^
* src/frame.c (x_set_frame_parameters): Drop width_changed and
- height_changed variables in favour of storing that information in
+ height_changed variables in favor of storing that information in
width and height variables.
2016-09-12 Michal Nazarewicz <address@hidden>
@@ -38193,7 +38193,7 @@
Refactor common code in {upcase,downcase,capitalize}-word functions
- * src/casefiddle.c (operate_on_word): Removed in favour of…
+ * src/casefiddle.c (operate_on_word): Removed in favor of…
(casify_word) …new function which does what operate_on_word did plus
what all of the common code from *-word functions.
(upcase-word, downcase-word, capitalize-word): Move code common between
@@ -38418,9 +38418,9 @@
alphabeticp. Because both of those functions require Unicode general
category lookup, this resulted in unnecessary lookups (if alphabeticp
return false decimalp had to perform another lookup). Drop decimalnump
- in favour of alphanumericp which combines decimelnump with alphabeticp.
+ in favor of alphanumericp which combines decimelnump with alphabeticp.
- * src/character.c (decimalnump): Remove in favour of…
+ * src/character.c (decimalnump): Remove in favor of…
(alphanumericp): …new function.
* src/regex.c (ISALNUM): Use alphanumericp.
@@ -42329,9 +42329,9 @@
Enable dividers in NS (bug#22973)
- src/nsfns.m: Add colour settings functions to ns_frame_park_handlers.
+ src/nsfns.m: Add color settings functions to ns_frame_park_handlers.
src/nsterm.m (ns_draw_window_divider): ns_focus has to go before the
- attempt to set the colour.
+ attempt to set the color.
src/nsterm.m (ns_draw_vertical_window_border): This had the same bug as
above, although I didn't see any errors.
@@ -43563,10 +43563,10 @@
2016-06-08 Michal Nazarewicz <address@hidden>
- Remove ‘ert-with-function-mocked’ macro in favour of ‘cl-letf’ macro
+ Remove ‘ert-with-function-mocked’ macro in favor of ‘cl-letf’ macro
* lisp/emacs-lisp/ert-x.el (ert-with-function-mocked): Remove macro
- in favour of ‘cl-letf’ macro which is more generic. All existing
+ in favor of ‘cl-letf’ macro which is more generic. All existing
uses are migrated accordingly. The macro has not been included in
an official release yet so it should be fine to delete it.
@@ -49635,7 +49635,7 @@
2016-02-27 Jan Moringen <address@hidden>
- Show the face colours when completing in `read-color'
+ Show the face colors when completing in `read-color'
* lisp/faces.el (defined-colors-with-face-attributes): New function.
(readable-foreground-color, defined-colors-with-face-attributes)
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 7d90c20..0905ae7 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1417,6 +1417,8 @@ commands, and @dfn{keymaps}, which record key bindings.
It also
explains how to customize key bindings, which is done by editing your
init file (@pxref{Init Rebinding}).
address@hidden reserved key bindings
address@hidden keys, reserved
Since most modes define their own key bindings, activating a mode
might override your custom key bindings. A small number of keys are
reserved for user-defined bindings, and should not be used by modes,
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 17f6f35..11611e7 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -207,13 +207,13 @@ buffers are scrolled. The variable
@code{mouse-wheel-progressive-speed} determines whether the scroll
speed is linked to how fast you move the wheel.
address@hidden mwheel-tilt-scroll-p
address@hidden mwheel-flip-direction
address@hidden mouse-wheel-tilt-scroll
address@hidden mouse-wheel-flip-direction
Emacs can also support horizontal scrolling if your mouse's wheel can
be tilted. This feature is off by default; the variable
address@hidden turns it on. If you'd like to reverse the
-direction of horizontal scrolling, customize the variable
address@hidden to a address@hidden value.
address@hidden turns it on. If you'd like to reverse
+the direction of horizontal scrolling, customize the variable
address@hidden to a address@hidden value.
@node Word and Line Mouse
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 8d0127f..db2c6ff 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -138,9 +138,10 @@ specifications.
@node Table of Resources
@appendixsec Table of X Resources for Emacs
- This table lists the X resource names that Emacs recognizes,
-excluding those that control the appearance of graphical widgets like
-the menu bar:
+ The table below lists the X resource names that Emacs recognizes.
+Note that some of the resources have no effect in Emacs compiled with
+various X toolkits (GTK+, Lucid, etc.)---we indicate below when this
+is the case.
@table @asis
@item @code{background} (class @code{Background})
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index cb4048d..eded00e 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -431,9 +431,9 @@ always restricting the margin to a quarter of the window.
+++
** Emacs can scroll horizontally using mouse, touchpad, and trackbar.
-You can enable this by customizing 'mwheel-tilt-scroll-p'. If you
+You can enable this by customizing 'mouse-wheel-tilt-scroll'. If you
want to reverse the direction of the scroll, customize
-'mwheel-flip-direction'.
+'mouse-wheel-flip-direction'.
+++
** The default GnuTLS priority string now includes %DUMBFW.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b837fb4..e8b5e67 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 cbd78137..44c4989 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 caac96a..66b1767 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 bc2be4a..175c82f 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")
diff --git a/src/window.c b/src/window.c
index 08c3f32..e6d0280 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5923,6 +5923,9 @@ and redisplay normally--don't erase and redraw the frame.
*/)
EMACS_INT iarg UNINIT;
int this_scroll_margin;
+ /* For reasons why we signal an error here, see
+ http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00053.html,
+ http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00094.html. */
if (buf != current_buffer)
error ("`recenter'ing a window that does not display current-buffer.");