From 72cc9cf2cde6e8bce7884f6a91db90e592ca931c Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 26 Sep 2023 13:50:15 +0200 Subject: [PATCH 01/19] ; Fix typos --- ChangeLog.4 | 2 +- doc/misc/gnus.texi | 2 +- lisp/leim/quail/cyrillic.el | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog.4 b/ChangeLog.4 index 9d64446d68e..39b165717c3 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -79829,7 +79829,7 @@ Some adjustments to last change * src/gtkutil.c (xg_set_undecorated): Only set ARGB visual on - Cairo builds wtihout PGTK. + Cairo builds without PGTK. * src/xfns.c (select_visual): Likewise. 2022-01-29 Håkon Flatval diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index f7a2d730701..86819b8707a 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -24838,7 +24838,7 @@ ends such as Bogofilter (@pxref{Bogofilter}) and the Spam Statistics package (@pxref{Spam Statistics Filtering}). The spam and ham processors that apply to each group are determined by -the group's@code{spam-process} group parameter. If this group +the group's @code{spam-process} group parameter. If this group parameter is not defined, they are determined by the variable @code{gnus-spam-process-newsgroups}. diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el index d0874124fc7..5ba1c4801fd 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el @@ -38,12 +38,12 @@ ;; This was `cyrillic-jcuken'. Alexander Mikhailian ;; says: "cyrillic-jcuken" is actually -;; russian. It is ok but a bit outdated. This layout has been used +;; Russian. It is ok but a bit outdated. This layout has been used ;; in typewriters for ages but it has been superseded on desktops by ;; a variation of this layout, implemented in M$ Windows software. ;; The Windows layout is greatly preferred because of the comma and ;; period being placed more conveniently and, of course, because of -;; the popularity of Windows software. This layout is a common option +;; the popularity of Windows software. This layout is a common option ;; in X Windows and console layouts for GNU/Linux. [See ;; `russian-computer' below.] (quail-define-package From 71feee79309b66a7baf7847472ccebf019d2a801 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 26 Sep 2023 18:13:00 +0200 Subject: [PATCH 02/19] Doc fix in let-alist for keys with nil value * lisp/emacs-lisp/let-alist.el (let-alist): Clarify that keys with a nil value will give the same result as if they were missing. --- lisp/emacs-lisp/let-alist.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el index d9ad46b2af7..1f08cc41a5c 100644 --- a/lisp/emacs-lisp/let-alist.el +++ b/lisp/emacs-lisp/let-alist.el @@ -60,7 +60,7 @@ ;; the variables of the outer one. You can, however, access alists ;; inside the original alist by using dots inside the symbol, as ;; displayed in the example above by the `.site.contents'. -;; + ;;; Code: @@ -139,7 +139,14 @@ essentially expands to If you nest `let-alist' invocations, the inner one can't access the variables of the outer one. You can, however, access alists inside the original alist by using dots inside the symbol, as -displayed in the example above." +displayed in the example above. + +Note that there is no way to differentiate the case where a key +is missing from when it is present, but its value is nil. Thus, +the following form evaluates to nil: + + (let-alist '((some-key . nil)) + .some-key)" (declare (indent 1) (debug t)) (let ((var (make-symbol "alist"))) `(let ((,var ,alist)) From d558f38fe5c6748f6a08c7635fa58ce14cb667b1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Sep 2023 08:41:42 +0300 Subject: [PATCH 03/19] ; * lisp/emacs-lisp/let-alist.el (let-alist): Fix quoting in doc string. --- lisp/emacs-lisp/let-alist.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el index 1f08cc41a5c..6fb425c5615 100644 --- a/lisp/emacs-lisp/let-alist.el +++ b/lisp/emacs-lisp/let-alist.el @@ -145,7 +145,7 @@ Note that there is no way to differentiate the case where a key is missing from when it is present, but its value is nil. Thus, the following form evaluates to nil: - (let-alist '((some-key . nil)) + (let-alist \\='((some-key . nil)) .some-key)" (declare (indent 1) (debug t)) (let ((var (make-symbol "alist"))) From d9d6e14a698967057afb49aeb6a3af17fa645ee4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Sep 2023 10:08:04 +0300 Subject: [PATCH 04/19] ; * lisp/vc/vc.el (vc-next-action): Improve commentary. --- lisp/vc/vc.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index db4fa76abd4..51d0d20ae3e 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1275,6 +1275,8 @@ the revision ID or branch ID." (error "Fileset files are missing, so cannot be operated on")) ((eq state 'ignored) (error "Fileset files are ignored by the version-control system")) + ;; Fileset comes from a diff-mode buffer, see + ;; 'diff-vc-deduce-fileset', and the buffer is the patch to apply. ((eq model 'patch) (vc-checkin files backend nil nil nil (buffer-string))) ((or (null state) (eq state 'unregistered)) From a4185f87bd0e5c129ce93a56b5a3330e2d6b1776 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Wed, 27 Sep 2023 20:46:26 +0200 Subject: [PATCH 05/19] ; Silence macOS 14 warning * src/nsterm.m: Implement 'applicationSupportsSecureRestorableState' to silence warning on macOS 14. (Bug#66245) --- src/nsterm.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/nsterm.m b/src/nsterm.m index c809c0b824a..7c9fd102a7f 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6124,6 +6124,11 @@ - (void)antialiasThresholdDidChange:(NSNotification *)notification */ +- (BOOL) applicationSupportsSecureRestorableState: (NSApplication *)app +{ + return YES; +} + - (void) terminate: (id)sender { struct input_event ie; From 63ec6d998d42c970a825dca17743ece9c651d929 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 30 Sep 2023 22:25:13 +0300 Subject: [PATCH 06/19] ; * doc/emacs/custom.texi (Early Init File): Improve indexing. --- doc/emacs/custom.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 7ca618bd2f6..09473d7deb7 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2905,6 +2905,7 @@ Type @kbd{C-q}, followed by the key you want to bind, to insert @var{char}. @node Early Init File @subsection The Early Init File @cindex early init file +@cindex @file{early-init.el} file Most customizations for Emacs should be put in the normal init file. @xref{Init File}. However, it is sometimes necessary From f8bdc8dff0b6891e536feb60373881a8749f7de4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 29 Sep 2023 14:33:54 +0200 Subject: [PATCH 07/19] ; Normalize GNU ELPA :core package statements * lisp/emacs-lisp/let-alist.el: * lisp/progmodes/project.el: Normalize GNU ELPA :core package statement. --- lisp/emacs-lisp/let-alist.el | 4 ++-- lisp/progmodes/project.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el index 6fb425c5615..ed07aecf338 100644 --- a/lisp/emacs-lisp/let-alist.el +++ b/lisp/emacs-lisp/let-alist.el @@ -9,8 +9,8 @@ ;; Prefix: let-alist ;; Separator: - -;; This is an Elpa :core package. Don't use functionality that is not -;; compatible with Emacs 24.1. +;; This is a GNU ELPA :core package. Avoid functionality that is not +;; compatible with the version of Emacs recorded above. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 8d8bf594628..920860f0d3a 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -4,8 +4,8 @@ ;; Version: 0.9.8 ;; Package-Requires: ((emacs "26.1") (xref "1.4.0")) -;; This is a GNU ELPA :core package. Avoid using functionality that -;; not compatible with the version of Emacs recorded above. +;; This is a GNU ELPA :core package. Avoid functionality that is not +;; compatible with the version of Emacs recorded above. ;; This file is part of GNU Emacs. From 47770b0eca4ba94f6b2a5dd740ff42023c8159c4 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Mon, 18 Sep 2023 09:19:04 -0300 Subject: [PATCH 08/19] Fix term-scroll-to-bottom-on-output :type * lisp/term.el (term-scroll-to-bottom-on-output): Add missing choices. Don't advertise the value 'all' in docstring. (Bug#66071) --- lisp/term.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/term.el b/lisp/term.el index 2e719567058..68b1136a0b4 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -486,7 +486,7 @@ Customize this option to nil if you want the previous behavior." (defcustom term-scroll-to-bottom-on-output nil "Controls whether interpreter output causes window to scroll. -If nil, then do not scroll. If t or `all', scroll all windows showing buffer. +If nil, then do not scroll. If t, scroll all windows showing buffer. If `this', scroll only the selected window. If `others', scroll only those that are not the selected window. @@ -494,7 +494,12 @@ The default is nil. See variable `term-scroll-show-maximum-output'. This variable is buffer-local." - :type 'boolean + :type '(choice (const :tag "Don't scroll" nil) + (const :tag "Scroll selected window only" this) + (const :tag "Scroll unselected windows" others) + ;; We also recognize `all', but we don't advertise it + ;; anymore. (Bug#66071) + (other :tag "Scroll all windows" t)) :group 'term) (defcustom term-scroll-snap-to-bottom t From 4fd00ff1f7e7183cf1e4fa864ba83bc646a5356f Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Tue, 26 Sep 2023 09:17:14 -0300 Subject: [PATCH 09/19] Fix defcustoms in type-break.el (Bug#66210) * lisp/type-break.el (type-break-good-rest-interval) (type-break-file-name): Allow nil. --- lisp/type-break.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/type-break.el b/lisp/type-break.el index 1aa2b9d2997..10ceaf7cb5c 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -77,7 +77,8 @@ rest from typing, then the next typing break is simply rescheduled for later. If a break is interrupted before this much time elapses, the user will be asked whether or not really to interrupt the break." :set-after '(type-break-interval) - :type 'natnum + :type '(choice (const :tag "Don't check idle time" nil) + natnum) :group 'type-break) (defcustom type-break-good-break-interval nil @@ -201,7 +202,8 @@ key is pressed." "Name of file used to save state across sessions. If this is nil, no data will be saved across sessions." :version "24.4" ; added locate-user - :type 'file) + :type '(choice (const :tag "Don't save data" nil) + file)) (defvar type-break-post-command-hook '(type-break-check) "Hook run indirectly by `post-command-hook' for typing break functions. From d210d761b19260c9ee7adf58f01ab1805c9d930a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 1 Oct 2023 08:08:03 +0300 Subject: [PATCH 10/19] ; Fix doc strings of overlay-arrow variables * src/xdisp.c (syms_of_xdisp) : Doc fixes. (Bug#66282) --- src/xdisp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index b39b13215f3..eb38ebba17b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -36674,14 +36674,15 @@ See also `overlay-arrow-string'. */); Voverlay_arrow_position = Qnil; DEFVAR_LISP ("overlay-arrow-string", Voverlay_arrow_string, - doc: /* String to display as an arrow in non-window frames. + doc: /* String to display as an arrow in text-mode frames. See also `overlay-arrow-position'. */); Voverlay_arrow_string = build_pure_c_string ("=>"); DEFVAR_LISP ("overlay-arrow-variable-list", Voverlay_arrow_variable_list, doc: /* List of variables (symbols) which hold markers for overlay arrows. The symbols on this list are examined during redisplay to determine -where to display overlay arrows. */); +where to display overlay arrows. +See also `overlay-arrow-string'. */); Voverlay_arrow_variable_list = list1 (intern_c_string ("overlay-arrow-position")); From 6bdc5cfe384a017d775421e03ed4d77feddb76b9 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 1 Oct 2023 13:21:39 +0200 Subject: [PATCH 11/19] Doc fix; more consistently refer to "text terminals" In the Emacs Lisp manual, we refer to "text terminals" and "graphical terminals" (see Info node `(elisp) Frames'). But in some places, including the user manual, the alternative terminology "non-window terminals" is used instead. In other places, we use the terminology "non-windowing display" instead of the more canonical "non-graphical display". This is less clear than it could be. Let's consolidate our terminology to prefer the wording from the Emacs Lisp manual; in other words, prefer "text" and "non-graphical" to "non-window". * doc/emacs/frames.texi (Non-Window Terminals): Rename node from this... (Text Terminals): ...to this. (Bug#66282) * doc/emacs/display.texi (Standard Faces): * doc/emacs/emacs.texi (Top): * doc/emacs/misc.texi (emacsclient Options): * doc/misc/viper.texi (Rudimentary Changes) (Packages that Change Keymaps): * doc/emacs/frames.texi (Frames, Frame Commands, Mouse Avoidance): Replace instances of "non-window terminals" with "text terminals". * doc/misc/ediff.texi (Quick Help Customization): (Window and Frame Configuration): * lisp/vc/ediff.el (ediff-windows-wordwise) (ediff-windows-linewise): Prefer saying 'non-graphical display' to 'non-windowing display'. * lisp/net/tramp.el (tramp-default-method): * lisp/printing.el (pr-find-command): Capitalize 'Windows' where it clearly refers to the non-free operating system with that name. --- doc/emacs/display.texi | 2 +- doc/emacs/emacs.texi | 5 ++--- doc/emacs/frames.texi | 17 ++++++++--------- doc/emacs/misc.texi | 2 +- doc/misc/ediff.texi | 6 +++--- doc/misc/viper.texi | 7 +++---- lisp/net/tramp.el | 2 +- lisp/printing.el | 4 ++-- lisp/vc/ediff.el | 6 +++--- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index fa8ca4cbf17..cc178dbe99f 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -740,7 +740,7 @@ frame: This is the base face used for the mode lines, as well as header lines and for menu bars when toolkit menus are not used. By default, it's drawn with shadows for a raised effect on graphical displays, and -drawn as the inverse of the default face on non-windowed terminals. +drawn as the inverse of the default face on text terminals. The @code{mode-line-active} and @code{mode-line-inactive} faces (which are the ones used on the mode lines) inherit from this face. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 0efd99261ac..c2cda7a932a 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -20,8 +20,7 @@ This is the @cite{GNU Emacs Manual}, @end ifclear updated for Emacs version @value{EMACSVER}. -Copyright @copyright{} 1985--1987, 1993--2023 Free Software Foundation, -Inc. +Copyright @copyright{} 1985--2023 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -551,7 +550,7 @@ Frames and Graphical Displays * Dialog Boxes:: Controlling use of dialog boxes. * Tooltips:: Displaying information at the current mouse position. * Mouse Avoidance:: Preventing the mouse pointer from obscuring text. -* Non-Window Terminals:: Multiple frames on terminals that show only one. +* Text Terminals:: Multiple frames on terminals that show only one. * Text-Only Mouse:: Using the mouse in text terminals. International Character Set Support diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index ce631561be7..d4b8b48678e 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2023 Free Software -@c Foundation, Inc. +@c Copyright (C) 1985--2023 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames @chapter Frames and Graphical Displays @@ -30,9 +29,9 @@ displays (@pxref{Exiting}). To close just the selected frame, type frames. On text terminals, many of these features are unavailable. However, it is still possible to create multiple frames on text terminals; such frames are displayed one at a time, filling the entire -terminal screen (@pxref{Non-Window Terminals}). It is also possible -to use the mouse on some text terminals (@pxref{Text-Only Mouse}, for -doing so on GNU and Unix systems; and +terminal screen (@pxref{Text Terminals}). It is also possible to use +the mouse on some text terminals (@pxref{Text-Only Mouse}, for doing +so on GNU and Unix systems; and @iftex @pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features}, @end iftex @@ -62,7 +61,7 @@ for doing so on MS-DOS). Menus are supported on all text terminals. * Dialog Boxes:: Controlling use of dialog boxes. * Tooltips:: Displaying information at the current mouse position. * Mouse Avoidance:: Preventing the mouse pointer from obscuring text. -* Non-Window Terminals:: Multiple frames on terminals that show only one. +* Text Terminals:: Multiple frames on terminals that show only one. * Text-Only Mouse:: Using the mouse in text terminals. @end menu @@ -593,7 +592,7 @@ the ordinary, interactive frames are deleted. In this case, @kbd{C-x The @kbd{C-x 5 1} (@code{delete-other-frames}) command deletes all other frames on the current terminal (this terminal refers to either a -graphical display, or a text terminal; @pxref{Non-Window Terminals}). +graphical display, or a text terminal; @pxref{Text Terminals}). If the Emacs session has frames open on other graphical displays or text terminals, those are not deleted. @@ -1740,8 +1739,8 @@ You can also use the command @kbd{M-x mouse-avoidance-mode} to enable the mode. Whenever Mouse Avoidance mode moves the mouse, it also raises the frame. -@node Non-Window Terminals -@section Non-Window Terminals +@node Text Terminals +@section Text Terminals @cindex text terminal On a text terminal, Emacs can display only one Emacs frame at a diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 171544fc983..1f21a5be0b3 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2149,7 +2149,7 @@ overrides the environment variable.) Create a new client frame on the current text terminal, instead of using an existing Emacs frame. This behaves just like the @samp{-c} option, described above, except that it creates a text terminal frame -(@pxref{Non-Window Terminals}). +(@pxref{Text Terminals}). On MS-Windows, @samp{-t} behaves just like @samp{-c} if the Emacs server is using the graphical display, but if the Emacs server is diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index ce6cb8c9bd6..f3c671635eb 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1368,13 +1368,13 @@ the variable @code{ediff-help-message}, which is local to @node Window and Frame Configuration @section Window and Frame Configuration -On a non-windowing display, Ediff sets things up in one frame, splitting +On a non-graphical display, Ediff sets things up in one frame, splitting it between a small control window and the windows for buffers A, B, and C@. The split between these windows can be horizontal or vertical, which can be changed interactively by typing @kbd{|} while the cursor is in the control window. -On a window display, Ediff sets up a dedicated frame for Ediff Control +On a graphical display, Ediff sets up a dedicated frame for Ediff Control Panel and then it chooses windows as follows: If one of the buffers is invisible, it is displayed in the currently selected frame. If a buffer is visible, it is displayed in the frame where it is visible. @@ -1477,7 +1477,7 @@ The multiframe setup is done by the @code{ediff-setup-windows-multiframe} function, which is the default on windowing displays. The plain setup, one where all windows are always in one frame, is done by @code{ediff-setup-windows-plain}, which is the -default on a non-windowing display (or in an xterm window). In fact, +default on a non-graphical display (or in an xterm window). In fact, under Emacs, you can switch freely between these two setups by executing the command @code{ediff-toggle-multiframe} using the Minibuffer of the Menubar. diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 3e038520287..e0ab563ca33 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,8 +8,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1995--1997, 2001--2023 Free Software Foundation, -Inc. +Copyright @copyright{} 1995--2023 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1700,7 +1699,7 @@ a text-formatting function, @code{indent-for-tab-command} (which facilitates programming and document writing). Instead, the tab is inserted via the command @code{viper-insert-tab}, which is bound to @kbd{S-tab} (shift + tab). -On some non-windowing terminals, Shift doesn't modify the @key{TAB} key, so +On some text terminals, Shift doesn't modify the @key{TAB} key, so @kbd{S-tab} behaves as if it were @key{TAB}. In such a case, you will have to bind @code{viper-insert-tab} to some other convenient key. @@ -2232,7 +2231,7 @@ For this reason, Viper doesn't change the standard Emacs binding of (except for users at level 1). Instead, in Viper, the key @kbd{S-tab} (shift+ tab) is chosen to emulate Vi's @key{TAB}. -We should note that on some non-windowing terminals, Shift doesn't modify +We should note that on some text terminals, Shift doesn't modify the @key{TAB} key, so @kbd{S-tab} behaves as if it were @key{TAB}. In such a case, you will have to bind @code{viper-insert-tab} to some other convenient key. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6b64e26b107..02051736cc5 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -426,7 +426,7 @@ Another host name is useful only in combination with ;; an external method. (cond ;; PuTTY is installed. We don't take it, if it is installed on a - ;; non-windows system, or pscp from the pssh (parallel ssh) package + ;; non-Windows system, or pscp from the pssh (parallel ssh) package ;; is found. ((and (eq system-type 'windows-nt) (executable-find "pscp")) "pscp") ;; There is an ssh installation. diff --git a/lisp/printing.el b/lisp/printing.el index 4a6d14260a0..82419e64201 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,6 +1,6 @@ ;;; printing.el --- printing utilities -*- lexical-binding:t -*- -;; Copyright (C) 2000-2001, 2003-2023 Free Software Foundation, Inc. +;; Copyright (C) 2000-2023 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Keywords: wp, print, PostScript @@ -5519,7 +5519,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (setq ext (cdr ext) found nil)) found) - ;; non-windows systems + ;; non-Windows systems (and (file-regular-p cmd) (file-executable-p cmd) cmd))) diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 24836e1b1c1..7e3b20d8939 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -909,7 +909,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, wordwise. This compares the portions of text visible in each of the two windows. -With prefix argument, DUMB-MODE, or on a non-windowing display, works as +With prefix argument, DUMB-MODE, or on a non-graphical display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. @@ -923,7 +923,7 @@ arguments after setting up the Ediff buffers." (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, linewise. This compares the portions of text visible in each of the two windows. -With prefix argument, DUMB-MODE, or on a non-windowing display, works as +With prefix argument, DUMB-MODE, or on a non-graphical display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. @@ -935,7 +935,7 @@ arguments after setting up the Ediff buffers." ;; Compare visible portions of text in WIND-A and WIND-B, which are ;; selected by clicking. -;; With prefix argument, DUMB-MODE, or on a non-windowing display, +;; With prefix argument, DUMB-MODE, or on a non-graphical display, ;; works as follows: ;; If WIND-A is nil, use selected window. ;; If WIND-B is nil, use window next to WIND-A. From 712505a82b905873dc7aeddda03423ee296edf6c Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 1 Oct 2023 15:09:38 +0200 Subject: [PATCH 12/19] Document assigning libraries to packages in make-tarball.txt * admin/make-tarball.txt: Add new step to ensure that new libraries are assigned to packages. --- admin/make-tarball.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 505d3469d3c..5704e8e8922 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -22,6 +22,11 @@ Steps to take before starting on the first pretest in any release sequence: You can use 'gnupload --delete' (see below for more gnupload details). (We currently don't bother with this.) +4. Check that all new Lisp libraries belong to sensible packages. + Run "make -C lisp finder-data" and check the diff of the generated + file against the previously released Emacs version to see what has + changed. + General steps (for each step, check for possible errors): 1. git pull # fetch from the repository From 3ef259e28a84049fdb4499c9ad81ed2c3216f76b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 1 Oct 2023 15:37:06 +0200 Subject: [PATCH 13/19] Improve documentation of `ns-use-proxy-icon` * doc/emacs/macos.texi (Mac / GNUstep Customization): * src/nsfns.m (syms_of_nsfns): Fix documentation of 'ns-use-proxy-icon'; explain what it does and how it's used. (Bug#66190) --- doc/emacs/macos.texi | 5 ++++- src/nsfns.m | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 18811291a9e..8ace8ae7b2a 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -149,7 +149,10 @@ the corresponding left-hand key. @vindex ns-use-proxy-icon @item ns-use-proxy-icon This variable specifies whether to display the proxy icon in the -titlebar. +titlebar. The proxy icon can be used to drag the file associated with +the current buffer to other applications, much in the same way you +would do it from Finder. You might have to disable +@code{tool-bar-mode} to see the proxy icon. @vindex ns-confirm-quit @item ns-confirm-quit diff --git a/src/nsfns.m b/src/nsfns.m index 5ae2cc77bb2..1aab5a3b508 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -3919,7 +3919,12 @@ - (Lisp_Object)lispString DEFVAR_BOOL ("ns-use-proxy-icon", ns_use_proxy_icon, doc: /* When non-nil display a proxy icon in the titlebar. -Default is t. */); +The proxy icon can be used to drag the file associated with the +current buffer to other applications, much in the same way you would +do it from Finder. Note that you might have to disable +`tool-bar-mode' to see the proxy icon. + +The default value is t. */); ns_use_proxy_icon = true; DEFVAR_LISP ("x-max-tooltip-size", Vx_max_tooltip_size, From fa0d3f45aebb4f2016772b2261f10f6793efbc31 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 1 Oct 2023 18:27:11 +0200 Subject: [PATCH 14/19] ; Improve wording of last change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/emacs/macos.texi (Mac / GNUstep Customization): * src/nsfns.m (syms_of_nsfns): Improve wording. Reported by Gerd Möllmann . --- doc/emacs/macos.texi | 4 ++-- src/nsfns.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 8ace8ae7b2a..c1927a01eb4 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -150,8 +150,8 @@ the corresponding left-hand key. @item ns-use-proxy-icon This variable specifies whether to display the proxy icon in the titlebar. The proxy icon can be used to drag the file associated with -the current buffer to other applications, much in the same way you -would do it from Finder. You might have to disable +the current buffer to other applications, a printer, the desktop, +etc., in the same way you can from Finder. You might have to disable @code{tool-bar-mode} to see the proxy icon. @vindex ns-confirm-quit diff --git a/src/nsfns.m b/src/nsfns.m index 1aab5a3b508..cced5510bd7 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -3920,8 +3920,8 @@ - (Lisp_Object)lispString DEFVAR_BOOL ("ns-use-proxy-icon", ns_use_proxy_icon, doc: /* When non-nil display a proxy icon in the titlebar. The proxy icon can be used to drag the file associated with the -current buffer to other applications, much in the same way you would -do it from Finder. Note that you might have to disable +current buffer to other applications, a printer, the desktop, etc., in +the same way you can from Finder. Note that you might have to disable `tool-bar-mode' to see the proxy icon. The default value is t. */); From 5c2d9ae48ede95efac5f6919585ad3b98a51699a Mon Sep 17 00:00:00 2001 From: Ikumi Keita Date: Mon, 2 Oct 2023 15:54:51 +0900 Subject: [PATCH 15/19] ; * lisp/image-mode.el: Fix typos in doc strings (bug#66302). --- lisp/image-mode.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 962e48bd9c6..d701124f3f3 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -773,7 +773,7 @@ to switch back to ;;;###autoload (defun image-mode-to-text () "Set a non-image mode as major mode in combination with image minor mode. -A non-mage major mode found from `auto-mode-alist' or fundamental mode +A non-image major mode found from `auto-mode-alist' or fundamental mode displays an image file as text." ;; image-mode-as-text = normal-mode + image-minor-mode (let ((previous-image-type image-type)) ; preserve `image-type' @@ -786,7 +786,7 @@ displays an image file as text." (defun image-mode-as-hex () "Set `hexl-mode' as major mode in combination with image minor mode. -A non-mage major mode found from `auto-mode-alist' or fundamental mode +A non-image major mode found from `auto-mode-alist' or fundamental mode displays an image file as hex. `image-minor-mode' provides the key \\\\[image-toggle-hex-display] to switch back to `image-mode' \ to display an image file as From bdd3013249634c86a2cd2b1973f8fe15da94ab8b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 2 Oct 2023 10:18:10 +0300 Subject: [PATCH 16/19] ; * lisp/image-mode.el (image-mode-to-text, image-mode-as-hex): Doc fixes. --- lisp/image-mode.el | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index d701124f3f3..71b62d25a2d 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -772,9 +772,8 @@ to switch back to ;;;###autoload (defun image-mode-to-text () - "Set a non-image mode as major mode in combination with image minor mode. -A non-image major mode found from `auto-mode-alist' or fundamental mode -displays an image file as text." + "Set current buffer's modes be a non-image major mode, plus `image-minor-mode'. +A non-image major mode displays an image file as text." ;; image-mode-as-text = normal-mode + image-minor-mode (let ((previous-image-type image-type)) ; preserve `image-type' (major-mode-restore '(image-mode image-mode-as-text)) @@ -785,15 +784,14 @@ displays an image file as text." (image-toggle-display-text)))) (defun image-mode-as-hex () - "Set `hexl-mode' as major mode in combination with image minor mode. -A non-image major mode found from `auto-mode-alist' or fundamental mode -displays an image file as hex. `image-minor-mode' provides the key -\\\\[image-toggle-hex-display] to switch back to `image-mode' \ -to display an image file as -the actual image. + "Set current buffer's modes be `hexl-mode' major mode, plus `image-minor-mode'. +This will by default display an image file as hex. `image-minor-mode' +provides the key sequence \\\\[image-toggle-hex-display] to \ +switch back to `image-mode' to display +an image file's buffer as an image. You can use `image-mode-as-hex' in `auto-mode-alist' when you want to -display an image file as hex initially. +display image files as hex by default. See commands `image-mode' and `image-minor-mode' for more information on these modes." From 2065ab5562e87bc5f4900f60459597356afe22df Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Tue, 3 Oct 2023 08:03:47 -0300 Subject: [PATCH 17/19] Fix defcustoms in timeclock.el * lisp/calendar/timeclock.el (timeclock-get-project-function) (timeclock-get-reason-function): Fix :type to allow nil. (Bug#66320) --- lisp/calendar/timeclock.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 0cd03c15881..7606805a99b 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -100,19 +100,21 @@ into account any discrepancy of time under-worked or over-worked on previous days. This only affects the timeclock mode line display." :type 'boolean) -(defcustom timeclock-get-project-function 'timeclock-ask-for-project +(defcustom timeclock-get-project-function #'timeclock-ask-for-project "The function used to determine the name of the current project. When clocking in, and no project is specified, this function will be called to determine what is the current project to be worked on. If this variable is nil, no questions will be asked." - :type 'function) + :type '(choice (const :tag "Don't ask" nil) + function)) -(defcustom timeclock-get-reason-function 'timeclock-ask-for-reason +(defcustom timeclock-get-reason-function #'timeclock-ask-for-reason "A function used to determine the reason for clocking out. When clocking out, and no reason is specified, this function will be called to determine what is the reason. If this variable is nil, no questions will be asked." - :type 'function) + :type '(choice (const :tag "Don't ask" nil) + function)) (defcustom timeclock-get-workday-function nil "A function used to determine the length of today's workday. From 3216cd96952c5fa0fbe665ef219210c9ebaf4e75 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Wed, 4 Oct 2023 10:47:51 -0300 Subject: [PATCH 18/19] Fix pulse-flag :type * lisp/cedet/pulse.el (pulse-flag): Expand :type to allow 'never as value. (Bug#66341) --- lisp/cedet/pulse.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index 37b41fbe8c3..38ccf5b975f 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -71,7 +71,9 @@ Any other value means to do the default pulsing behavior. If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then this flag is ignored." :group 'pulse - :type 'boolean) + :type '(choice (const :tag "Highlight with unchanging color" nil) + (const :tag "No highlight" never) + (other :tag "Pulse" t))) (defface pulse-highlight-start-face '((((class color) (background dark)) From e9b88f61ccce16e6aad2ad8575a25c3665f8bde4 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Thu, 5 Oct 2023 10:25:52 -0300 Subject: [PATCH 19/19] Fix a defcustom :type * lisp/cedet/ede/base.el (ede-project-placeholder-cache-file): Expand :type to allow nil. (Bug#66361) --- lisp/cedet/ede/base.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index 305bf599151..c32d2edd7b7 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -312,7 +312,8 @@ All specific project types must derive from this project." "File containing the list of projects EDE has viewed. If set to nil, then the cache is not saved." :group 'ede - :type 'file) + :type '(choice (const :tag "Don't save the cache" nil) + file)) (defvar ede-project-cache-files nil "List of project files EDE has seen before.")