commit 9f9e3bc24b1ee44b13ebb41293f6dd012ce2298e (HEAD, refs/remotes/origin/master) Author: Lars Ingebrigtsen Date: Mon Oct 19 10:24:57 2020 +0200 Ffunction doc string clarification * src/eval.c (Ffunction): Mention that `function' isn't quite like `quote' in non-bytecompile circumstances, too (bug#41864). diff --git a/src/eval.c b/src/eval.c index 0b23905207..76708e6e7e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -544,7 +544,10 @@ usage: (quote ARG) */) DEFUN ("function", Ffunction, Sfunction, 1, UNEVALLED, 0, doc: /* Like `quote', but preferred for objects which are functions. In byte compilation, `function' causes its argument to be handled by -the byte compiler. `quote' cannot do that. +the byte compiler. Similarly, when expanding macros and expressions, +ARG can be examined and possibly expanded. If `quote' is used +instead, this doesn't happen. + usage: (function ARG) */) (Lisp_Object args) { commit 6d00233bfdf52fb3a03e8febabbfad5a331777cf Author: Michael Albinus Date: Mon Oct 19 09:48:51 2020 +0200 * src/dired.c (Fdirectory_files, Fdirectory_files_and_attributes): Adapt docstring. diff --git a/src/dired.c b/src/dired.c index 1584b6acf0..442d3aa48f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -293,7 +293,8 @@ DEFUN ("directory-files", Fdirectory_files, Sdirectory_files, 1, 4, 0, There are three 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. +If MATCH is non-nil, mention only file names which non-directory part + matches the regexp MATCH. If NOSORT is non-nil, the list is not sorted--its order is unpredictable. Otherwise, the list returned is sorted with `string-lessp'. NOSORT is useful if you plan to sort the result yourself. */) @@ -325,11 +326,12 @@ 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. +If MATCH is non-nil, mention only file names which non-directory part + matches the regexp MATCH. If NOSORT is non-nil, the list is not sorted--its order is unpredictable. NOSORT is useful if you plan to sort the result yourself. ID-FORMAT specifies the preferred format of attributes uid and gid, see -`file-attributes' for further documentation. + `file-attributes' for further documentation. On MS-Windows, performance depends on `w32-get-true-file-attributes', which see. */) (Lisp_Object directory, Lisp_Object full, Lisp_Object match, commit f98e57b54bbb6c8aa3d5b00b7d8b33266025b9b1 Author: Michael Albinus Date: Mon Oct 19 09:41:11 2020 +0200 * lisp/files.el (directory-files-no-dot-files-regexp): Adapt docstring. diff --git a/lisp/files.el b/lisp/files.el index c2c58dae93..78ccb9ba91 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5787,7 +5787,7 @@ If called interactively, then PARENTS is non-nil." (defconst directory-files-no-dot-files-regexp "[^.]\\|\\.\\.\\." - "Regexp matching any file name except \".\" and \"..\". + "Regexp matching any non-directory part of a file name except \".\" and \"..\". More precisely, it matches parts of any nonempty string except those two. It is useful as the regexp argument to `directory-files' and `directory-files-and-attributes'.") commit 1b3e03150690931a06a5c005f0de93e324233a18 Author: Michael Albinus Date: Mon Oct 19 09:41:01 2020 +0200 ; * admin/MAINTAINERS: Add entry for Michael Albinus. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index f7ec181bf9..53afe87a0f 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -213,6 +213,7 @@ Paul Eggert src/* (except for *.m, *w32*, bitmaps, files others want to maintain) Michael Albinus + .gitlab-ci.yml src/inotify.c lisp/autorevert.el lisp/eshell/em-tramp.el commit d3c99b6b6b3dcf91dca28ce1e1b456221131ae0b Author: Stefan Kangas Date: Mon Oct 19 04:03:34 2020 +0200 ; * etc/NEWS: Some copy edits. diff --git a/etc/NEWS b/etc/NEWS index b61bf176a4..390cccbff3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -86,13 +86,13 @@ useful on systems such as FreeBSD which ships only with "etc/termcap". * Changes in Emacs 28.1 +++ -*** A new system for displaying documentation for groups of function is added. +** New system for displaying documentation for groups of function. This can either be used by saying 'M-x shortdoc-display-group' and choosing a group, or clicking a button in the *Help* buffers when looking at the doc string of a function that belongs to one of these groups. -*** New var 'redisplay-skip-initial-frame' to enable batch redisplay tests. +** New var 'redisplay-skip-initial-frame' to enable batch redisplay tests. Setting it to nil forces the redisplay to do its job even in the initial frame used in batch mode. @@ -104,7 +104,7 @@ sequences necessary to render faces with the 'strike-through' attribute on TTY frames. +++ -*** Emacs now defaults to UTF-8 instead of ISO-8859-1. +** Emacs now defaults to UTF-8 instead of ISO-8859-1. This is only for the default, where the user has set no 'LANG' (or similar) variable or environment. This change should lead to no user-visible changes for normal usage. @@ -163,13 +163,6 @@ your init file: (setq frame-title-format '(multiple-frames "%b" ("" invocation-name "@" system-name))) -** recentf - ---- -*** 'recentf-auto-cleanup' time string now repeats. -When 'recentf-auto-cleanup' is set to a time string, it now repeats -every day, rather than only running once after the mode is turned on. - * Editing Changes in Emacs 28.1 @@ -213,11 +206,6 @@ buffer to be able to move point to the inaccessible portion. ** When 'suggest-key-bindings' is non-nil, the completion list of 'M-x' shows equivalent key bindings for all commands that have them. ---- -** Movement commands in 'gomoku-mode' are fixed. -'gomoku-move-sw' and 'gomoku-move-ne' now work correctly, and -horizontal movements now stop at the edge of the board. - ** Autosaving via 'auto-save-visited-mode' can now be inhibited by setting the variable 'auto-save-visited-mode' buffer-locally to nil. @@ -1126,9 +1114,15 @@ custom rules, see the variables 'bug-reference-setup-from-vc-alist', It's bound to the 'C-c C-c f' keystroke, and prompts for a local file name. ---- ** Recentf -The recentf files are no longer backed up. + +--- +*** The recentf files are no longer backed up. + +--- +*** 'recentf-auto-cleanup' time string now repeats. +When 'recentf-auto-cleanup' is set to a time string, it now repeats +every day, rather than only running once after the mode is turned on. ** Calc @@ -1315,6 +1309,11 @@ never be narrower than 19 characters. When the bookmark.el library is loaded, a customize choice is added to 'tab-bar-new-tab-choice' for new tabs to show the bookmark list. +--- +*** Movement commands in 'gomoku-mode' are fixed. +'gomoku-move-sw' and 'gomoku-move-ne' now work correctly, and +horizontal movements now stop at the edge of the board. + ** xwidget-webkit mode *** New xwidget commands. commit 34eb99d7ba63761ba12acff2b01dc900bbccc720 Author: Juri Linkov Date: Sun Oct 18 23:37:57 2020 +0300 Add new choice 'keep' to next-error-message-highlight (bug#32676) * lisp/simple.el (next-error-message-highlight): Add new choice 'keep'. (next-error-message-highlight): Don't delete overlay when option is 'keep'. diff --git a/etc/NEWS b/etc/NEWS index 64758d455a..b61bf176a4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1185,6 +1185,8 @@ be done (and this restores how this previously worked). *** New user option 'next-error-message-highlight'. In addition to a fringe arrow, 'next-error' error may now optionally highlight the current error message in the 'next-error' buffer. +This user option can be also customized to keep highlighting on all +visited errors, so you can have an overview what errors were already visited. +++ *** New user option 'tab-first-completion'. diff --git a/lisp/simple.el b/lisp/simple.el index d6fce922c4..a29f85b3c3 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -119,8 +119,12 @@ If non-nil, the value is passed directly to `recenter'." :version "23.1") (defcustom next-error-message-highlight nil - "If non-nil, highlight the current error message in the `next-error' buffer." - :type 'boolean + "If non-nil, highlight the current error message in the `next-error' buffer. +If the value is `keep', highlighting is permanent, so all visited error +messages are highlighted; this helps to see what messages were visited." + :type '(choice (const :tag "Highlight the current error" t) + (const :tag "Highlight all visited errors" keep) + (const :tag "No highlighting" nil)) :group 'next-error :version "28.1") @@ -482,7 +486,8 @@ buffer causes automatic display of the corresponding source code location." "Highlight the current error message in the ‘next-error’ buffer." (when next-error-message-highlight (with-current-buffer error-buffer - (when next-error--message-highlight-overlay + (when (and next-error--message-highlight-overlay + (not (eq next-error-message-highlight 'keep))) (delete-overlay next-error--message-highlight-overlay)) (let ((ol (make-overlay (line-beginning-position) (1+ (line-end-position))))) ;; do not override region highlighting commit 6da62d612eea6ecfd2b9c9c72d936b1b7b740889 Author: Juri Linkov Date: Sun Oct 18 23:30:15 2020 +0300 * etc/HELLO: Add Belarusian and use Javanese script for Javanese (bug#43887) diff --git a/etc/HELLO b/etc/HELLO index e0345cb7ab..10c4e9e66c 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -25,7 +25,8 @@ LANGUAGE (NATIVE NAME) HELLO mule-unicode-0100-24ffAmharic (አማርኛ) ሠላም Arabic (العربيّة) السّلام عليكم Armenian (հայերեն) Բարև ձեզ -Bengali (বাংলা) নমস্কার +cyrillic-iso8859-5Belarusian (беларуская) Прывітанне +mule-unicode-0100-24ffBengali (বাংলা) নমস্কার mule-unicode-2500-33ffBraille ⠓⠑⠇⠇⠕ mule-unicode-0100-24ffBurmese (မြန်မာ) မင်္ဂလာပါ C printf ("Hello, world!\n"); @@ -58,8 +59,8 @@ Gujarati (ગુજરાતી) નમસ્તે unicodeInuktitut (ᐃᓄᒃᑎᑐᑦ) ᐊᐃ latin-iso8859-1Italian (italiano) Ciao / Buon giorno -Javanese (Jawa) System.out.println("Sugeng siang!"); -mule-unicode-0100-24ffKannada (ಕನ್ನಡ) ನಮಸ್ಕಾರ +unicodeJavanese (ꦧꦱꦗꦮ) ꦱꦸꦒꦼꦁꦱꦶꦪꦁ +mule-unicode-0100-24ffKannada (ಕನ್ನಡ) ನಮಸ್ಕಾರ Khmer (ភាសាខ្មែរ) ជំរាបសួរ laoLao (ພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ mule-unicode-0100-24ffMalayalam (മലയാളം) നമസ്കാരം commit 58a9cec52574cc5caacc9c7075ef45e90be3c25d Author: Stefan Kangas Date: Tue Sep 8 16:12:43 2020 +0200 Add "Old-" prefix to "Version" header in more cases These version numbers are historical accidents and not relevant today. Ref: https://lists.gnu.org/r/emacs-devel/2020-03/msg00080.html diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 18ca05af4c..a26da265fe 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -4,7 +4,7 @@ ;; Author: John Wiegley ;; Created: 25 Mar 1999 -;; Version: 2.6.1 +;; Old-Version: 2.6.1 ;; Keywords: calendar data ;; This file is part of GNU Emacs. diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 9d520278a7..1d4358d738 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre -;; Version: 2.1 +;; Old-Version: 2.1 ;; Keywords: convenience text ;; X-URL: https://www.emacswiki.org/emacs/ViniciusJoseLatorre diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 71474c0289..1d9b4726b0 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -3,7 +3,6 @@ ;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. ;; Author: Dave Gillespie -;; Version: 2.01 ;; Keywords: abbrev ;; This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 964836a32a..177710038a 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -4,7 +4,7 @@ ;; Software Foundation, Inc. ;; Author: Eric M. Ludlam -;; Version: 0.2 +;; Old-Version: 0.2 ;; Keywords: OO, chart, graph ;; This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 61af5e51bd..11b28b72cf 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -4,7 +4,7 @@ ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. ;; Created: 24-Feb-1993 -;; Version: 1.8 +;; Old-Version: 1.8 ;; Last Modified: 1993/06/01 21:33:00 ;; Keywords: extensions, matching diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 61f7cbf969..67bfbf703b 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -5,7 +5,7 @@ ;; Author: Steven L Baur (1997-2011) ;; Boruch Baum (2017-) ;; Keywords: mail, news -;; Version: 0.19 +;; Old-Version: 0.19 ;; This file is part of GNU Emacs. diff --git a/lisp/md4.el b/lisp/md4.el index 925686aa75..029a125b8a 100644 --- a/lisp/md4.el +++ b/lisp/md4.el @@ -4,7 +4,7 @@ ;; Author: Taro Kawagishi ;; Keywords: MD4 -;; Version: 1.00 +;; Old-Version: 1.00 ;; Created: February 2001 ;; This file is part of GNU Emacs. diff --git a/lisp/net/sasl-ntlm.el b/lisp/net/sasl-ntlm.el index ec5b53ee91..6882c23d78 100644 --- a/lisp/net/sasl-ntlm.el +++ b/lisp/net/sasl-ntlm.el @@ -4,7 +4,7 @@ ;; Author: Taro Kawagishi ;; Keywords: SASL, NTLM -;; Version: 1.00 +;; Old-Version: 1.00 ;; Created: February 2001 ;; Package: sasl diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index a03d0a9a05..8a69f9decf 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -4,7 +4,7 @@ ;; Author: Ron Schnell ;; Created: 25 Jul 1992 -;; Version: 2.02 +;; Old-Version: 2.02 ;; Keywords: games ;; This file is part of GNU Emacs. @@ -1957,7 +1957,7 @@ to swim.") (defun dun-help (_args) (dun-mprincl -"Welcome to dunnet (2.02), by Ron Schnell (ronnie@driver-aces.com - @RonnieSchnell). +"Welcome to dunnet by Ron Schnell (ronnie@driver-aces.com - @RonnieSchnell). Here is some useful information (read carefully because there are one or more clues in here): - If you have a key that can open a door, you do not need to explicitly diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el index 74e6c2d034..bb8ae5693f 100644 --- a/lisp/play/gamegrid.el +++ b/lisp/play/gamegrid.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. ;; Author: Glynn Clements -;; Version: 1.02 +;; Old-Version: 1.02 ;; Created: 1997-08-13 ;; Keywords: games diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index a8c0e045c6..3b24cabe8b 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -4,7 +4,7 @@ ;; Inc. ;; Author: Daniel Pfeiffer -;; Version: 2.0f +;; Old-Version: 2.0f ;; Maintainer: emacs-devel@gnu.org ;; Keywords: languages, unix diff --git a/lisp/savehist.el b/lisp/savehist.el index 4e52efe7f1..5d20239d17 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el @@ -5,7 +5,7 @@ ;; Author: Hrvoje Nikšić ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience, minibuffer -;; Version: 24 +;; Old-Version: 24 ;; This file is part of GNU Emacs. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 7196692001..e98072c11f 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -4,7 +4,7 @@ ;; Author: Tomas Abrahamsson ;; Keywords: mouse -;; Version: 1.2.6 +;; Old-Version: 1.2.6 ;; Release-date: 6-Aug-2004 ;; Location: http://www.lysator.liu.se/~tab/artist/ commit 282f35083c02ace9b287dc311bef1d16721e6c0c Author: Eli Zaretskii Date: Sun Oct 18 17:40:45 2020 +0300 ; * etc/NEWS: Call out the new variable 'shr-offer-extend-specpdl'. diff --git a/etc/NEWS b/etc/NEWS index 27661e647a..64758d455a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -840,6 +840,14 @@ current environment. Its default value matches localized abbreviations of the "reply" prefix on the Subject line in various languages. +--- +*** New user option 'shr-offer-extend-specpdl'. +If this is nil, rendering of HTML in the email message body that +requires to enlarge 'max-specpdl-size', the number of Lisp variable +bindings, will be aborted, and Emacs will not ask you whether to +enlarge 'max-specpdl-size' to complete the rendering. The default is +t, which preserves the original behavior. + ** Apropos *** New commands 'apropos-next-symbol' and 'apropos-previous-symbol'. commit 9bc5c016a1cbdcb0c29b2deaec1d8156852a3980 Author: Mattias Engdegård Date: Sun Oct 18 15:54:02 2020 +0200 Strengthen js-mode indentation tests Test not only that the indentation engine is idempotent but that it will indent a file to the expected shape from scratch. * test/lisp/progmodes/js-tests.el (js-tests--remove-indentation): New. (js-deftest-indent): Extend test. diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el index 1de2df0e85..6c3a618b94 100644 --- a/test/lisp/progmodes/js-tests.el +++ b/test/lisp/progmodes/js-tests.el @@ -199,6 +199,14 @@ if (!/[ (:,='\"]/.test(value)) { ;;;; Indentation tests. +(defun js-tests--remove-indentation () + "Remove all indentation in the current buffer." + (goto-char (point-min)) + (while (re-search-forward (rx bol (+ (in " \t"))) nil t) + (let ((syntax (save-match-data (syntax-ppss)))) + (unless (nth 3 syntax) ; Avoid multiline string literals. + (replace-match ""))))) + (defmacro js-deftest-indent (file) `(ert-deftest ,(intern (format "js-indent-test/%s" file)) () :tags '(:expensive-test) @@ -206,6 +214,11 @@ if (!/[ (:,='\"]/.test(value)) { (unwind-protect (with-current-buffer buf (let ((orig (buffer-string))) + (js-tests--remove-indentation) + ;; Indent and check that we get the original text. + (indent-region (point-min) (point-max)) + (should (equal (buffer-string) orig)) + ;; Verify idempotency. (indent-region (point-min) (point-max)) (should (equal (buffer-string) orig)))) (kill-buffer buf)))))