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: Tue, 01 Apr 2003 21:58:48 +0900 (JST) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20030401.215848.126573280.jet@gyve.org> References: <200303311551.h2VFp1xQ016968@rum.cs.yale.edu> <20030401.212717.98556456.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 1049204312 18552 80.91.224.249 (1 Apr 2003 13:38:32 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 1 Apr 2003 13:38:32 +0000 (UTC) Cc: monnier+gnu/emacs@rum.cs.yale.edu Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue Apr 01 15:38:30 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 190LxT-0004io-00 for ; Tue, 01 Apr 2003 15:37:47 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 190Ly5-0001uq-00 for ; Tue, 01 Apr 2003 15:38:25 +0200 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 190Lx5-0003qM-04 for emacs-devel@quimby.gnus.org; Tue, 01 Apr 2003 08:37:23 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 190LrN-0007Ue-00 for emacs-devel@gnu.org; Tue, 01 Apr 2003 08:31:30 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 190Lqo-0006lP-00 for emacs-devel@gnu.org; Tue, 01 Apr 2003 08:30:58 -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 190Lqm-0006i2-00; Tue, 01 Apr 2003 08:30:53 -0500 Original-Received: from localhost (mx.jp.redhat.com [219.96.218.186]) by r-maa.spacetown.ne.jp (8.11.6) with ESMTP id h31DUnQ19862; Tue, 1 Apr 2003 22:30:49 +0900 (JST) Original-To: rms@gnu.org In-Reply-To: <20030401.212717.98556456.jet@gyve.org> X-Mailer: Mew version 3.1.52 on Emacs 21.3 / Mule 5.0 (SAKAKI) Original-cc: emacs-devel@gnu.org 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:12801 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:12801 > I'd like to reflect the suggestions given by Stefan Monnier to my > patch. I've already created new patch against the current Emacs source > code. I have to change the doc and NEWS file next. NEWS entry: **** Help for the specified minor mode. M-x describe-minor-mode shows help documents for the specified minor mode. M-x describe-minor-mode-from-indicator shows the same thing, too. However, `describe-minor-mode-from-indicator' takes an indicator appeared on the mode line as the argument. You can invoke this function with mouse operations. **** Displaying help documents for modes with mouse-2 on the mode line. You can click(mouse-2) a mode string on the mode line to show its help documents. Both major mode and minor modes are supproted. Index: help.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/help.el,v retrieving revision 1.258 diff -u -r1.258 help.el --- help.el 31 Mar 2003 20:22:58 -0000 1.258 +++ help.el 1 Apr 2003 13:30:36 -0000 @@ -615,30 +615,29 @@ "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)))))) + (delq nil (mapcar + (lambda (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." + "Display documentation of a minor mode specified by INDICATOR. +If you call this function interactively, you can give indicator which +is currently activated with completion." (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))))) + (delq nil + (mapcar (lambda (x) + (let ((i (format-mode-line x))) + ;; remove first space if existed + (if (> (length i) 0) + (if (eq (aref i 0) ?\ ) + (substring i 1) i)))) + minor-mode-alist))))) (let ((minor-mode (lookup-minor-mode-from-indicator indicator))) (if minor-mode (describe-minor-mode minor-mode) @@ -646,38 +645,26 @@ (defun lookup-minor-mode-from-indicator (indicator) "Return a minor mode symbol from its indicator on the modeline." + ;; remove first space if existed (if (and (< 0 (length indicator)) - (not (string= " " (substring indicator 0 1)))) - (setq indicator (concat " " indicator))) + (eq (aref indicator 0) ?\ )) + (setq indicator (substring indicator 1))) (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)) + (anindicator (format-mode-line + (car (cdr (car minor-modes)))))) + ;; remove first space if existed (if (and (stringp anindicator) - (string= anindicator indicator)) + (> (length anindicator) 0) + (eq (aref anindicator 0) ?\ )) + (setq anindicator (substring anindicator 1))) + (if (equal indicator anindicator) (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))) - (when (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.113 diff -u -r1.113 bindings.el --- bindings.el 31 Mar 2003 20:24:56 -0000 1.113 +++ bindings.el 1 Apr 2003 13:30:37 -0000 @@ -256,22 +256,20 @@ (defvar mode-line-modes nil "Mode-line control for displaying major and minor modes.") -(defvar mode-line-major-mode-keymap nil "\ +(defvar mode-line-major-mode-keymap + (let ((map (make-sparse-keymap))) + (define-key map [mode-line mouse-2] 'describe-mode) + (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1) + map) "\ Keymap to display on major mode.") -(defvar mode-line-minor-mode-keymap nil "\ +(defvar mode-line-minor-mode-keymap + (let ((map (make-sparse-keymap))) + (define-key map [mode-line mouse-2] 'mode-line-minor-mode-help) + (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1) + (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1) + map) "\ Keymap to display on minor modes.") - -(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))) - (define-key map [mode-line mouse-2] 'mode-line-minor-mode-help) - (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1) - (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1) - (setq mode-line-minor-mode-keymap map)) (let* ((help-echo ;; The multi-line message doesn't work terribly well on the