GNU bug report logs - #5052
add a menu to ediff-mult.el

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 5052 in the body.
You can then email your comments to 5052 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Michael Kifer <kifer <at> cs.sunysb.edu>
To: Dan Nicolaescu <dann <at> ics.uci.edu>
Cc: bug-gnu-emacs <bug-gnu-emacs <at> gnu.org>,
        Michael Kifer
 <kifer <at> cs.stonybrook.edu>
Subject: Re: add a menu  to ediff-mult.el
Date: Thu, 26 Nov 2009 15:27:09 -0500

thanks. I'll put that in.

On Wed, 25 Nov 2009 19:32:26 -0800 (PST)
Dan Nicolaescu <dann <at> ics.uci.edu> wrote:

> 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)
> 

Message #14 received at 5052 <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Dan Nicolaescu <dann <at> ics.uci.edu>
To: kifer <at> cs.sunysb.edu
Cc: 5052 <at> debbugs.gnu.org
Subject: Re: bug#5052: add a menu  to ediff-mult.el
Date: Fri, 4 Dec 2009 12:51:47 -0800 (PST)

Michael Kifer <kifer <at> cs.sunysb.edu> writes:

  > thanks. I'll put that in.

Can you please do this before Tuesday (the feature freeze date for the
23.2 release)?

If not, please let me know and I can do it.

  > On Wed, 25 Nov 2009 19:32:26 -0800 (PST)
  > Dan Nicolaescu <dann <at> ics.uci.edu> wrote:
  > 
  > > 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.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.