From xemacs-m  Sun Jun 15 16:00:44 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id QAA26709
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 16:00:41 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id OAA08955;
	Sun, 15 Jun 1997 14:00:53 -0700
Date: Sun, 15 Jun 1997 14:00:53 -0700
Message-Id: <199706152100.OAA08955@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: "Karl M. Hegbloom" <karlheg@inetarena.com>
Cc: <xemacs-beta@xemacs.org>
Subject: Re: [patch] custom/{cus-edit,wid-browse,wid-edit}.el
In-Reply-To: <199706151927.MAA07767@bittersweet.inetarena.com>
References: <199706151927.MAA07767@bittersweet.inetarena.com>
X-Mailer: VM 6.32 under 20.3 "Oslo" XEmacs Lucid (beta7)
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D

 The keyboard macro I'm using left an extra ! at the start of a few
files...  Here's the correct patch.  Others may follow.

8<----------------------------------------------------------------->8
*** cus-edit.el.orig	Sun Jun 15 12:23:29 1997
--- cus-edit.el	Sun Jun 15 14:00:00 1997
***************
*** 996,1006 ****
  					       (nth 0 entry))
  					 :value (nth 0 entry))
  			  (setq count (1+ count))
! 			  (unless (eq (preceding-char) ?\n)
  			    (widget-insert "\n"))
  			  (widget-insert "\n")))
  		      options))))
!   (unless (eq (preceding-char) ?\n)
      (widget-insert "\n"))
    (message "Creating customization magic...")
    (mapcar 'custom-magic-reset custom-options)
--- 996,1006 ----
  					       (nth 0 entry))
  					 :value (nth 0 entry))
  			  (setq count (1+ count))
! 			  (unless (eq (char-before (point)) ?\n)
  			    (widget-insert "\n"))
  			  (widget-insert "\n")))
  		      options))))
!   (unless (eq (char-before (point)) ?\n)
      (widget-insert "\n"))
    (message "Creating customization magic...")
    (mapcar 'custom-magic-reset custom-options)
***************
*** 1305,1311 ****
  		  (not (eq state 'hidden)))
  		 buttons))
  	  ((eq escape ?m)
! 	   (and (eq (preceding-char) ?\n)
  		(widget-get widget :indent)
  		(insert-char ?  (widget-get widget :indent)))
  	   (let ((magic (widget-create-child-and-convert
--- 1305,1311 ----
  		  (not (eq state 'hidden)))
  		 buttons))
  	  ((eq escape ?m)
! 	   (and (eq (char-before (point)) ?\n)
  		(widget-get widget :indent)
  		(insert-char ?  (widget-get widget :indent)))
  	   (let ((magic (widget-create-child-and-convert
***************
*** 1319,1325 ****
  		    (links (get symbol 'custom-links))
  		    (many (> (length links) 2)))
  	       (when links
! 		 (and (eq (preceding-char) ?\n)
  		      (widget-get widget :indent)
  		      (insert-char ?  (widget-get widget :indent)))
  		 (insert "See also ")
--- 1319,1325 ----
  		    (links (get symbol 'custom-links))
  		    (many (> (length links) 2)))
  	       (when links
! 		 (and (eq (char-before (point)) ?\n)
  		      (widget-get widget :indent)
  		      (insert-char ?  (widget-get widget :indent)))
  		 (insert "See also ")
***************
*** 1574,1580 ****
  		    :value value)
  		   children))))
      ;; Now update the state.
!     (unless (eq (preceding-char) ?\n)
        (widget-insert "\n"))
      (if (eq state 'hidden)
  	(widget-put widget :custom-state state)
--- 1574,1580 ----
  		    :value value)
  		   children))))
      ;; Now update the state.
!     (unless (eq (char-before (point)) ?\n)
        (widget-insert "\n"))
      (if (eq state 'hidden)
  	(widget-put widget :custom-state state)
***************
*** 1927,1933 ****
  
  (defun custom-face-value-create (widget)
    ;; Create a list of the display specifications.
!   (unless (eq (preceding-char) ?\n)
      (insert "\n"))
    (when (not (eq (widget-get widget :custom-state) 'hidden))
      (message "Creating face editor...")
--- 1927,1933 ----
  
  (defun custom-face-value-create (widget)
    ;; Create a list of the display specifications.
!   (unless (eq (char-before (point)) ?\n)
      (insert "\n"))
    (when (not (eq (widget-get widget :custom-state) 'hidden))
      (message "Creating face editor...")
***************
*** 2228,2234 ****
  				      :custom-prefixes custom-prefix-list
  				      :custom-level (1+ level)
  				      :value (nth 0 entry))
! 				   (unless (eq (preceding-char) ?\n)
  				     (widget-insert "\n"))))
  			       members)))
  	(message "Creating group magic...")
--- 2228,2234 ----
  				      :custom-prefixes custom-prefix-list
  				      :custom-level (1+ level)
  				      :value (nth 0 entry))
! 				   (unless (eq (char-before (point)) ?\n)
  				     (widget-insert "\n"))))
  			       members)))
  	(message "Creating group magic...")
*** wid-browse.el.orig	Sun Jun 15 12:23:41 1997
--- wid-browse.el	Sun Jun 15 14:00:09 1997
***************
*** 145,151 ****
  		   :format "%[%v%]\n%d"
  		   :doc (get widget 'widget-documentation)
  		   widget)
!     (unless (eq (preceding-char) ?\n)
        (widget-insert "\n"))
      (widget-insert "\nSuper: ")
      (setq widget (get widget 'widget-type)))
--- 145,151 ----
  		   :format "%[%v%]\n%d"
  		   :doc (get widget 'widget-documentation)
  		   widget)
!     (unless (eq (char-before (point)) ?\n)
        (widget-insert "\n"))
      (widget-insert "\nSuper: ")
      (setq widget (get widget 'widget-type)))
*** wid-edit.el.orig	Sun Jun 15 12:23:51 1997
--- wid-edit.el	Sun Jun 15 14:00:20 1997
***************
*** 1202,1208 ****
  			 (setq begin (point)))
  		       (save-excursion
  			 (goto-char end)
! 			 (while (and (eq (preceding-char) ?\ )
  				     (> (point) begin))
  			   (delete-backward-char 1)))))))
  	    (when secret
--- 1202,1208 ----
  			 (setq begin (point)))
  		       (save-excursion
  			 (goto-char end)
! 			 (while (and (eq (char-before (point)) ?\ )
  				     (> (point) begin))
  			   (delete-backward-char 1)))))))
  	    (when secret
***************
*** 1346,1352 ****
  		  (when doc
  		    (setq doc-begin (point))
  		    (insert doc)
! 		    (while (eq (preceding-char) ?\n)
  		      (delete-backward-char 1))
  		    (insert "\n")
  		    (setq doc-end (point)))))
