From 56ab8e3bac9f9cc46ac9f7d4d8f8316310f61498 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 1 Mar 2018 17:31:21 +0200 Subject: [PATCH 1/9] * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#30634) --- lisp/dired-aux.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 79833eab288..c336103f80b 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1822,7 +1822,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)) From 5fe0387d9c6c968653c0e87ff5b436a6e960b8f4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 1 Mar 2018 17:51:25 +0200 Subject: [PATCH 2/9] Improve the Emacs manual * doc/emacs/xresources.texi (Table of Resources): Mention that some resources are ignored by toolkit builds. * doc/emacs/custom.texi (Key Bindings): Improve indexing. (Bug#30530) --- doc/emacs/custom.texi | 2 ++ doc/emacs/xresources.texi | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 9ba7e211013..0ffc2a0c30f 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}). +@cindex reserved key bindings +@cindex 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/xresources.texi b/doc/emacs/xresources.texi index 8d0127f9103..db2c6ffafd2 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}) From d6e78de50bac51da6927ca511cca2d6a176793bb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 1 Mar 2018 17:48:21 -0500 Subject: [PATCH 3/9] * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete alias. --- lisp/vc/add-log.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 773930f32ff..cbfd10affd1 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") From 3968f72be861b3ee1de590b1ef53f9fb56f3640e Mon Sep 17 00:00:00 2001 From: Tak Kunihiro Date: Thu, 1 Mar 2018 20:44:22 -0500 Subject: [PATCH 4/9] Rename some mwheel options, for consistency * lisp/mwheel.el (mouse-wheel-tilt-scroll) (mouse-wheel-flip-direction): Rename from mwheel-tilt-scroll-p, mwheel-flip-direction. (mwheel-scroll): Update for option renaming. * doc/emacs/frames.texi (Mouse Commands): Update for option renaming. --- doc/emacs/frames.texi | 10 +++++----- etc/NEWS | 4 ++-- lisp/mwheel.el | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 17f6f35a8a3..11611e73516 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. -@vindex mwheel-tilt-scroll-p -@vindex mwheel-flip-direction +@vindex mouse-wheel-tilt-scroll +@vindex 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 -@code{mwheel-tilt-scroll-p} turns it on. If you'd like to reverse the -direction of horizontal scrolling, customize the variable -@code{mwheel-flip-direction} to a non-@code{nil} value. +@code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse +the direction of horizontal scrolling, customize the variable +@code{mouse-wheel-flip-direction} to a non-@code{nil} value. @node Word and Line Mouse diff --git a/etc/NEWS b/etc/NEWS index cb4048dee4a..eded00e6554 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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/mwheel.el b/lisp/mwheel.el index 9718ab87d39..7107d64aa1a 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -255,13 +255,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")))) @@ -324,13 +324,13 @@ the mode if ARG is omitted or nil." ;;; 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 From dd88499e89ce61a5d3f173a5234e94f5a0e211fe Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 1 Mar 2018 18:34:17 -0800 Subject: [PATCH 5/9] ; Spelling fixes --- ChangeLog.3 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index f68ba58cacd..d8c40b33efb 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -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 @@ -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. @@ -43563,10 +43563,10 @@ 2016-06-08 Michal Nazarewicz - 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. From 832b9ece366bc79b410d8628bbad877bdb245080 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 1 Mar 2018 18:43:07 -0800 Subject: [PATCH 6/9] ; Spelling fixes --- ChangeLog.3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index d8c40b33efb..5b68559f430 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -20930,7 +20930,7 @@ 2017-04-24 Alan Third - 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. @@ -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. @@ -49635,7 +49635,7 @@ 2016-02-27 Jan Moringen - 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) From 04da8f4c292bf9cd666f883181afd1de32d0f67f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Mar 2018 10:44:44 +0200 Subject: [PATCH 7/9] Fix downloading non-text files in EWW * lisp/net/eww.el (eww-download-callback): Bind coding-system-for-read to 'no-conversion', to avoid any code- or EOL-conversions in downloaded files. (Bug#30664) --- lisp/net/eww.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) From 82f12b2f13780248fac6ce4591cf9ed8d62a41f1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Mar 2018 11:24:24 +0200 Subject: [PATCH 8/9] * src/window.c (Frecenter): Improve commentary. --- src/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/window.c b/src/window.c index 08c3f32dff5..e6d0280d9b0 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."); From 0213c8bf472b196d995d92a52b44458ac8226e42 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 2 Mar 2018 14:53:06 -0500 Subject: [PATCH 9/9] mwheel minor consistency fix * lisp/mwheel.el (mwheel-scroll-left-function) (mwheel-scroll-right-function): Change from defcustom to defvar, for consistency with pre-existing. --- lisp/mwheel.el | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 7107d64aa1a..498fcbcf5c9 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -185,6 +185,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.") + (defun mwheel-scroll (event) "Scroll up or down according to the EVENT. This should be bound only to mouse buttons 4, 5, 6, and 7 on @@ -336,18 +342,6 @@ the mode if ARG is omitted or nil." :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") - (defvar mouse-wheel-left-event (if (or (featurep 'w32-win) (featurep 'ns-win)) 'wheel-left