From 433e364add25dcc32f5103ec28f58298e00204d5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 16 Oct 2018 18:48:21 +0300 Subject: [PATCH 1/8] ; * etc/NEWS: Announce that emacs-module.h is now installed. --- etc/NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index bfd7db016f2f..dfafe7c5c940 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -25,6 +25,12 @@ 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.) ++++ +** Installing Emacs now installs the emacs-module.h file. +The emacs-module.h file is now installed in the system-wide include +directory as part of the Emacs installation. This allows to build +Emacs modules outside of the Emacs source tree. + * Startup Changes in Emacs 26.2 From eb6768977effe5994b6fe3afcfa262465ba631ab Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 18 Oct 2018 01:24:43 +0300 Subject: [PATCH 2/8] * lisp/mail/smtpmail.el (smtpmail-send-queued-mail): Load file with .el suffix. For the case when load-prefer-newer is t, ensure loading the right file by explicitly adding the .el suffix. Use the same variable names as in the function smtpmail-send-it. (Bug#33055) --- lisp/mail/smtpmail.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 571089d2144f..baf50dd01b7f 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -402,21 +402,22 @@ The list is in preference order.") (with-temp-buffer ;; Get index, get first mail, send it, update index, get second ;; mail, send it, etc... - (let ((file-msg "") + (let (file-data file-elisp (qfile (expand-file-name smtpmail-queue-index-file smtpmail-queue-dir)) result) (insert-file-contents qfile) (goto-char (point-min)) (while (not (eobp)) - (setq file-msg (buffer-substring (point) (line-end-position))) - (load file-msg) + (setq file-data (buffer-substring (point) (line-end-position))) + (setq file-elisp (concat file-data ".el")) + (load file-elisp) ;; Insert the message literally: it is already encoded as per ;; the MIME headers, and code conversions might guess the ;; encoding wrongly. (with-temp-buffer (let ((coding-system-for-read 'no-conversion)) - (insert-file-contents file-msg)) + (insert-file-contents file-data)) (let ((smtpmail-mail-address (or (and mail-specify-envelope-from (mail-envelope-from)) user-mail-address))) @@ -426,8 +427,8 @@ The list is in preference order.") (current-buffer))) (error "Sending failed: %s" result)) (error "Sending failed; no recipients")))) - (delete-file file-msg) - (delete-file (concat file-msg ".el")) + (delete-file file-data) + (delete-file file-elisp) (delete-region (point-at-bol) (point-at-bol 2))) (write-region (point-min) (point-max) qfile)))) From f632ecbb998ccec6442cbf1e6d76a2d63af3e9e2 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Thu, 18 Oct 2018 11:28:18 -0300 Subject: [PATCH 3/8] Update revert-buffer documentation * doc/emacs/files.texi (Reverting): Document that revert-buffer does keep undo history. (Bug#33084) Copyright-paperwork-exempt: yes --- doc/emacs/files.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index e950767c3843..c1d25af35c9a 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -926,10 +926,10 @@ way that, if the file was edited only slightly, you will be at approximately the same part of the text as before. But if you have made major changes, point may end up in a totally different location. - Reverting marks the buffer as not modified. It also clears the -buffer's undo history (@pxref{Undo}). Thus, the reversion cannot be -undone---if you change your mind yet again, you can't use the undo -commands to bring the reverted changes back. + Reverting marks the buffer as not modified. However, it adds the +reverted changes as a single modification to the buffer's undo +history (@pxref{Undo}). Thus, after reverting, you can do @kbd{C-/} +to bring the reverted changes back, if you happen to change your mind. Some kinds of buffers that are not associated with files, such as Dired buffers, can also be reverted. For them, reverting means From a4e40f6cb091f06d3edf5b9c4a2700f6eea88432 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 19 Oct 2018 11:58:53 +0300 Subject: [PATCH 4/8] ; * doc/emacs/files.texi (Reverting): Improve wording in last change. --- doc/emacs/files.texi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index c1d25af35c9a..61aa2fc3016a 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -927,9 +927,10 @@ approximately the same part of the text as before. But if you have made major changes, point may end up in a totally different location. Reverting marks the buffer as not modified. However, it adds the -reverted changes as a single modification to the buffer's undo -history (@pxref{Undo}). Thus, after reverting, you can do @kbd{C-/} -to bring the reverted changes back, if you happen to change your mind. +reverted changes as a single modification to the buffer's undo history +(@pxref{Undo}). Thus, after reverting, you can type @kbd{C-/} or its +aliases to bring the reverted changes back, if you happen to change +your mind. Some kinds of buffers that are not associated with files, such as Dired buffers, can also be reverted. For them, reverting means From cf7932712a1dac49fb299b20762d2f3329f9786b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 20 Oct 2018 11:26:33 +0300 Subject: [PATCH 5/8] Fix a pasto in a Gnus doc string * lisp/gnus/gnus-art.el (gnus-article-treat-fold-newsgroups): Doc string fix. (Bug#33081) --- lisp/gnus/gnus-art.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 15e88a342276..b712cf53efbf 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -2254,9 +2254,7 @@ This only works if the article in question is HTML." start end))))))) (defun gnus-article-treat-fold-newsgroups () - "Unfold folded message headers. -Only the headers that fit into the current window width will be -unfolded." + "Fold the Newsgroups and Followup-To message headers." (interactive) (gnus-with-article-headers (while (gnus-article-goto-header "newsgroups\\|followup-to") From 1531bca523ea84c20eec9ce1dde0202a78956313 Mon Sep 17 00:00:00 2001 From: Michael Heerdegen Date: Tue, 4 Sep 2018 22:00:11 +0200 Subject: [PATCH 6/8] Fix help-form binding in dired-create-files This fixes Bug#32630: since "dired-aux" moved to lexical binding mode, the free variable TO in the constructed HELP-FORM got out of scope of the surrounding 'let'. * lisp/dired-aux.el (dired-create-files): Make the binding of HELP-FORM a string. --- lisp/dired-aux.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index e40627309d75..eaf5f257012c 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1712,7 +1712,7 @@ or with the current marker character if MARKER-CHAR is t." (let* ((overwrite (file-exists-p to)) (dired-overwrite-confirmed ; for dired-handle-overwrite (and overwrite - (let ((help-form '(format-message "\ + (let ((help-form (format-message "\ Type SPC or `y' to overwrite file `%s', DEL or `n' to skip to next, ESC or `q' to not overwrite any of the remaining files, From 6239016ca68ebf283f41c24e1828d35ad4e1cda5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 22 Oct 2018 08:47:18 +0300 Subject: [PATCH 7/8] * doc/misc/dired-x.texi (Omitting Variables): Fix wording. (Bug#33112) --- doc/misc/dired-x.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 60915e299627..4f843a04deaf 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -322,8 +322,8 @@ Default: @code{nil} @cindex How to make omitting the default in Dired If non-@code{nil}, ``uninteresting'' files are not listed. -Uninteresting files are those whose files whose names match regexp -@code{dired-omit-files}, plus those ending with extensions in +Uninteresting files are files whose names match regexp +@code{dired-omit-files}, plus files whose names end with extension in @code{dired-omit-extensions}. @kbd{C-x M-o} (@code{dired-omit-mode}) toggles its value, which is buffer-local. Put From 2efd40076c8977aaf54d7478db96e5dbf623f37d Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 23 Oct 2018 12:19:19 +0200 Subject: [PATCH 8/8] Correct typo in GNU ELPA url * doc/misc/efaq.texi (Packages that do not come with Emacs): Correct typo in GNU ELPA url (Bug#33072). Change other url references to use https scheme. --- doc/misc/efaq.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 8bdd40c71cf9..4f42de9c422d 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -3506,7 +3506,7 @@ see @ref{Packages that do not come with Emacs}. The easiest way to add more features to your Emacs is to use the command @kbd{M-x list-packages}. This contacts the -@uref{https:///elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'') +@uref{https://elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'') server and fetches the list of additional packages that it offers. These are GNU packages that are available for use with Emacs, but are distributed separately from Emacs itself, for reasons of space, etc. @@ -3515,8 +3515,8 @@ available, and then Emacs can automatically download and install the packages that you select. @xref{Packages,,, emacs, The GNU Emacs Manual}. There are other, non-GNU, Emacs Lisp package servers, including: -@uref{http://melpa.org/, MELPA}; and -@uref{https://marmalade-repo.org/, Marmalade}. To use additional +@uref{https://melpa.org, MELPA}; and +@uref{https://marmalade-repo.org, Marmalade}. To use additional package servers, customize the @code{package-archives} variable. Be aware that installing a package can run arbitrary code, so only add sources that you trust. @@ -3527,8 +3527,8 @@ GNU Emacs sources mailing list}, which is gatewayed to the connection between the two can be unreliable) is an official place where people can post or announce their extensions to Emacs. -The @uref{http://emacswiki.org, Emacs Wiki} contains pointers to some -additional extensions. @uref{http://wikemacs.org, WikEmacs} is an +The @uref{https://emacswiki.org, Emacs Wiki} contains pointers to some +additional extensions. @uref{https://wikemacs.org, WikEmacs} is an alternative wiki for Emacs. @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs