bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Nicolas Richard <theonewiththeevillook@yahoo.fr> writes:
>
>> 1. open gnus (e.g. "emacs -Q -f gnus-no-server")
>> 2. open a group and an article in it
>> 3. hit C-x o to select the article window.
>> 4. hit C-h b to show the available bindings
>> 4bis. in the list, "C-c C-f" is mentionned (at line 201 here)
>> 5. hit C-c C-f
>>
>> Result: "C-c C-f is undefined"
>> Expected result: prepare a buffer for forwarding the selected message.
>
> Fixed on the Emacs trunk now.

Just binding "C-c" in the article buffer (like other prefixed) led to
problems in other parts of Emacs somehow, so I've reverted that patch
and will have to implement it a different way.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

[Katsumi Yamaoka]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

On Wed, 25 Jan 2017 22:55:15 +0100, Lars Ingebrigtsen wrote:
> Just binding "C-c" in the article buffer (like other prefixed) led to
> problems in other parts of Emacs somehow, so I've reverted that patch
> and will have to implement it a different way.

Sorry, that is my fault.  How about this patch?

* lisp/gnus/gnus-art.el (gnus-article-describe-bindings):
Ignore summary commands that aren't bound to
gnus-article-read-summary-keys.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 966 bytes --]

--- gnus-art.el~	2017-01-25 22:07:29.825734200 +0000
+++ gnus-art.el	2017-01-26 08:10:00.743177500 +0000
@@ -6846,16 +6846,20 @@
   (let ((keymap (copy-keymap gnus-article-mode-map))
 	(map (copy-keymap gnus-article-send-map))
 	(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
+	(summap (make-sparse-keymap))
 	parent agent draft)
     (define-key keymap "S" map)
     (define-key map [t] nil)
+    (define-key summap [t] 'undefined)
     (with-current-buffer gnus-article-current-summary
+      (dolist (key sumkeys)
+	(define-key summap key (key-binding key (current-local-map))))
       (set-keymap-parent
        keymap
        (if (setq parent (keymap-parent gnus-article-mode-map))
 	   (prog1
 	       (setq parent (copy-keymap parent))
-	     (set-keymap-parent parent (current-local-map)))
+	     (set-keymap-parent parent summap))
 	 (current-local-map)))
       (set-keymap-parent map (key-binding "S"))
       (let (key def gnus-pick-mode)

bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

[Katsumi Yamaoka]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

On Thu, 26 Jan 2017 17:10:51 +0900, Katsumi Yamaoka wrote:
> Sorry, that is my fault.  How about this patch?

I'm sorry again.  This is the right one:

* lisp/gnus/gnus-art.el (gnus-article-describe-bindings):
Ignore summary commands that aren't bound to
gnus-article-read-summary-keys keys (bug#18257).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 995 bytes --]

--- gnus-art.el~	2017-01-25 22:07:29.825734200 +0000
+++ gnus-art.el	2017-01-26 08:54:39.004906700 +0000
@@ -6846,17 +6846,21 @@
   (let ((keymap (copy-keymap gnus-article-mode-map))
 	(map (copy-keymap gnus-article-send-map))
 	(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
+	(summap (make-sparse-keymap))
 	parent agent draft)
     (define-key keymap "S" map)
     (define-key map [t] nil)
+    (define-key summap [t] 'undefined)
     (with-current-buffer gnus-article-current-summary
+      (dolist (key sumkeys)
+	(define-key summap key (key-binding key (current-local-map))))
       (set-keymap-parent
        keymap
        (if (setq parent (keymap-parent gnus-article-mode-map))
 	   (prog1
 	       (setq parent (copy-keymap parent))
-	     (set-keymap-parent parent (current-local-map)))
-	 (current-local-map)))
+	     (set-keymap-parent parent summap))
+	 summap))
       (set-keymap-parent map (key-binding "S"))
       (let (key def gnus-pick-mode)
 	(while sumkeys

bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

[Lars Ingebrigtsen]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> On Thu, 26 Jan 2017 17:10:51 +0900, Katsumi Yamaoka wrote:
>> Sorry, that is my fault.  How about this patch?
>
> I'm sorry again.  This is the right one:
>
> * lisp/gnus/gnus-art.el (gnus-article-describe-bindings):
> Ignore summary commands that aren't bound to
> gnus-article-read-summary-keys keys (bug#18257).

Great; can you apply it to the Emacs trunk?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#18257: C-h b mentions "C-c C-f" as a valid binding in gnus-article-mode.

[Katsumi Yamaoka]

On Thu, 26 Jan 2017 18:12:43 +0100, Lars Ingebrigtsen wrote:
> Great; can you apply it to the Emacs trunk?

Done.  Thanks.