From unknown Fri Jun 20 20:10:56 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#5043 <5043@debbugs.gnu.org> To: bug#5043 <5043@debbugs.gnu.org> Subject: Status: add a menu to ediff-mult.el Reply-To: bug#5043 <5043@debbugs.gnu.org> Date: Sat, 21 Jun 2025 03:10:56 +0000 retitle 5043 add a menu to ediff-mult.el reassign 5043 emacs submitter 5043 Dan Nicolaescu severity 5043 wishlist tag 5043 patch thanks From dann@godzilla.ics.uci.edu Wed Nov 25 19:34:17 2009 Received: (at submit) by emacsbugs.donarmstrong.com; 26 Nov 2009 03:34:17 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,MURPHY_DRUGS_REL8, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nAQ3YF3d001937 for ; Wed, 25 Nov 2009 19:34:16 -0800 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDV7X-0008Bq-6x for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2009 22:34:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDV7S-00087s-B9 for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2009 22:34:14 -0500 Received: from [199.232.76.173] (port=46485 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDV7S-00087i-3g for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2009 22:34:10 -0500 Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:53870) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NDV7R-0005c9-MR for bug-gnu-emacs@gnu.org; Wed, 25 Nov 2009 22:34:10 -0500 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id nAQ3WQm9026789 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Nov 2009 19:32:26 -0800 Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id nAQ3WQ5r026019; Wed, 25 Nov 2009 19:32:26 -0800 (PST) Date: Wed, 25 Nov 2009 19:32:26 -0800 (PST) Message-Id: <200911260332.nAQ3WQ5r026019@godzilla.ics.uci.edu> From: Dan Nicolaescu To: bug-gnu-emacs Cc: Michael Kifer Subject: add a menu to ediff-mult.el X-Debbugs-No-Ack: yes Lines: 121 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: nAQ3WQm9026789 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) We are trying to have menus in all modes. ediff-mult.el has many commands, so a menu helps a lot. Here's a patch that adds it. Index: lisp/ediff-mult.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/ediff-mult.el,v retrieving revision 1.68 diff -u -3 -p -r1.68 ediff-mult.el --- lisp/ediff-mult.el 22 Nov 2009 03:14:15 -0000 1.68 +++ lisp/ediff-mult.el 26 Nov 2009 03:13:36 -0000 @@ -392,12 +392,40 @@ Toggled by ediff-toggle-verbose-help-met (define-key ediff-meta-buffer-map "p" 'ediff-previous-meta-item) (define-key ediff-meta-buffer-map [delete] 'ediff-previous-meta-item) (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item) - (or (ediff-one-filegroup-metajob) - (progn - (define-key ediff-meta-buffer-map "=" nil) - (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files) - (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files) - (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files))) + + (let ((menu-map (make-sparse-keymap "Ediff-Meta"))) + (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode] + (cons "Ediff-Meta" menu-map)) + (define-key menu-map [ediff-quit-meta-buffer] + '(menu-item "Quit" ediff-quit-meta-buffer + :help "Quit the meta buffer")) + (define-key menu-map [ediff-toggle-filename-truncation] + '(menu-item "Truncate filenames" ediff-toggle-filename-truncation + :help "Toggle truncation of long file names in session group buffers" + :button (:toggle . ediff-meta-truncate-filenames))) + (define-key menu-map [ediff-show-registry] + '(menu-item "Display Ediff Registry" ediff-show-registry + :help "Display Ediff's registry")) + (define-key menu-map [ediff-documentation] + '(menu-item "Show Manual" ediff-documentation + :help "Display Ediff's manual")) + + (or (ediff-one-filegroup-metajob) + (progn + (define-key ediff-meta-buffer-map "=" nil) + (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files) + (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files) + (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files))) + + + (define-key menu-map [ediff-next-meta-item] + '(menu-item "Next" ediff-next-meta-item + :help "Move to the next item in Ediff registry or session group buffer")) + (define-key menu-map [ediff-previous-meta-item] + '(menu-item "Previous" ediff-previous-meta-item + :help "Move to the previous item in Ediff registry or session group buffer"))) + + (if ediff-no-emacs-help-in-control-buffer (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item)) (if (featurep 'emacs) @@ -837,14 +865,58 @@ behavior." ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation) (define-key ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-hide-marked-sessions] + '(menu-item "Hide marked" ediff-hide-marked-sessions + :help "Hide marked sessions. With prefix arg, unhide")) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-mark-for-hiding-at-pos] + '(menu-item "Mark for hiding" ediff-mark-for-hiding-at-pos + :help "Mark session for hiding. With prefix arg, unmark")) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] + '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos + :help "Mark session for a group operation. With prefix arg, unmark.")) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] + '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding + :help "Unmark all sessions marked for hiding")) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-unmark-all-for-operation] + '(menu-item "Unmark all for group operation" ediff-unmark-all-for-operation + :help "Unmark all sessions marked for operation")) + (cond ((ediff-collect-diffs-metajob jobname) + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-collect-custom-diffs] + '(menu-item "Collect diffs" ediff-collect-custom-diffs + :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'")) (define-key ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs)) ((ediff-patch-metajob jobname) + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-meta-show-patch] + '(menu-item "Show multi-file patch" ediff-meta-show-patch + :help "Show the multi-file patch associated with this group session")) (define-key ediff-meta-buffer-map "P" 'ediff-meta-show-patch))) (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy) - (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs))) + (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-up-meta-hierarchy] + '(menu-item "Go to parent session" ediff-up-meta-hierarchy + :help "Go to the parent session group buffer")) + + (define-key ediff-meta-buffer-map + [menu-bar ediff-meta-mode ediff-show-dir-diffs] + '(menu-item "Diff directories" ediff-show-dir-diffs + :help "Display differences among the directories involved in session group")))) (if (eq ediff-metajob-name 'ediff-registry) (run-hooks 'ediff-registry-setup-hook) From rgm@gnu.org Sun Nov 29 22:58:37 2009 Received: (at control) by emacsbugs.donarmstrong.com; 30 Nov 2009 06:58:37 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,MURPHY_DRUGS_REL8,ONEWORD, VALID_BTS_CONTROL,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nAU6waJ5006507 for ; Sun, 29 Nov 2009 22:58:37 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1NF0DT-0005PI-E2; Mon, 30 Nov 2009 01:58:35 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19219.27931.358249.789265@fencepost.gnu.org> Date: Mon, 30 Nov 2009 01:58:35 -0500 From: Glenn Morris To: control Subject: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: cyan X-Ran: VL]'*R)c=$t~c-8qTG1VR#jSJ6Ti3os:"[0M<=6/G~Z4_:e{5yj'u.4laVU+liw:@R[2{^ X-Debbugs-No-Ack: yes reassign 5041 spam reassign 5044 spam reassign 5045 spam reassign 5048 spam reassign 5053 spam reassign 5057 spam reassign 5063 spam reassign 5065 spam reassign 5066 spam reassign 5073 spam reassign 5075 spam merge 5052 5043 severity 5052 wishlist tags 5052 patch reassign 5070 emacs,rmail reassign 5051 emacs,ns reassign 5055 emacs,etags From rgm@gnu.org Mon Dec 7 19:31:43 2009 Received: (at control) by emacsbugs.donarmstrong.com; 8 Dec 2009 03:31:43 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,ONEWORD autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nB83VgpS020435 for ; Mon, 7 Dec 2009 19:31:43 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1NHqnd-0005sP-3z; Mon, 07 Dec 2009 22:31:41 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19229.51357.71520.433918@fencepost.gnu.org> Date: Mon, 7 Dec 2009 22:31:41 -0500 From: Glenn Morris To: control Subject: control close 5043 close 5151 reassign 5141 spam reassign 5142 spam reassign 5143 spam reassign 5144 spam reassign 5147 spam tags 5150 moreinfo unreproducible reassign 5152 spam From unknown Fri Jun 20 20:10:56 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 29 Jan 2010 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A long time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator