From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: man.el Date: Thu, 18 Mar 2004 09:03:53 +0200 Organization: JURTA Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <874qsmvdpi.fsf@mail.jurta.org> References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1079593848 19248 80.91.224.253 (18 Mar 2004 07:10:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 18 Mar 2004 07:10:48 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Thu Mar 18 08:10:40 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B3rfs-00076i-00 for ; Thu, 18 Mar 2004 08:10:40 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B3rfs-0002YQ-00 for ; Thu, 18 Mar 2004 08:10:40 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B3rdH-0006iO-Ao for emacs-devel@quimby.gnus.org; Thu, 18 Mar 2004 02:07:59 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B3rd1-0006hX-W3 for emacs-devel@gnu.org; Thu, 18 Mar 2004 02:07:43 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B3rcV-0006X9-D8 for emacs-devel@gnu.org; Thu, 18 Mar 2004 02:07:42 -0500 Original-Received: from [66.33.219.6] (helo=knife.dreamhost.com) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B3rcR-0006Vw-Lv for emacs-devel@gnu.org; Thu, 18 Mar 2004 02:07:07 -0500 Original-Received: from mail.jurta.org (80-235-32-10-dsl.mus.estpak.ee [80.235.32.10]) by knife.dreamhost.com (Postfix) with ESMTP id B0DBAE4055 for ; Wed, 17 Mar 2004 23:07:00 -0800 (PST) Original-To: emacs-devel@gnu.org In-Reply-To: (Richard Stallman's message of "Fri, 20 Feb 2004 08:41:37 -0500") User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:20568 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20568 I looked at other functions that use `frame-window' which produces too long lines in side-by-side windows, and replaced it with `window-width'. BTW, one of the fixes was made in the file abbrevlist.el with a lone function `list-one-abbrev-table' which is not used anywhere in Emacs. I'm not sure if this function should be removed because it might be used in Emacs Lisp programs outside Emacs and also it looks like a useful function, but perhaps this functions should be moved to the abbrev.el file and the abbrevlist.el file be deleted. Index: emacs/lisp/abbrevlist.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/abbrevlist.el,v retrieving revision 1.11 diff -c -r1.11 abbrevlist.el *** emacs/lisp/abbrevlist.el 1 Sep 2003 15:45:04 -0000 1.11 --- emacs/lisp/abbrevlist.el 18 Mar 2004 01:57:40 -0000 *************** *** 39,45 **** abbrev-table) (setq abbrev-list (sort abbrev-list 'string-lessp)) (while abbrev-list ! (if (> (+ first-column 40) (frame-width)) (progn (insert "\n") (setq first-column 0))) --- 39,45 ---- abbrev-table) (setq abbrev-list (sort abbrev-list 'string-lessp)) (while abbrev-list ! (if (> (+ first-column 40) (window-width)) (progn (insert "\n") (setq first-column 0))) Index: emacs/lisp/descr-text.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/descr-text.el,v retrieving revision 1.17 diff -c -r1.17 descr-text.el *** emacs/lisp/descr-text.el 9 Nov 2003 19:38:32 -0000 1.17 --- emacs/lisp/descr-text.el 18 Mar 2004 01:57:40 -0000 *************** *** 589,595 **** (when (>= (+ (current-column) (or (string-match "\n" clm) (string-width clm)) 1) ! (frame-width)) (insert "\n") (indent-to (1+ max-width))) (insert " " clm)) --- 589,595 ---- (when (>= (+ (current-column) (or (string-match "\n" clm) (string-width clm)) 1) ! (window-width)) (insert "\n") (indent-to (1+ max-width))) (insert " " clm)) Index: emacs/lisp/international/mule-diag.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/international/mule-diag.el,v retrieving revision 1.92 diff -c -r1.92 mule-diag.el *** emacs/lisp/international/mule-diag.el 7 Oct 2003 06:45:46 -0000 1.92 --- emacs/lisp/international/mule-diag.el 18 Mar 2004 01:57:41 -0000 *************** *** 845,851 **** (setq codings (cons x codings)))) (get (car categories) 'coding-systems)) (if codings ! (let ((max-col (frame-width)) pos) (princ (format "\ The following are decoded correctly but recognized as %s:\n " --- 845,851 ---- (setq codings (cons x codings)))) (get (car categories) 'coding-systems)) (if codings ! (let ((max-col (window-width)) pos) (princ (format "\ The following are decoded correctly but recognized as %s:\n " Index: emacs/lisp/international/quail.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/international/quail.el,v retrieving revision 1.132 diff -c -r1.132 quail.el *** emacs/lisp/international/quail.el 10 Nov 2003 04:30:46 -0000 1.132 --- emacs/lisp/international/quail.el 18 Mar 2004 01:57:43 -0000 *************** *** 2289,2296 **** (or (> (length x) (length y)) (and (= (length x) (length y)) (not (string< x y)))))))) ! (let ((frame-width (frame-width (window-frame (get-buffer-window ! (current-buffer) 'visible)))) (single-key-width 3) (single-trans-width 4) (multiple-key-width 3) --- 2289,2296 ---- (or (> (length x) (length y)) (and (= (length x) (length y)) (not (string< x y)))))))) ! (let ((window-width (window-width (get-buffer-window ! (current-buffer) 'visible))) (single-key-width 3) (single-trans-width 4) (multiple-key-width 3) *************** *** 2319,2325 **** (setq multiple-key-width width))) (when single-list (setq col-width (+ single-key-width 1 single-trans-width 1) ! cols (/ frame-width col-width) rows (/ (length single-list) cols)) (if (> (% (length single-list) cols) 0) (setq rows (1+ rows))) --- 2319,2325 ---- (setq multiple-key-width width))) (when single-list (setq col-width (+ single-key-width 1 single-trans-width 1) ! cols (/ window-width col-width) rows (/ (length single-list) cols)) (if (> (% (length single-list) cols) 0) (setq rows (1+ rows))) *************** *** 2365,2371 **** (lambda (x) (let ((width (if (integerp x) (char-width x) (string-width x)))) ! (when (> (+ (current-column) 1 width) frame-width) (insert "\n") (indent-to multiple-key-width)) (insert " " x)))) --- 2365,2371 ---- (lambda (x) (let ((width (if (integerp x) (char-width x) (string-width x)))) ! (when (> (+ (current-column) 1 width) window-width) (insert "\n") (indent-to multiple-key-width)) (insert " " x)))) *************** *** 2402,2408 **** (with-current-buffer standard-output (setq quail-current-package package-def)))) ;; Then, insert text in the help buffer while paying attention to ! ;; the width of the frame in which the buffer displayed. (with-current-buffer (help-buffer) (setq buffer-read-only nil) (insert "Input method: " (quail-name) --- 2402,2408 ---- (with-current-buffer standard-output (setq quail-current-package package-def)))) ;; Then, insert text in the help buffer while paying attention to ! ;; the width of the window in which the buffer displayed. (with-current-buffer (help-buffer) (setq buffer-read-only nil) (insert "Input method: " (quail-name) -- Juri Linkov http://www.jurta.org/emacs/