summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-12-10 08:54:56 +0800
committerPo Lu <luangruo@yahoo.com>2021-12-10 08:54:56 +0800
commit6919d5a7c0a23c14ae77f7c708ea6d0ef2478108 (patch)
tree9c105a5a5954948d09aa9dd35c3c9d7efbe5ed80 /etc
parent47cd820d93d282da484ae91e68021736ed7994bc (diff)
parentc0b9041ebde82907711cc00a7c307fe622fb541c (diff)
downloademacs-6919d5a7c0a23c14ae77f7c708ea6d0ef2478108.tar.gz
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS4
-rw-r--r--etc/NEWS.2814
2 files changed, 12 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 9eee04b3399..0fee98d1191 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -616,6 +616,10 @@ If this option is non-nil (the default), marking, unmarking or
flagging an image in either the thumbnail or display buffer shows the
next image.
+---
+*** Now shows image information in the header line.
+This replaces the message shown at the bottom of the screen.
+
+++
*** 'image-dired-show-all-from-dir-max-files' has been increased to 500.
This option controls asking for confirmation when starting Image-Dired
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 8e38c3690c1..eb65213ac2f 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -635,7 +635,9 @@ This works like 'C-u M-x apropos-command' but is more discoverable.
*** Keybindings in 'help-mode' use the new 'help-key-binding' face.
This face is added by 'substitute-command-keys' to any "\[command]"
substitution. The return value of that function should consequently
-be assumed to be a propertized string.
+be assumed to be a propertized string. To prevent the function from
+adding the 'help-key-binding' face, call 'substitute-command-keys'
+with the new optional argument NO-FACE non-nil.
Note that the new face will also be used in tooltips. When using the
GTK toolkit, this is only true if 'x-gtk-use-system-tooltips' is t.
@@ -3273,11 +3275,11 @@ The user option 'repeat-exit-timeout' (default nil, which means
forever) specifies the number of seconds of idle time after which to
break the repetition chain automatically.
-When user option 'repeat-keep-prefix' is non-nil (the default), the
-prefix arg of the previous command is kept. This can be used to
-e.g. reverse the window navigation direction with 'C-x o M-- o o' or
-to set a new step with 'C-x { C-5 { { {', which will set the window
-resizing step to 5 columns.
+When user option 'repeat-keep-prefix' is non-nil, the prefix arg of
+the previous command is kept. This can be used to e.g. reverse the
+window navigation direction with 'C-x o M-- o o' or to set a new step
+with 'C-x { C-5 { { {', which will set the window resizing step to 5
+columns.
'M-x describe-repeat-maps' will display a buffer showing
which commands are repeatable in 'repeat-mode'.