--- 1346,1352 ----
  		  (when doc
  		    (setq doc-begin (point))
  		    (insert doc)
! 		    (while (eq (char-before (point)) ?\n)
  		      (delete-backward-char 1))
  		    (insert "\n")
  		    (setq doc-end (point)))))
***************
*** 1392,1398 ****
  				 (> (length doc-try) 1)
  				 doc-try)))
  	     (when doc-text
! 	       (and (eq (preceding-char) ?\n)
  		    (widget-get widget :indent)
  		    (insert-char ?  (widget-get widget :indent)))
  	       ;; The `*' in the beginning is redundant.
--- 1392,1398 ----
  				 (> (length doc-try) 1)
  				 doc-try)))
  	     (when doc-text
! 	       (and (eq (char-before (point)) ?\n)
  		    (widget-get widget :indent)
  		    (insert-char ?  (widget-get widget :indent)))
  	       ;; The `*' in the beginning is redundant.
***************
*** 1987,1993 ****
  (defun widget-checklist-add-item (widget type chosen)
    ;; Create checklist item in WIDGET of type TYPE.
    ;; If the item is checked, CHOSEN is a cons whose cdr is the value.
!   (and (eq (preceding-char) ?\n)
         (widget-get widget :indent)
         (insert-char ?  (widget-get widget :indent)))
    (widget-specify-insert 
--- 1987,1993 ----
  (defun widget-checklist-add-item (widget type chosen)
    ;; Create checklist item in WIDGET of type TYPE.
    ;; If the item is checked, CHOSEN is a cons whose cdr is the value.
!   (and (eq (char-before (point)) ?\n)
         (widget-get widget :indent)
         (insert-char ?  (widget-get widget :indent)))
    (widget-specify-insert 
***************
*** 2169,2175 ****
  (defun widget-radio-add-item (widget type)
    "Add to radio widget WIDGET a new radio button item of type TYPE."
    ;; (setq type (widget-convert type))
!   (and (eq (preceding-char) ?\n)
         (widget-get widget :indent)
         (insert-char ?  (widget-get widget :indent)))
    (widget-specify-insert 
--- 2169,2175 ----
  (defun widget-radio-add-item (widget type)
    "Add to radio widget WIDGET a new radio button item of type TYPE."
    ;; (setq type (widget-convert type))
!   (and (eq (char-before (point)) ?\n)
         (widget-get widget :indent)
         (insert-char ?  (widget-get widget :indent)))
    (widget-specify-insert 
***************
*** 2525,2531 ****
  	    args (cdr args)
  	    answer (widget-match-inline arg value)
  	    value (cdr answer))
!       (and (eq (preceding-char) ?\n)
  	   (widget-get widget :indent)
  	   (insert-char ?  (widget-get widget :indent)))
        (push (cond ((null answer)
--- 2525,2531 ----
  	    args (cdr args)
  	    answer (widget-match-inline arg value)
  	    value (cdr answer))
!       (and (eq (char-before (point)) ?\n)
  	   (widget-get widget :indent)
  	   (insert-char ?  (widget-get widget :indent)))
        (push (cond ((null answer)
8<----------------------------------------------------------------->8

-- 
Karl M. Hegbloom <karlheg@inetarena.com>
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3  Linux 2.1.36 AMD K5 PR-133

