From 4a73fb966876ba8c8aefa24ee51448d2b44df1bf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 29 Aug 2020 09:45:51 +0300 Subject: [PATCH 1/5] Fix description of %-constructs in 'mode-line-format' * doc/lispref/modes.texi (%-Constructs): Document %@ and remove %M, which is no longer supported. (Bug#43092) --- doc/lispref/modes.texi | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index e685391c955..e7049b4741b 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -2335,6 +2335,10 @@ read-only buffer. @xref{Buffer Modification}. @item %& @samp{*} if the buffer is modified, and @samp{-} otherwise. +@item %@@ +@samp{@@} if the buffer's @code{default-directory} (@pxref{File Name +Expansion}) is on a remote machine, and @samp{-} otherwise. + @item %[ An indication of the depth of recursive editing levels (not counting minibuffer levels): one @samp{[} for each editing level. @@ -2352,16 +2356,13 @@ The character @samp{%}---this is how to include a literal @samp{%} in a string in which @code{%}-constructs are allowed. @end table -The following two @code{%}-constructs are still supported, but they are -obsolete, since you can get the same results with the variables -@code{mode-name} and @code{global-mode-string}. +The following @code{%}-construct is still supported, but it is +obsolete, since you can get the same result using the variable +@code{mode-name}. @table @code @item %m The value of @code{mode-name}. - -@item %M -The value of @code{global-mode-string}. @end table @node Properties in Mode From dddc971f0e58e775578623eb3f026dc43bdda48a Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sat, 29 Aug 2020 19:29:54 +0000 Subject: [PATCH 2/5] CC Mode: Fix processing for when c-multiline-string-start-char is a character * lisp/progmodes/cc-mode.el (c-pps-to-string-delim) (c-multiline-string-check-final-quote): Replace c-clear-char-property by c-clear-syn-tab. (c-multiline-string-check-final-quote): Replace c-put-char-property by c-put-syn-tab. --- lisp/progmodes/cc-mode.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 066bec60091..74afeecf8f7 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1163,7 +1163,7 @@ Note that the style variables are always made local to the buffer." (while (progn (parse-partial-sexp (point) end nil nil st-s 'syntax-table) (unless (bobp) - (c-clear-char-property (1- (point)) 'syntax-table)) + (c-clear-syn-tab (1- (point)))) (setq st-pos (point)) (and (< (point) end) (not (eq (char-before) ?\"))))) @@ -1196,7 +1196,7 @@ Note that the style variables are always made local to the buffer." t) (t ;; At a significant " - (c-clear-char-property (1- (point)) 'syntax-table) + (c-clear-syn-tab (1- (point))) (setq pos-ll (c-literal-limits) pos-lt (c-literal-type pos-ll)) nil))) @@ -1204,7 +1204,7 @@ Note that the style variables are always made local to the buffer." (cond ((bobp)) ((eq pos-lt 'string) - (c-put-char-property (1- (point)) 'syntax-table '(15))) + (c-put-syn-tab (1- (point)) '(15))) (t nil))))) (defvar c-fl-syn-tab-region nil) From 29708cbde7afef52458950512e91a7904ed491c9 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 30 Aug 2020 15:43:58 +0200 Subject: [PATCH 3/5] Some precisions to bug handling * admin/admin.el (reminder-for-release-blocking-bugs): Add date to subject. * admin/notes/bug-triage: * admin/notes/bugtracker: Minor precisions. --- admin/admin.el | 3 ++- admin/notes/bug-triage | 10 +++++++--- admin/notes/bugtracker | 13 ++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/admin/admin.el b/admin/admin.el index 93dc1f48f12..22d29673fb5 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -951,7 +951,8 @@ changes (in a non-trivial way). This function does not check for that." (lambda () ; posthook (goto-char (point-min)) (mail-position-on-field "subject") - (insert (format "Release-blocking bugs for Emacs %s" version)) + (insert (format "Reminder: release-blocking bugs for Emacs %s (%s)" + version (format-time-string "%F" nil "UTC0"))) (mail-text) (delete-region (point) (point-max)) (insert " diff --git a/admin/notes/bug-triage b/admin/notes/bug-triage index 87fb471c708..3d9a275c9d2 100644 --- a/admin/notes/bug-triage +++ b/admin/notes/bug-triage @@ -11,7 +11,11 @@ interface via org-mode. The goal of this triage is to prune down the list of old bugs, closing the ones that are not reproducible on the current release. - 1. To start, enter debbugs mode (either debbugs-gnu, debbugs-org, or via the + 0. To start, check the most relevant bugs blocking a release by + calling debbugs-gnu-emacs-release-blocking-reports. If you want + to check this for another Emacs version but the next-to-be-released-one, + use the "C-u" prefix. + 1. After that, enter debbugs mode (either debbugs-gnu, debbugs-org, or via the web browser), and accept the default list option of bugs that have severity serious, important, or normal. 2. For each bug, we want to primarily make sure it is still @@ -20,7 +24,7 @@ the ones that are not reproducible on the current release. suggested checklist to follow for handling these bugs, along with example replies. Closing, tagging, etc., are done with debbugs control messages, which in debbugs-gnu is initiated - with a "C". + with a "C" or "E". [ ] Read the mail thread for the bug. Find out if anyone has been able to reproduce this on the current release. If someone has been able to, then your work is finished for this @@ -87,7 +91,7 @@ necessary information for others to act on. For each new bug, ask the following questions: 1. Is the bug report written in a way to be easy to reproduce (starts from - emacs -Q, etc.)? If not, ask the reporter to try and reproduce it on an + "emacs -Q", etc.)? If not, ask the reporter to try and reproduce it on an emacs without customization. 2. Is the bug report written against the latest emacs? If not, try to reproduce on the latest version, and if it can't be reproduced, ask the diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index ac54f8de029..9eb65e1f864 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -33,7 +33,7 @@ By mailing commands to control@debbugs.gnu.org. Place commands at the start of the message body, one per line. severity 123 serious|important|normal|minor|wishlist -tags 123 moreinfo|unreproducible|wontfix|patch +tags 123 moreinfo|unreproducible|wontfix|patch|notabug * More detailed information @@ -185,7 +185,7 @@ Basically, reply only to the numbered bug address (and any individual people's addresses). Do not send mail direct to bug-gnu-emacs or emacs-pretest-bug unless you are reporting a new bug. -** To close bug #123 (for example), send mail +** To close bug#123 (for example), send mail To: 123-done@debbugs.gnu.org @@ -260,7 +260,7 @@ reopen 123 *** Bugs can be tagged in various ways (eg wontfix, patch, etc). The available tags are: -patch wontfix moreinfo unreproducible fixed notabug security confirmed +patch wontfix moreinfo unreproducible fixed notabug help security confirmed easy See https://debbugs.gnu.org/Developer#tags The list of tags can be prefixed with +, - or =, meaning to add (the default), remove, or reset the tags. E.g.: @@ -290,10 +290,9 @@ limited, predefined set of normal tags are available (see above). 2) A usertag is associated with a specific user. This is normally an email address (with an "@" sign and least 4 characters after the "@"), -but on debbugs.gnu.org, the definition is less strict - anything with -5 or more alphanumeric characters will work. For personal tags, +but on debbugs.gnu.org, it can also be a package name. For personal tags, using an email address is still recommended. Please only use the -"emacs" user, or other short users, for "official" tags. +"emacs" user for "official" tags. You set usertags in the same way as tags, by talking to the control server. One difference is that you can also specify the associated user. @@ -307,7 +306,7 @@ a) In a control message: user emacs # or email@example.com usertags 1234 any-tag-you-like -This will add a usertag "any-tag-you-like" to bug 1234. The tag will +This will add a usertag "any-tag-you-like" to bug#1234. The tag will be associated with the user "emacs". If you omit the first line, the tag will be associated with your email address. From 7605060d51bbce88307c09bd2e9be60f2750ee3d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 31 Aug 2020 04:35:17 +0200 Subject: [PATCH 4/5] Update Elisp Manual reference to which-function-mode * doc/lispref/modes.texi (Mode Line Top, Mode Line Variables) Don't refer to obsolete alias for 'which-function-mode'. (Bug#13716) --- doc/lispref/modes.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index e7049b4741b..4edda793e07 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -2047,7 +2047,7 @@ be useful for Shell mode (in reality, Shell mode does not set "%n" ")%]--" @group - '(which-func-mode ("" which-func-format "--")) + '(which-function-mode ("" which-func-format "--")) '(line-number-mode "L%l--") '(column-number-mode "C%c--") '(-3 "%p"))) @@ -2055,8 +2055,8 @@ be useful for Shell mode (in reality, Shell mode does not set @end example @noindent -(The variables @code{line-number-mode}, @code{column-number-mode} -and @code{which-func-mode} enable particular minor modes; as usual, +(The variables @code{line-number-mode}, @code{column-number-mode} and +@code{which-function-mode} enable particular minor modes; as usual, these variable names are also the minor mode command names.) @node Mode Line Variables @@ -2198,7 +2198,7 @@ enabled separately in each buffer. @defvar global-mode-string This variable holds a mode line construct that, by default, appears in -the mode line just after the @code{which-func-mode} minor mode if set, +the mode line just after the @code{which-function-mode} minor mode if set, else after @code{mode-line-modes}. The command @code{display-time} sets @code{global-mode-string} to refer to the variable @code{display-time-string}, which holds a string containing the time and @@ -2227,7 +2227,7 @@ specifies addition of text properties. " " @group mode-line-modes - (which-func-mode ("" which-func-format "--")) + (which-function-mode ("" which-func-format "--")) (global-mode-string ("--" global-mode-string)) "-%-") @end group From f20169399df9c6c884ae597d1737ad230ecb7f5e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 31 Aug 2020 11:34:18 +0200 Subject: [PATCH 5/5] Fix typo in Introduction to Emacs Lisp * doc/lispintro/emacs-lisp-intro.texi (type-of-animal in detail): Remove extraneous parenthesis. --- doc/lispintro/emacs-lisp-intro.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 46462162ca0..e6c54efba73 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -3997,7 +3997,7 @@ looks like this: @smallexample @group (if (equal characteristic "fierce") - (message "It is a tiger!"))) + (message "It is a tiger!")) @end group @end smallexample