Commit 762ea10d authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from origin/emacs-26

0213c8bf (origin/emacs-26) mwheel minor consistency fix
82f12b2f * src/window.c (Frecenter): Improve commentary.
04da8f4c Fix downloading non-text files in EWW
832b9ece ; Spelling fixes
dd88499e ; Spelling fixes
3968f72b Rename some mwheel options, for consistency
d6e78de5 * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387d Improve the Emacs manual
56ab8e3b * lisp/dired-aux.el (dired-do-create-files): Doc fix.  (Bug#3...

Conflicts:
	etc/NEWS
	lisp/mwheel.el
parents e943b9b5 0213c8bf
...@@ -20930,7 +20930,7 @@ ...@@ -20930,7 +20930,7 @@
   
2017-04-24 Alan Third <alan@idiocy.org> 2017-04-24 Alan Third <alan@idiocy.org>
   
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. src/nsimage.m (setXBMColor): Fix calculation of xbm_fg.
   
...@@ -38136,7 +38136,7 @@ ...@@ -38136,7 +38136,7 @@
^ ^
   
* src/frame.c (x_set_frame_parameters): Drop width_changed and * 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. width and height variables.
   
2016-09-12 Michal Nazarewicz <mina86@mina86.com> 2016-09-12 Michal Nazarewicz <mina86@mina86.com>
...@@ -38193,7 +38193,7 @@ ...@@ -38193,7 +38193,7 @@
   
Refactor common code in {upcase,downcase,capitalize}-word functions 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 (casify_word) …new function which does what operate_on_word did plus
what all of the common code from *-word functions. what all of the common code from *-word functions.
(upcase-word, downcase-word, capitalize-word): Move code common between (upcase-word, downcase-word, capitalize-word): Move code common between
...@@ -38418,9 +38418,9 @@ ...@@ -38418,9 +38418,9 @@
alphabeticp. Because both of those functions require Unicode general alphabeticp. Because both of those functions require Unicode general
category lookup, this resulted in unnecessary lookups (if alphabeticp category lookup, this resulted in unnecessary lookups (if alphabeticp
return false decimalp had to perform another lookup). Drop decimalnump 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. (alphanumericp): …new function.
   
* src/regex.c (ISALNUM): Use alphanumericp. * src/regex.c (ISALNUM): Use alphanumericp.
...@@ -42329,9 +42329,9 @@ ...@@ -42329,9 +42329,9 @@
   
Enable dividers in NS (bug#22973) 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 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 src/nsterm.m (ns_draw_vertical_window_border): This had the same bug as
above, although I didn't see any errors. above, although I didn't see any errors.
   
...@@ -43563,10 +43563,10 @@ ...@@ -43563,10 +43563,10 @@
   
2016-06-08 Michal Nazarewicz <mina86@mina86.com> 2016-06-08 Michal Nazarewicz <mina86@mina86.com>
   
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 * 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 uses are migrated accordingly. The macro has not been included in
an official release yet so it should be fine to delete it. an official release yet so it should be fine to delete it.
   
...@@ -49635,7 +49635,7 @@ ...@@ -49635,7 +49635,7 @@
   
2016-02-27 Jan Moringen <jan.moringen@uni-bielefeld.de> 2016-02-27 Jan Moringen <jan.moringen@uni-bielefeld.de>
   
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. * lisp/faces.el (defined-colors-with-face-attributes): New function.
(readable-foreground-color, defined-colors-with-face-attributes) (readable-foreground-color, defined-colors-with-face-attributes)
...@@ -1417,6 +1417,8 @@ commands, and @dfn{keymaps}, which record key bindings. It also ...@@ -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 explains how to customize key bindings, which is done by editing your
init file (@pxref{Init Rebinding}). init file (@pxref{Init Rebinding}).
@cindex reserved key bindings
@cindex keys, reserved
Since most modes define their own key bindings, activating a mode Since most modes define their own key bindings, activating a mode
might override your custom key bindings. A small number of keys are might override your custom key bindings. A small number of keys are
reserved for user-defined bindings, and should not be used by modes, reserved for user-defined bindings, and should not be used by modes,
......
...@@ -207,13 +207,13 @@ buffers are scrolled. The variable ...@@ -207,13 +207,13 @@ buffers are scrolled. The variable
@code{mouse-wheel-progressive-speed} determines whether the scroll @code{mouse-wheel-progressive-speed} determines whether the scroll
speed is linked to how fast you move the wheel. speed is linked to how fast you move the wheel.
@vindex mwheel-tilt-scroll-p @vindex mouse-wheel-tilt-scroll
@vindex mwheel-flip-direction @vindex mouse-wheel-flip-direction
Emacs can also support horizontal scrolling if your mouse's wheel can Emacs can also support horizontal scrolling if your mouse's wheel can
be tilted. This feature is off by default; the variable be tilted. This feature is off by default; the variable
@code{mwheel-tilt-scroll-p} turns it on. If you'd like to reverse the @code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse
direction of horizontal scrolling, customize the variable the direction of horizontal scrolling, customize the variable
@code{mwheel-flip-direction} to a non-@code{nil} value. @code{mouse-wheel-flip-direction} to a non-@code{nil} value.
@node Word and Line Mouse @node Word and Line Mouse
......
...@@ -138,9 +138,10 @@ specifications. ...@@ -138,9 +138,10 @@ specifications.
@node Table of Resources @node Table of Resources
@appendixsec Table of X Resources for Emacs @appendixsec Table of X Resources for Emacs
This table lists the X resource names that Emacs recognizes, The table below lists the X resource names that Emacs recognizes.
excluding those that control the appearance of graphical widgets like Note that some of the resources have no effect in Emacs compiled with
the menu bar: various X toolkits (GTK+, Lucid, etc.)---we indicate below when this
is the case.
@table @asis @table @asis
@item @code{background} (class @code{Background}) @item @code{background} (class @code{Background})
......
...@@ -431,9 +431,9 @@ always restricting the margin to a quarter of the window. ...@@ -431,9 +431,9 @@ always restricting the margin to a quarter of the window.
+++ +++
** Emacs can scroll horizontally using mouse, touchpad, and trackbar. ** 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 want to reverse the direction of the scroll, customize
'mwheel-flip-direction'. 'mouse-wheel-flip-direction'.
+++ +++
** The default GnuTLS priority string now includes %DUMBFW. ** The default GnuTLS priority string now includes %DUMBFW.
......
...@@ -1842,7 +1842,8 @@ Optional arg HOW-TO determines how to treat the target. ...@@ -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. rfn-list - list of the relative names for the marked files.
fn-list - list of the absolute names for the marked files. fn-list - list of the absolute names for the marked files.
target - the name of the target itself. 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." For any other return value, TARGET is treated as a directory."
(or op1 (setq op1 operation)) (or op1 (setq op1 operation))
(let* ((fn-list (dired-get-marked-files nil arg nil nil t)) (let* ((fn-list (dired-get-marked-files nil arg nil nil t))
......
...@@ -150,30 +150,18 @@ This can be slightly disconcerting, but some people prefer it." ...@@ -150,30 +150,18 @@ This can be slightly disconcerting, but some people prefer it."
;;; For tilt-scroll ;;; For tilt-scroll
;;; ;;;
(defcustom mwheel-tilt-scroll-p nil (defcustom mouse-wheel-tilt-scroll nil
"Enable scroll using tilting mouse wheel." "Enable scroll using tilting mouse wheel."
:group 'mouse :group 'mouse
:type 'boolean :type 'boolean
:version "26.1") :version "26.1")
(defcustom mwheel-flip-direction nil (defcustom mouse-wheel-flip-direction nil
"Swap direction of 'wheel-right and 'wheel-left." "Swap direction of 'wheel-right and 'wheel-left."
:group 'mouse :group 'mouse
:type 'boolean :type 'boolean
:version "26.1") :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 (eval-and-compile
(if (fboundp 'event-button) (if (fboundp 'event-button)
(fset 'mwheel-event-button 'event-button) (fset 'mwheel-event-button 'event-button)
...@@ -211,6 +199,12 @@ This can be slightly disconcerting, but some people prefer it." ...@@ -211,6 +199,12 @@ This can be slightly disconcerting, but some people prefer it."
(defvar mwheel-scroll-down-function 'scroll-down (defvar mwheel-scroll-down-function 'scroll-down
"Function that does the job of scrolling downward.") "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 (defvar mouse-wheel-left-event
(if (or (featurep 'w32-win) (featurep 'ns-win)) (if (or (featurep 'w32-win) (featurep 'ns-win))
'wheel-left 'wheel-left
...@@ -293,13 +287,13 @@ non-Windows systems." ...@@ -293,13 +287,13 @@ non-Windows systems."
;; Make sure we do indeed scroll to the end of the buffer. ;; Make sure we do indeed scroll to the end of the buffer.
(end-of-buffer (while t (funcall mwheel-scroll-up-function))))) (end-of-buffer (while t (funcall mwheel-scroll-up-function)))))
((eq button mouse-wheel-left-event) ; for tilt scroll ((eq button mouse-wheel-left-event) ; for tilt scroll
(when mwheel-tilt-scroll-p (when mouse-wheel-tilt-scroll
(funcall (if mwheel-flip-direction (funcall (if mouse-wheel-flip-direction
mwheel-scroll-right-function mwheel-scroll-right-function
mwheel-scroll-left-function) amt))) mwheel-scroll-left-function) amt)))
((eq button mouse-wheel-right-event) ; for tilt scroll ((eq button mouse-wheel-right-event) ; for tilt scroll
(when mwheel-tilt-scroll-p (when mouse-wheel-tilt-scroll
(funcall (if mwheel-flip-direction (funcall (if mouse-wheel-flip-direction
mwheel-scroll-left-function mwheel-scroll-left-function
mwheel-scroll-right-function) amt))) mwheel-scroll-right-function) amt)))
(t (error "Bad binding in mwheel-scroll")))) (t (error "Bad binding in mwheel-scroll"))))
......
...@@ -1532,7 +1532,8 @@ Differences in #targets are ignored." ...@@ -1532,7 +1532,8 @@ Differences in #targets are ignored."
eww-download-directory))) eww-download-directory)))
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "\r?\n\r?\n") (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)))) (message "Saved %s" file))))
(defun eww-decode-url-file-name (string) (defun eww-decode-url-file-name (string)
......
...@@ -898,7 +898,7 @@ non-nil, otherwise in local time." ...@@ -898,7 +898,7 @@ non-nil, otherwise in local time."
(insert (if use-hard-newlines hard-newline "\n") (insert (if use-hard-newlines hard-newline "\n")
(if use-hard-newlines hard-newline "\n")) (if use-hard-newlines hard-newline "\n"))
(forward-line -2) (forward-line -2)
(indent-relative-maybe)) (indent-relative-first-indent-point))
(t (t
;; Make a new item. ;; Make a new item.
(while (looking-at "\\sW") (while (looking-at "\\sW")
......
...@@ -5923,6 +5923,9 @@ and redisplay normally--don't erase and redraw the frame. */) ...@@ -5923,6 +5923,9 @@ and redisplay normally--don't erase and redraw the frame. */)
EMACS_INT iarg UNINIT; EMACS_INT iarg UNINIT;
int this_scroll_margin; 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) if (buf != current_buffer)
error ("`recenter'ing a window that does not display current-buffer."); error ("`recenter'ing a window that does not display current-buffer.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment