[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c2a9f519f7e 2/2: Merge from origin/emacs-30
From: |
Eli Zaretskii |
Subject: |
master c2a9f519f7e 2/2: Merge from origin/emacs-30 |
Date: |
Sat, 19 Oct 2024 07:01:46 -0400 (EDT) |
branch: master
commit c2a9f519f7e9a5cbb5dbe50ba7b4e4b2757bb3b6
Merge: 6e70be26807 902029b1410
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-30
902029b1410 * lisp/auth-source.el (read-passwd): Remove entry from `p...
a61bf742257 New FAQ about Ctrl keys on xterm
f353fcc8506 Autoload 'message-narrow-to-headers-or-head' in mml.el
---
doc/misc/efaq.texi | 20 ++++++++++++++++++++
lisp/auth-source.el | 2 +-
lisp/gnus/mml.el | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index c18438583e4..f6362b4f075 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -4065,6 +4065,7 @@ information is available from
* Compose Character::
* Binding combinations of modifiers and function keys::
* Meta key does not work in xterm::
+* Some Ctrl-modified keys do not work on xterm::
@end menu
@node Binding keys to commands
@@ -4536,6 +4537,25 @@ You might have to replace @samp{Meta} with @samp{Alt}.
@end itemize
+@node Some Ctrl-modified keys do not work on xterm
+@section Why don't some keys like @kbd{C-.} work on xterm?
+
+If your @code{xterm} version is 216 or newer, you should have keys like
+@kbd{C-.} and @kbd{C-,} if you add the following resource specification
+to your @file{~/.Xdefaults}:
+
+@example
+ XTerm.VT100.modifyOtherKeys: 1
+@end example
+
+@noindent
+If you want to use @code{uxterm}, also add the following:
+
+@example
+ UXTerm.VT100.modifyOtherKeys: 1
+@end example
+
+
@c ------------------------------------------------------------
@node Alternate character sets
@chapter Alternate character sets
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 557d360bc6a..1e0cde75583 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -2599,7 +2599,7 @@ by doing (clear-string STRING)."
;; Not sure why but it seems that there might be cases where the
;; minibuffer is not always properly reset later on, so undo
;; whatever we've done here (bug#11392).
- (remove-hook 'after-change-functions
+ (remove-hook 'post-command-hook
#'read-passwd--hide-password 'local)
(kill-local-variable 'post-self-insert-hook)
;; And of course, don't keep the sensitive data around.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index e3bc3932529..8ecf7a33305 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1039,6 +1039,7 @@ If HANDLES is non-nil, use it instead reparsing the
buffer."
(message-remove-header "Content-Transfer-Encoding")))
(autoload 'message-encode-message-body "message")
+(autoload 'message-narrow-to-headers-or-head "message")
(declare-function message-narrow-to-headers-or-head "message" ())
;;;###autoload