From 24ba63314f29fdffa9cfe012927e5efd744c138d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 28 May 2018 17:12:34 +0200 Subject: [PATCH 1/9] Improve read-multiple-choice docstring (Bug#31628) * lisp/emacs-lisp/rmc.el (read-multiple-choice): Improve docstring. --- lisp/emacs-lisp/rmc.el | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el index 3dd3508903a..31974782b53 100644 --- a/lisp/emacs-lisp/rmc.el +++ b/lisp/emacs-lisp/rmc.el @@ -30,12 +30,12 @@ "Ask user a multiple choice question. PROMPT should be a string that will be displayed as the prompt. -CHOICES is an alist where the first element in each entry is a -character to be entered, the second element is a short name for -the entry to be displayed while prompting (if there's room, it -might be shortened), and the third, optional entry is a longer -explanation that will be displayed in a help buffer if the user -requests more help. +CHOICES is a list of (KEY NAME [DESCRIPTION]). KEY is a +character to be entered. NAME is a short name for the entry to +be displayed while prompting (if there's room, it might be +shortened). DESCRIPTION is an optional longer explanation that +will be displayed in a help buffer if the user requests more +help. This function translates user input into responses by consulting the bindings in `query-replace-map'; see the documentation of @@ -46,9 +46,9 @@ perform the requested window recentering or scrolling and ask again. When `use-dialog-box' is t (the default), this function can pop -up a dialog window to collect the user input. That functionality -requires `display-popup-menus-p' to return t. Otherwise, a text -dialog will be used. +up a dialog window to collect the user input. That functionality +requires `display-popup-menus-p' to return t. Otherwise, a +text dialog will be used. The return value is the matching entry from the CHOICES list. From 186280fbbc48d3dc2bfa022d11c1c000a1881bd4 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 29 May 2018 19:45:23 +0200 Subject: [PATCH 2/9] * doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh example. --- doc/misc/tramp.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 4e75b9a8f04..5fc77cd48c8 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3159,6 +3159,11 @@ following line to @file{~/.zshrc}: [[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return @end example +This uses the default value of @code{tramp-terminal-type}, +@samp{"dumb"}, as value of the @env{TERM} environment variable. If +you want to use another value for @env{TERM}, change +@code{tramp-terminal-type} accordingly. + When using fish shell on remote hosts, disable fancy formatting by adding the following to @file{~/.config/fish/config.fish}: From f212fe512c3b1757310e875882e3d76b7e8fba23 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 29 May 2018 20:32:08 +0200 Subject: [PATCH 3/9] Handle case where Xft is found but not XRender * configure.ac (XFT_LIBS): Ensure that HAVE_XFT is no if XRender is not found. (Bug#31634) --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c66c80adbb6..c6101d63538 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,8 +3210,8 @@ if test "${HAVE_X11}" = "yes"; then if test "x${with_xft}" != "xno"; then EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no]) - ## Because xftfont.c uses XRenderQueryExtension, we also - ## need to link to -lXrender. + ## Because xterm.c uses XRenderQueryExtension when XFT is + ## enabled, we also need to link to -lXrender. HAVE_XRENDER=no AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then @@ -3234,6 +3234,9 @@ if test "${HAVE_X11}" = "yes"; then CPPFLAGS=$OLD_CPPFLAGS CFLAGS=$OLD_CFLAGS LIBS=$OLD_LIBS + else + # Make sure XFT is disabled if we found XFT but not XRender + HAVE_XFT=no fi # "$HAVE_XFT" != no fi # "x${with_xft}" != "xno" From b8e7749b3384ea14ca22be4d3adb8659f462ea06 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 30 May 2018 09:00:04 +0200 Subject: [PATCH 4/9] Fix example in Tramp manual * doc/misc/tramp.texi (Frequently Asked Questions): Fix wording for the zsh example. --- doc/misc/tramp.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 5fc77cd48c8..a00f2f249ba 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3162,7 +3162,7 @@ following line to @file{~/.zshrc}: This uses the default value of @code{tramp-terminal-type}, @samp{"dumb"}, as value of the @env{TERM} environment variable. If you want to use another value for @env{TERM}, change -@code{tramp-terminal-type} accordingly. +@code{tramp-terminal-type} and this line accordingly. When using fish shell on remote hosts, disable fancy formatting by adding the following to @file{~/.config/fish/config.fish}: From aa175a40586c1021549e775b30fb03b4ffb09ac0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 30 May 2018 20:30:07 +0300 Subject: [PATCH 5/9] Adapt hexl-mode to native line-number display * lisp/hexl.el (hexl-mode-ruler): When display-line-numbers is in effect, adjust offsets and columns to account for the line-number display. (Bug#31595) --- lisp/hexl.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/hexl.el b/lisp/hexl.el index d716405f97a..2c1a7de48a7 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -1104,8 +1104,15 @@ This function is assumed to be used as callback function for `hl-line-mode'." "Return a string ruler for Hexl mode." (let* ((highlight (mod (hexl-current-address) 16)) (s (cdr (assq hexl-bits hexl-rulers))) - (pos 0)) + (pos 0) + (lnum-width + (if display-line-numbers + (round (line-number-display-width 'columns)) + 0))) (set-text-properties 0 (length s) nil s) + (when (> lnum-width 0) + (setq s (concat (make-string lnum-width ? ) s)) + (setq pos (+ pos lnum-width))) ;; Turn spaces in the header into stretch specs so they work ;; regardless of the header-line face. (while (string-match "[ \t]+" s pos) @@ -1116,10 +1123,11 @@ This function is assumed to be used as callback function for `hl-line-mode'." s)) ;; Highlight the current column. (let ( (offset (+ (* 2 highlight) (/ (* 8 highlight) hexl-bits))) ) + (if (> lnum-width 0) (setq offset (+ offset lnum-width))) (put-text-property (+ 11 offset) (+ 13 offset) 'face 'highlight s)) ;; Highlight the current ascii column - (put-text-property (+ (hexl-ascii-start-column) highlight 1) - (+ (hexl-ascii-start-column) highlight 2) + (put-text-property (+ (hexl-ascii-start-column) lnum-width highlight 1) + (+ (hexl-ascii-start-column) lnum-width highlight 2) 'face 'highlight s) s)) From b682a7e5bc644d88ca4e08a9b69e82ac799527c5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 30 May 2018 22:31:52 +0300 Subject: [PATCH 6/9] ; * etc/NEWS: Add headings for Emacs 26.2 --- etc/NEWS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 10afb7b4202..217c4405ce3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,33 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing C-u C-h C-n. + +* Installation Changes in Emacs 26.2 + + +* Startup Changes in Emacs 26.2 + + +* Changes in Emacs 26.2 + + +* Editing Changes in Emacs 26.2 + + +* Changes in Specialized Modes and Packages in Emacs 26.2 + + +* New Modes and Packages in Emacs 26.2 + + +* Incompatible Lisp Changes in Emacs 26.2 + + +* Lisp Changes in Emacs 26.2 + + +* Changes in Emacs 26.2 on Non-Free Operating Systems + * Installation Changes in Emacs 26.1 From df8649ac40be54cc3007241c4c1d5b1cb81c54dd Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 30 May 2018 23:30:11 +0000 Subject: [PATCH 7/9] * lisp/gnus/message.el (message-remove-header): Don't remove things not looking like header (bug#31651). --- lisp/gnus/message.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 0eebbe299d2..461f61f144d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2431,7 +2431,9 @@ Return the number of headers removed." (while (and (not (eobp)) (not last)) (if (if reverse - (not (looking-at regexp)) + (and (not (looking-at regexp)) + ;; Don't remove things not looking like header. + (looking-at "[!-9;-~]+:")) (looking-at regexp)) (progn (incf number) From 99f92dab3d64c4ef0a38fa2f0ea5fd48b8bb2e1a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 1 Jun 2018 11:27:29 +0300 Subject: [PATCH 8/9] Improve documentation of 'directory-files-and-attributes' * doc/lispref/files.texi (Contents of Directories): Fix inaccurate description of the return value of directory-files-and-attributes. * src/dired.c (Fdirectory_files_and_attributes): Describe the function's value in more detail. --- doc/lispref/files.texi | 4 ++-- src/dired.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index f62b670f47f..5137f3a9ab4 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2917,8 +2917,8 @@ are included. This is similar to @code{directory-files} in deciding which files to report on and how to report their names. However, instead of returning a list of file names, it returns for each file a -list @code{(@var{filename} . @var{attributes})}, where @var{attributes} -is what @code{file-attributes} would return for that file. +list @code{(@var{filename} @var{attributes})}, where @var{attributes} +is what @code{file-attributes} returns for that file. The optional argument @var{id-format} has the same meaning as the corresponding argument to @code{file-attributes} (@pxref{Definition of file-attributes}). diff --git a/src/dired.c b/src/dired.c index c446223a0bc..a753b1930e6 100644 --- a/src/dired.c +++ b/src/dired.c @@ -358,7 +358,14 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. DEFUN ("directory-files-and-attributes", Fdirectory_files_and_attributes, Sdirectory_files_and_attributes, 1, 5, 0, doc: /* Return a list of names of files and their attributes in DIRECTORY. -There are four optional arguments: +Value is a list of the form: + + ((FILE1 FILE1-ATTRS) (FILE2 FILE2-ATTRS) ...) + +where each FILEn-ATTRS is the attributes of FILEn as returned +by `file-attributes'. + +This function accepts four optional arguments: If FULL is non-nil, return absolute file names. Otherwise return names that are relative to the specified directory. If MATCH is non-nil, mention only file names that match the regexp MATCH. From ca3f0a8343c125a44845d21808ab0e35b87533db Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 1 Jun 2018 11:37:56 +0300 Subject: [PATCH 9/9] ; * etc/NEWS: Belated announcement of 2 changes made in Emacs 26.1. --- etc/NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 217c4405ce3..873e2dfd1dc 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -18,6 +18,13 @@ with a prefix argument or by typing C-u C-h C-n. * Installation Changes in Emacs 26.2 +--- +** Building Emacs with the '--with-xwidgets' option now requires WebKit2 +To build Emacs with xwidgets support, you will need to install the +webkit2gtk-4.0 package; version 2.12 or later is required. +(This change was actually made in Emacs 26.1, but was not called out +in its NEWS.) + * Startup Changes in Emacs 26.2 @@ -30,6 +37,17 @@ with a prefix argument or by typing C-u C-h C-n. * Changes in Specialized Modes and Packages in Emacs 26.2 +** Shell mode + +--- +*** Shell mode buffers now have 'scroll-conservatively' set to 101. +This is so as to better emulate the scrolling behavior of a text +terminal when new output is added to the screen buffer. To get back +the previous behavior, reset 'scroll-conservatively' to zero (or any +other value you like) in a function and add it to 'shell-mode-hook'. +(This change was actually made in Emacs 26.1, but was not called out +in its NEWS.) + * New Modes and Packages in Emacs 26.2