From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Masatake YAMATO Newsgroups: gmane.emacs.devel Subject: Re: |PATCH| describe-minor-mode and describe-minor-mode-from-indicator Date: Fri, 31 Jan 2003 01:04:27 +0900 (JST) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20030131.010427.55502131.jet@gyve.org> References: <20030121.010655.21600771.jet@gyve.org> <20030124.024030.39150801.jet@gyve.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1043947405 13676 80.91.224.249 (30 Jan 2003 17:23:25 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 30 Jan 2003 17:23:25 +0000 (UTC) Cc: emacs-devel@gnu.org Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18eIPK-0003Y7-00 for ; Thu, 30 Jan 2003 18:23:22 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18eIV5-00058a-00 for ; Thu, 30 Jan 2003 18:29:19 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18eIQ7-0007Cu-08 for emacs-devel@quimby.gnus.org; Thu, 30 Jan 2003 12:24:11 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18eIOi-0006NQ-00 for emacs-devel@gnu.org; Thu, 30 Jan 2003 12:22:44 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18eIOe-0006K8-00 for emacs-devel@gnu.org; Thu, 30 Jan 2003 12:22:42 -0500 Original-Received: from r-maa.spacetown.ne.jp ([210.130.136.40]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18eIOd-0006HX-00; Thu, 30 Jan 2003 12:22:39 -0500 Original-Received: from localhost (h219-110-074-250.catv01.itscom.jp [219.110.74.250]) by r-maa.spacetown.ne.jp (8.11.6) with ESMTP id h0UHMYY03313; Fri, 31 Jan 2003 02:22:34 +0900 (JST) Original-To: rms@gnu.org In-Reply-To: X-Mailer: Mew version 3.1.52 on Emacs 21.3 / Mule 5.0 (SAKAKI) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:11227 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11227 > There is trade-off in two methods: just-one-click or choosing-from-menu. > > If you are familiar with Emacs, you will do not hesitate to click the > mode line because you might know what happens next. You might be satisfied > with quick operation. Further more, you might think GUI menu is a toy that > make computer operation slow down. > > The tooltip says what the clicks do. If it says "Mouse-1: mode help", > people won't be scared. > > Please put it on mouse-2 and update the tooltip string. I did. Please try the attached patch. You don't need to apply patches for ruler-mode.el and subr.el I posted here. Because some symbols in the new patch are reverted. Masatake YAMATO Index: help.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/help.el,v retrieving revision 1.255 diff -u -r1.255 help.el --- help.el 13 Jan 2003 08:04:46 -0000 1.255 +++ help.el 30 Jan 2003 17:19:07 -0000 @@ -611,6 +611,75 @@ (setq minor-modes (cdr minor-modes)))) (print-help-return-message)))) +(defun describe-minor-mode (minor-mode) + "Display documentation of a minor mode given as MINOR-MODE." + (interactive (list (intern (completing-read + "Minor mode: " + (delete nil (mapcar + (function (lambda (x) + (if (eval (car x)) + (symbol-name (car x))))) + minor-mode-alist)))))) + (if (fboundp minor-mode) + (describe-function minor-mode) + (describe-variable minor-mode))) + +(defun describe-minor-mode-from-indicator (indicator) + "Display documentation of a minor mode specified by INDICATOR." + (interactive (list + (completing-read + "Minor mode indicator: " + (delete nil + (mapcar + #'(lambda (x) + (if (eval (car x)) + (let ((i (expand-minor-mode-indicator-object (cadr x)))) + (if (and (< 0 (length i)) + (string= " " (substring i 0 1))) + (substring i 1) + i)))) + minor-mode-alist))))) + (let ((minor-mode (lookup-minor-mode-from-indicator indicator))) + (if minor-mode + (describe-minor-mode minor-mode) + (error "Cannot find minor mode for `%s'" indicator)))) + +(defun lookup-minor-mode-from-indicator (indicator) + "Return a minor mode symbol from its indicator on the modeline." + (if (and (< 0 (length indicator)) + (not (string= " " (substring indicator 0 1)))) + (setq indicator (concat " " indicator))) + (let ((minor-modes minor-mode-alist) + result) + (while minor-modes + (let* ((minor-mode (car (car minor-modes))) + (anindicator (car (cdr (car minor-modes))))) + (setq anindicator (expand-minor-mode-indicator-object anindicator)) + (if (and (stringp anindicator) + (string= anindicator indicator)) + (setq result minor-mode + minor-modes nil) + (setq minor-modes (cdr minor-modes))))) + result)) + +(defun expand-minor-mode-indicator-object (obj) + "Expand OBJ that represents a minor-mode indicator. +cdr part of a `minor-mode-alist' element(indicator object) is the +indicator of minor mode that is in car part. Normally indicator +object is a string. However, in some case it is more compound object +like cons cell. This function tries to make the compound object a string." + ;; copied from describe-mode + (while (and obj (symbolp obj) + (boundp obj) + (not (eq obj (symbol-value obj)))) + (setq obj (symbol-value obj))) + ;; eval :eval + (if (and (consp obj) + (keywordp (car obj)) + (eq :eval (car obj))) + (setq obj (eval (cadr obj)))) + obj) + ;;; Automatic resizing of temporary buffers. Index: bindings.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/bindings.el,v retrieving revision 1.112 diff -u -r1.112 bindings.el --- bindings.el 21 Dec 2002 20:19:37 -0000 1.112 +++ bindings.el 30 Jan 2003 17:19:08 -0000 @@ -256,8 +256,16 @@ (defvar mode-line-modes nil "Mode-line control for displaying major and minor modes.") +(defvar mode-line-major-mode-keymap nil "\ +Keymap to display on major mode.") + (defvar mode-line-minor-mode-keymap nil "\ -Keymap to display on major and minor modes.") +Keymap to display on minor modes.") + +;; Menu of major mode. +(let ((map (make-sparse-keymap))) + (define-key map [mode-line mouse-2] 'describe-mode) + (setq mode-line-major-mode-keymap map)) ;; Menu of minor modes. (let ((map (make-sparse-keymap))) @@ -292,8 +300,15 @@ (setq-default mode-line-modes (list (propertize "%[(" 'help-echo help-echo) - `(:propertize ("" mode-name mode-line-process minor-mode-alist) - help-echo "mouse-3: minor mode menu" + ;; major mode + `(:propertize ("" mode-name) + help-echo ,#'(lambda (window object point) + (format "mouse-2: help for \"%s\"" + object)) + local-map ,mode-line-major-mode-keymap) + ;; minor modes + `(:propertize ("" mode-line-process minor-mode-alist) + help-echo "mouse-3: minor modes menu" local-map ,mode-line-minor-mode-keymap) (propertize "%n" 'help-echo "mouse-2: widen" 'local-map (make-mode-line-mouse-map @@ -413,9 +428,23 @@ `(menu-item ,(purecopy "Abbrev (Abbrev)") abbrev-mode :button (:toggle . abbrev-mode))) +(defvar mode-line-mode-menu-grab-mode-indicator nil) +(autoload 'describe-minor-mode-from-indicator "help" + "Display documentation of a minor mode given as MINOR-MODE." t) +(define-key mode-line-mode-menu [describe-minor-mode] + `(menu-item ,'(format "Describe `%s'" + (substring mode-line-mode-menu-grab-mode-indicator 1)) + (lambda () + (interactive) + (describe-minor-mode-from-indicator + mode-line-mode-menu-grab-mode-indicator)) + :visible (and mode-line-mode-menu-grab-mode-indicator + (string= " " (substring mode-line-mode-menu-grab-mode-indicator 0 1))))) (defun mode-line-mode-menu (event) (interactive "@e") - (x-popup-menu event mode-line-mode-menu)) + (let ((get-mode-indicator-from-event #'(lambda (e) (car (nth 4 (car (cdr e))))))) + (setq mode-line-mode-menu-grab-mode-indicator (funcall get-mode-indicator-from-event event)) + (x-popup-menu event mode-line-mode-menu))) ;; Add menu of buffer operations to the buffer identification part ;; of the mode line.or header line.