From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Drew Adams" Newsgroups: gmane.emacs.devel Subject: RE: patch to fill overlong lines in `describe-key' Date: Mon, 11 Feb 2008 22:18:32 -0800 Message-ID: <003501c86d3f$183e9160$405a908d@us.oracle.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0036_01C86CFC.0A1B5160" X-Trace: ger.gmane.org 1202797151 13033 80.91.229.12 (12 Feb 2008 06:19:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Feb 2008 06:19:11 +0000 (UTC) To: Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 12 07:19:34 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JOoUP-0001Bg-6T for ged-emacs-devel@m.gmane.org; Tue, 12 Feb 2008 07:19:33 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JOoTv-0007Q4-JD for ged-emacs-devel@m.gmane.org; Tue, 12 Feb 2008 01:19:03 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JOoTn-0007P2-Dq for emacs-devel@gnu.org; Tue, 12 Feb 2008 01:18:55 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JOoTh-0007OG-Hn for emacs-devel@gnu.org; Tue, 12 Feb 2008 01:18:53 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JOoTh-0007OD-AO for emacs-devel@gnu.org; Tue, 12 Feb 2008 01:18:49 -0500 Original-Received: from agminet01.oracle.com ([141.146.126.228]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JOoTg-0006w3-SW for emacs-devel@gnu.org; Tue, 12 Feb 2008 01:18:49 -0500 Original-Received: from agmgw1.us.oracle.com (agmgw1.us.oracle.com [152.68.180.212]) by agminet01.oracle.com (Switch-3.2.4/Switch-3.1.7) with ESMTP id m1C6IkYP014918 for ; Tue, 12 Feb 2008 00:18:46 -0600 Original-Received: from acsmt350.oracle.com (acsmt350.oracle.com [141.146.40.150]) by agmgw1.us.oracle.com (Switch-3.2.0/Switch-3.2.0) with ESMTP id m1C54WeO022014 for ; Mon, 11 Feb 2008 23:18:46 -0700 Original-Received: from inet-141-146-46-1.oracle.com by acsmt350.oracle.com with ESMTP id 3570616691202797113; Mon, 11 Feb 2008 22:18:33 -0800 Original-Received: from dradamslap1 (/141.144.90.64) by bhmail.oracle.com (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 Feb 2008 22:18:32 -0800 X-Mailer: Microsoft Office Outlook 11 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 Thread-Index: Achs8sczBcHxG2wgQSGWMxv+PD4gQAABeS/AABFkNXA= X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:88839 Archived-At: This is a multi-part message in MIME format. ------=_NextPart_000_0036_01C86CFC.0A1B5160 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit I mistakenly sent the wrong patch for help-fns.el. I sent a patch that added command `describe-option' and such - something unrelated. Attached are updated patches wrt today's CVS. And here's a change log entry: 2008-02-11 Drew Adams * help.el (describe-key): Joined some split lines to facilitate filling. * help-fns.el (describe-function-1): Fill text of overlong lines. ------=_NextPart_000_0036_01C86CFC.0A1B5160 Content-Type: application/octet-stream; name="help-fns-2008-02-11.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="help-fns-2008-02-11.patch" diff -c -w help-fns-CVS-2008-02-11.el help-fns-patched-2008-02-11.el=0A= *** help-fns-CVS-2008-02-11.el Mon Feb 11 14:23:56 2008=0A= --- help-fns-patched-2008-02-11.el Mon Feb 11 14:28:46 2008=0A= ***************=0A= *** 269,275 ****=0A= (symbol-function real-function)=0A= function))=0A= file-name string=0A= ! (beg (if (commandp def) "an interactive " "a ")))=0A= (setq string=0A= (cond ((or (stringp def) (vectorp def))=0A= "a keyboard macro")=0A= --- 269,276 ----=0A= (symbol-function real-function)=0A= function))=0A= file-name string=0A= ! (beg (if (commandp def) "an interactive " "a "))=0A= ! (pt1 (with-current-buffer (help-buffer) (point))))=0A= (setq string=0A= (cond ((or (stringp def) (vectorp def))=0A= "a keyboard macro")=0A= ***************=0A= *** 358,365 ****=0A= (re-search-backward "`\\([^`']+\\)'" nil t)=0A= (help-xref-button 1 'help-function-def real-function file-name))))=0A= (princ ".")=0A= ! (terpri)=0A= (when (commandp function)=0A= (if (and (eq function 'self-insert-command)=0A= (eq (key-binding "a") 'self-insert-command)=0A= (eq (key-binding "b") 'self-insert-command)=0A= --- 359,370 ----=0A= (re-search-backward "`\\([^`']+\\)'" nil t)=0A= (help-xref-button 1 'help-function-def real-function file-name))))=0A= (princ ".")=0A= ! (with-current-buffer (help-buffer)=0A= ! (fill-region-as-paragraph (save-excursion (goto-char pt1) = (forward-line 0) (point))=0A= ! (point)))=0A= ! (terpri)(terpri)=0A= (when (commandp function)=0A= + (let ((pt2 (with-current-buffer (help-buffer) (point))))=0A= (if (and (eq function 'self-insert-command)=0A= (eq (key-binding "a") 'self-insert-command)=0A= (eq (key-binding "b") 'self-insert-command)=0A= ***************=0A= *** 379,385 ****=0A= (princ "'"))=0A= =0A= (when keys=0A= ! (princ (if remapped " which is bound to " "It is bound to "))=0A= ;; If lots of ordinary text characters run this command,=0A= ;; don't mention them one by one.=0A= (if (< (length non-modified-keys) 10)=0A= --- 384,390 ----=0A= (princ "'"))=0A= =0A= (when keys=0A= ! (princ (if remapped ", which is bound to " "It is bound = to "))=0A= ;; If lots of ordinary text characters run this command,=0A= ;; don't mention them one by one.=0A= (if (< (length non-modified-keys) 10)=0A= ***************=0A= *** 393,399 ****=0A= (princ "many ordinary text characters"))))=0A= (when (or remapped keys non-modified-keys)=0A= (princ ".")=0A= ! (terpri)))))=0A= (let* ((arglist (help-function-arglist def))=0A= (doc (documentation function))=0A= (usage (help-split-fundoc doc function)))=0A= --- 398,406 ----=0A= (princ "many ordinary text characters"))))=0A= (when (or remapped keys non-modified-keys)=0A= (princ ".")=0A= ! (terpri))))=0A= ! (with-current-buffer (help-buffer) (fill-region-as-paragraph = pt2 (point)))=0A= ! (terpri)))=0A= (let* ((arglist (help-function-arglist def))=0A= (doc (documentation function))=0A= (usage (help-split-fundoc doc function)))=0A= =0A= Diff finished. Mon Feb 11 14:29:35 2008=0A= ------=_NextPart_000_0036_01C86CFC.0A1B5160 Content-Type: application/octet-stream; name="help-2008-02-11.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="help-2008-02-11.patch" diff -c -w help-CVS-2008-02-11.el help-patched-2008-02-11.el=0A= *** help-CVS-2008-02-11.el Mon Feb 11 14:34:04 2008=0A= --- help-patched-2008-02-11.el Mon Feb 11 14:45:52 2008=0A= ***************=0A= *** 745,752 ****=0A= (with-help-window (help-buffer)=0A= (princ (help-key-description key untranslated))=0A= (princ (format "\=0A= ! %s runs the command %S=0A= ! which is "=0A= mouse-msg defn))=0A= (describe-function-1 defn)=0A= (when up-event=0A= --- 745,751 ----=0A= (with-help-window (help-buffer)=0A= (princ (help-key-description key untranslated))=0A= (princ (format "\=0A= ! %s runs the command %S, which is "=0A= mouse-msg defn))=0A= (describe-function-1 defn)=0A= (when up-event=0A= ***************=0A= *** 757,768 ****=0A= =0A= ----------------- up-event %s----------------=0A= =0A= ! <%S>%s%s runs the command %S=0A= ! which is "=0A= (if mouse-1-tricky "(short click) " "")=0A= ev-type mouse-msg=0A= (if mouse-1-remapped=0A= ! " is remapped to \nwhich" "")=0A= defn-up))=0A= (describe-function-1 defn-up))=0A= (unless (or (null defn-up-tricky)=0A= --- 756,766 ----=0A= =0A= ----------------- up-event %s----------------=0A= =0A= ! <%S>%s%s runs the command %S, which is "=0A= (if mouse-1-tricky "(short click) " "")=0A= ev-type mouse-msg=0A= (if mouse-1-remapped=0A= ! " is remapped to , which" "")=0A= defn-up))=0A= (describe-function-1 defn-up))=0A= (unless (or (null defn-up-tricky)=0A= ***************=0A= *** 773,780 ****=0A= ----------------- up-event (long click) ----------------=0A= =0A= Pressing <%S>%s for longer than %d milli-seconds=0A= ! runs the command %S=0A= ! which is "=0A= ev-type mouse-msg=0A= mouse-1-click-follows-link=0A= defn-up-tricky))=0A= --- 771,777 ----=0A= ----------------- up-event (long click) ----------------=0A= =0A= Pressing <%S>%s for longer than %d milli-seconds=0A= ! runs the command %S, which is "=0A= ev-type mouse-msg=0A= mouse-1-click-follows-link=0A= defn-up-tricky))=0A= =0A= Diff finished. Mon Feb 11 14:46:11 2008=0A= ------=_NextPart_000_0036_01C86CFC.0A1B5160--