commit 74a5ec0e1e05b78e5fb86c0c1a8ac6737bf4e2d6 (HEAD, refs/remotes/origin/master) Merge: eec1142acdd cd6e66f955d Author: Thierry Volpiatto Date: Sat Dec 2 09:04:03 2023 +0100 Merge branch 'register_preview' commit cd6e66f955d20d31686a617ed8a5cd043585c71f Author: Thierry Volpiatto Date: Thu Nov 30 11:04:47 2023 +0100 Delete register-tests.el now no more needed * register-tests.el: Deleted file. diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el deleted file mode 100644 index 6283d1c31e0..00000000000 --- a/test/lisp/register-tests.el +++ /dev/null @@ -1,43 +0,0 @@ -;;; register-tests.el --- tests for register.el -*- lexical-binding: t-*- - -;; Copyright (C) 2017-2023 Free Software Foundation, Inc. - -;; Author: Tino Calancha -;; Keywords: - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see . - -;;; Commentary: - - -;;; Code: -(require 'ert) -(require 'cl-lib) - -(ert-deftest register-test-bug27634 () - "Test for https://debbugs.gnu.org/27634 ." - (dolist (event (list ?\C-g 'escape ?\C-\[)) - (cl-letf (((symbol-function 'read-key) #'ignore) - (last-input-event event) - (register-alist nil)) - (should (equal 'quit - (condition-case err - (call-interactively 'point-to-register) - (quit (car err))))) - (should-not register-alist)))) - -(provide 'register-tests) -;;; register-tests.el ends here commit 408126b6d56a0cc36f621348212e16d0715fd671 Author: Thierry Volpiatto Date: Thu Nov 30 10:53:46 2023 +0100 Update register manual doc/emacs/regs.texi: Do it. diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index e52f68dd18e..5e5b7ae2b16 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -16,9 +16,8 @@ Registers we will denote by @var{r}; @var{r} can be a letter (such as @samp{a}) or a number (such as @samp{1}); case matters, so register @samp{a} is not the same as register @samp{A}. You can also set a register in -non-alphanumeric characters, for instance @samp{*} or @samp{C-d}. -Note, it's not possible to set a register in @samp{C-g} or @samp{ESC}, -because these keys are reserved for quitting (@pxref{Quitting}). +non-alphanumeric characters, for instance @samp{C-d} by using for +example @key{C-q} @samp{C-d}. @findex view-register A register can store a position, a piece of text, a rectangle, a commit 0fa70dad21d3475d3a5dae54a09d8a9e60b668ae Author: Thierry Volpiatto Date: Thu Nov 30 10:38:52 2023 +0100 Fix register-preview-default We need to print the string representation (one char) of an eventual key description e.g. "^X" instead of "C-x". However the key description is still displayed in a display property. * lisp/register.el (register-preview-default): Use `string' to print register. diff --git a/lisp/register.el b/lisp/register.el index 88d0e8e1d10..46ec38821e5 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -131,7 +131,8 @@ register-describe-oneline (defun register-preview-default (r) "Function that is the default value of the variable `register-preview-function'." (format "%s: %s\n" - (single-key-description (car r)) + (propertize (string (car r)) + 'display (single-key-description (car r))) (register-describe-oneline (car r)))) (defvar register-preview-function #'register-preview-default commit eec1142acdde9d10781c781e7890c2d26f7e6b2d Author: Michael Albinus Date: Fri Dec 1 16:29:37 2023 +0100 * test/lisp/net/tramp-tests.el (tramp-test31-signal-process): Extend. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 58b8530ca2b..d8932a28e4d 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -5684,6 +5684,12 @@ tramp-test31-signal-process (delete-exited-processes t) kill-buffer-query-functions command proc) + ;; If PROCESS is a string, it must be a process name or a process + ;; number. Check error handling. + (should-error + (signal-process (md5 (current-time-string)) 0) + :type 'wrong-type-argument) + ;; The PROCESS argument of `signal-process' can be a string. Test ;; this as well. (dolist commit 3cbe263b081eaa40753e122e5b98d74d9d9d0c9f Author: Eli Zaretskii Date: Fri Dec 1 14:15:30 2023 +0200 Fix mode-line-inactive face * src/xfaces.c (Finternal_set_lisp_face_attribute): Fix validation of the :style attribute of :box. Previously, nil for :style was not accepted, which causes 'mode-line-inactive' face to be rejected. (Bug#67567) diff --git a/src/xfaces.c b/src/xfaces.c index a23f4c302ed..7385c4c7dd2 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3388,8 +3388,10 @@ DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, } else if (EQ (k, QCstyle)) { - if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button) - && !EQ(v, Qflat_button)) + if (!NILP (v) + && !EQ (v, Qpressed_button) + && !EQ (v, Qreleased_button) + && !EQ (v, Qflat_button)) break; } else commit 3df81fb5dc5809cab7843e5358c17d0039b55eb1 Author: Thierry Volpiatto Date: Thu Nov 30 08:03:45 2023 +0100 Make register-preview-delay obsolete * etc/NEWS: Update. * lisp/register.el (register-preview-delay): Make it obsolete. diff --git a/etc/NEWS b/etc/NEWS index 6661ac70e1b..bab3529339f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1138,6 +1138,11 @@ showcases all their customization options. * Incompatible Lisp Changes in Emacs 30.1 +--- +** 'register-preview-delay' is no longer used. +Register preview is no more delayed. If you want to disable it use +'register-use-preview' instead with a boolean value. + +++ ** 'M-TAB' now invokes 'completion-at-point' also in Text mode. Text mode no longer binds 'M-TAB' to 'ispell-complete-word', and diff --git a/lisp/register.el b/lisp/register.el index 61bef503f91..88d0e8e1d10 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -93,7 +93,6 @@ register-separator :type '(choice (const :tag "None" nil) (character :tag "Use register" :value ?+))) -;; FIXME: This is no more needed, remove it. (defcustom register-preview-delay 1 "If non-nil, time to wait in seconds before popping up register preview window. If nil, do not show register previews, unless `help-char' (or a member of @@ -101,6 +100,7 @@ register-preview-delay :version "24.4" :type '(choice number (const :tag "No preview unless requested" nil)) :group 'register) +(make-obsolete-variable 'register-preview-delay "No longer used." "30.1") (defcustom register-preview-default-keys (mapcar #'string (number-sequence ?a ?z)) "Default keys for setting a new register."