From dcc00bbb1989b27c49442422e7fbaf8c3f6415cb Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 8 Feb 2021 18:09:21 +0200 Subject: [PATCH 1/8] ; * CONTRIBUTE: Clarify the "15-lines" rule a bit more. --- CONTRIBUTE | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index 125c183229f..9f0d9e7e164 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -67,10 +67,11 @@ error-prone. It also allows sending patches whose author is someone other than the email sender. Once the cumulative amount of your submissions exceeds about 15 lines -of non-trivial code, we will need you to assign to the FSF the -copyright for your contributions. Ask on emacs-devel@gnu.org, and we -will send you the necessary form together with the instructions to -fill and email it, in order to start this legal paperwork. +of non-trivial code you added or changed (not counting deleted lines), +we will need you to assign to the FSF the copyright for your +contributions. Ask on emacs-devel@gnu.org, and we will send you the +necessary form together with the instructions to fill and email it, in +order to start this legal paperwork. ** Issue tracker (a.k.a. "bug tracker") From d03f2a6ee942882c5bc78226b4730dac6f1d0916 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 10 Feb 2021 20:04:26 +0200 Subject: [PATCH 2/8] Avoid assertion violation in callproc.c * src/callproc.c (call_process): Avoid assertion violation when DESTINATION is a cons cell '(:file . "FOO")'. (Bug#46426) --- src/callproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/callproc.c b/src/callproc.c index 5b1d8bfb765..3eac38d375a 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -394,7 +394,11 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, /* If the buffer is (still) a list, it might be a (:file "file") spec. */ if (CONSP (buffer) && EQ (XCAR (buffer), QCfile)) { - output_file = Fexpand_file_name (XCAR (XCDR (buffer)), + Lisp_Object ofile = XCDR (buffer); + if (CONSP (ofile)) + ofile = XCAR (ofile); + CHECK_STRING (ofile); + output_file = Fexpand_file_name (ofile, BVAR (current_buffer, directory)); CHECK_STRING (output_file); buffer = Qnil; From da64a257a482e95a3a314da97260ea08635a83e0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 12 Feb 2021 09:25:13 +0200 Subject: [PATCH 3/8] ; * CONTRIBUTE: Yet another clarification of significant changes. --- CONTRIBUTE | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index 9f0d9e7e164..b7d72f9965e 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -66,12 +66,15 @@ more reliably, and makes the job of applying the patches easier and less error-prone. It also allows sending patches whose author is someone other than the email sender. -Once the cumulative amount of your submissions exceeds about 15 lines -of non-trivial code you added or changed (not counting deleted lines), -we will need you to assign to the FSF the copyright for your -contributions. Ask on emacs-devel@gnu.org, and we will send you the -necessary form together with the instructions to fill and email it, in -order to start this legal paperwork. +Once the cumulative amount of your submissions exceeds about 10 lines +of non-trivial changes, we will need you to assign to the FSF the +copyright for your contributions. (To see how many lines were +non-trivially changed, count only added and modified lines in the +patched code. Consider an added or changed line non-trivial if it +includes at least one identifier, string, or substantial comment.) +Ask on emacs-devel@gnu.org, and we will send you the necessary form +together with the instructions to fill and email it, in order to start +this legal paperwork. ** Issue tracker (a.k.a. "bug tracker") From c977370dd734be12ffbaf0da2f3db529d6175b62 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 16 Feb 2021 18:20:06 +0200 Subject: [PATCH 4/8] Avoid point movement when visiting image files * lisp/image-mode.el (image-toggle-display-image): Preserve point around the call to exif-parse-buffer, to prevent it from moving into the image data. (Bug#46552) --- lisp/image-mode.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index aee91ee8b21..24be008f3f7 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -829,7 +829,9 @@ was inserted." (setq image-transform-rotation (or (exif-orientation (ignore-error exif-error - (exif-parse-buffer))) + ;; exif-parse-buffer can move point, so preserve it. + (save-excursion + (exif-parse-buffer)))) 0.0))) ;; Swap width and height when changing orientation ;; between portrait and landscape. From 850f18ef23ded4aff38afee89de7980e1c9dd1fd Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Thu, 18 Feb 2021 12:48:28 +0100 Subject: [PATCH 5/8] Allow newlines in password prompts again in comint * lisp/comint.el (comint-password-prompt-regexp): Match all whitespace (including newline) at the end of the passphrase, not just space and \t (bug#46609). (comint-watch-for-password-prompt): Remove trailing newlines from the prompt (bug#46609). Copyright-paperwork-exempt: yes --- lisp/comint.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/comint.el b/lisp/comint.el index f5abd1a5bc3..24ef0f239b2 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -366,7 +366,7 @@ This variable is buffer-local." "\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)" "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?" ;; "[[:alpha:]]" used to be "for", which fails to match non-English. - "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:blank:]]*\\'") + "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." :version "27.1" @@ -2405,6 +2405,8 @@ This function could be in the list `comint-output-filter-functions'." (string-match comint-password-prompt-regexp string)) (when (string-match "^[ \n\r\t\v\f\b\a]+" string) (setq string (replace-match "" t t string))) + (when (string-match "\n+\\'" string) + (setq string (replace-match "" t t string))) (let ((comint--prompt-recursion-depth (1+ comint--prompt-recursion-depth))) (if (> comint--prompt-recursion-depth 10) (message "Password prompt recursion too deep") From 9882e63eeaed54244a6b608685dd748f72ef66a6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 18 Feb 2021 16:07:34 +0200 Subject: [PATCH 6/8] ; * CONTRIBUTE: Another wording change regarding tiny changes. --- CONTRIBUTE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index b7d72f9965e..fe773510d36 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -66,9 +66,9 @@ more reliably, and makes the job of applying the patches easier and less error-prone. It also allows sending patches whose author is someone other than the email sender. -Once the cumulative amount of your submissions exceeds about 10 lines -of non-trivial changes, we will need you to assign to the FSF the -copyright for your contributions. (To see how many lines were +Once the cumulative amount of your submissions exceeds a dozen or so +lines of non-trivial changes, we will need you to assign to the FSF +the copyright for your contributions. (To see how many lines were non-trivially changed, count only added and modified lines in the patched code. Consider an added or changed line non-trivial if it includes at least one identifier, string, or substantial comment.) From dcb2015a5b644dafd61580c791f1f6625f5858e4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 19 Feb 2021 10:21:14 +0100 Subject: [PATCH 7/8] Mention the GNU Kind Communications Guidelines in the FAQ * doc/misc/efaq.texi (Guidelines for newsgroup postings): Mention the GNU Kind Communications Guidelines. --- doc/misc/efaq.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index fdfde96a991..c0536e0e3a2 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -388,6 +388,11 @@ posting a followup that recommends such software. @uref{news:gnu.emacs.bug} is a place where bug reports appear, but avoid posting bug reports to this newsgroup directly (@pxref{Reporting bugs}). +Finally, we recommend reading the +@url{https://www.gnu.org/philosophy/kind-communication.html, GNU Kind +Communications Guidelines} before posting to any GNU lists or +newsgroups. + @node Newsgroup archives @section Where can I get old postings to @uref{news:gnu.emacs.help} and other GNU groups? @cindex Archived postings from @code{gnu.emacs.help} From 8e8b46ef818a5f94a9697dce1c49c6869d61deed Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 19 Feb 2021 15:16:31 +0200 Subject: [PATCH 8/8] More accurate documentation of the "r" interactive spec * doc/lispref/commands.texi (Interactive Codes): Describe the effect of 'mark-even-if-inactive'. --- doc/lispref/commands.texi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 5385c03790d..7569ca6e691 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -488,7 +488,10 @@ I/O. Point and the mark, as two numeric arguments, smallest first. This is the only code letter that specifies two successive arguments rather than one. This will signal an error if the mark is not set in the buffer -which is current when the command is invoked. No I/O. +which is current when the command is invoked. If Transient Mark mode +is turned on (@pxref{The Mark}) --- as it is by default --- and user +option @code{mark-even-if-inactive} is @code{nil}, Emacs will signal +an error even if the mark @emph{is} set, but is inactive. No I/O. @item s Arbitrary text, read in the minibuffer and returned as a string