From xemacs-m  Sun Jun 15 15:40:18 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 PAA23215
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 15:40:15 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id NAA08654;
	Sun, 15 Jun 1997 13:40:29 -0700
Date: Sun, 15 Jun 1997 13:40:29 -0700
Message-Id: <199706152040.NAA08654@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
To: <xemacs-beta@xemacs.org>
Subject: [patch] hyperbole/{hargs,hbdata,hbut,hrmail,hui-{mini,mouse},
	hui,hvm}.el
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


8<----------------------------------------------------------------->8
*** hargs.el.orig	Sun Jun 15 13:35:34 1997
--- hargs.el	Sun Jun 15 13:37:12 1997
***************
*** 79,85 ****
  	   (char-to-string
  	    (if (search-backward " " nil t)
  		(progn (skip-chars-forward " ")
! 		       (following-char))
  	      0))))
  	((hargs:completion t))
  	((eq hargs:reading-p 'ebut) (ebut:label-p 'as-label))
--- 79,85 ----
  	   (char-to-string
  	    (if (search-backward " " nil t)
  		(progn (skip-chars-forward " ")
! 		       (char-after (point)))
  	      0))))
  	((hargs:completion t))
  	((eq hargs:reading-p 'ebut) (ebut:label-p 'as-label))
***************
*** 145,151 ****
  	((eq hargs:reading-p 'buffer)
  	 (find-tag-default))
  	((eq hargs:reading-p 'character)
! 	 (following-char))
  	((eq hargs:reading-p 'key)
  	 (require 'hib-kbd)
  	 (let ((key-seq (hbut:label-p 'as-label "{" "}")))
--- 145,151 ----
  	((eq hargs:reading-p 'buffer)
  	 (find-tag-default))
  	((eq hargs:reading-p 'character)
! 	 (char-after (point)))
  	((eq hargs:reading-p 'key)
  	 (require 'hib-kbd)
  	 (let ((key-seq (hbut:label-p 'as-label "{" "}")))
***************
*** 409,415 ****
  		  (sit-for 1)
  		  nil)))
  	  (save-excursion
! 	    (if (not (memq (char-syntax (preceding-char)) '(?w ?_)))
  		(while (not (looking-at "\\sw\\|\\s_\\|\\'"))
  		  (forward-char 1)))
  	    (while (looking-at "\\sw\\|\\s_")
--- 409,415 ----
  		  (sit-for 1)
  		  nil)))
  	  (save-excursion
! 	    (if (not (memq (char-syntax (char-before (point))) '(?w ?_)))
  		(while (not (looking-at "\\sw\\|\\s_\\|\\'"))
  		  (forward-char 1)))
  	    (while (looking-at "\\sw\\|\\s_")
***************
*** 554,565 ****
  	(let ((not-quoted
  	       '(not (and (= (char-syntax (char-after (- (point) 2))) ?\\)
  			  (/= (char-syntax (char-after (- (point) 3))) ?\\)))))
! 	  (cond ((and (= (char-syntax (preceding-char)) ?\))
  		      ;; Ignore quoted end chars.
  		      (eval not-quoted))
  		 (buffer-substring (point)
  				   (progn (forward-sexp -1) (point))))
! 		((and (= (char-syntax (following-char)) ?\()
  		      ;; Ignore quoted begin chars.
  		      (eval not-quoted))
  		 (buffer-substring (point)
--- 554,565 ----
  	(let ((not-quoted
  	       '(not (and (= (char-syntax (char-after (- (point) 2))) ?\\)
  			  (/= (char-syntax (char-after (- (point) 3))) ?\\)))))
! 	  (cond ((and (= (char-syntax (char-before (point))) ?\))
  		      ;; Ignore quoted end chars.
  		      (eval not-quoted))
  		 (buffer-substring (point)
  				   (progn (forward-sexp -1) (point))))
! 		((and (= (char-syntax (char-after (point))) ?\()
  		      ;; Ignore quoted begin chars.
  		      (eval not-quoted))
  		 (buffer-substring (point)
*** hbdata.el.orig	Sun Jun 15 13:35:42 1997
--- hbdata.el	Sun Jun 15 13:37:23 1997
***************
*** 271,277 ****
  	      (let ((end (point))
  		    (empty-hbdata-file "[ \t\n]*\\'"))
  		(forward-line -1)
! 		(if (= (following-char) ?\")
  		    ;; Last button entry for filename, so del filename.
  		    (progn (forward-line -1) (delete-region (point) end)))
  		(save-excursion
--- 271,277 ----
  	      (let ((end (point))
  		    (empty-hbdata-file "[ \t\n]*\\'"))
  		(forward-line -1)
! 		(if (= (char-after (point)) ?\")
  		    ;; Last button entry for filename, so del filename.
  		    (progn (forward-line -1) (delete-region (point) end)))
  		(save-excursion
*** hbut.el.orig	Sun Jun 15 13:35:52 1997
--- hbut.el	Sun Jun 15 13:37:32 1997
***************
*** 182,188 ****
  		      (save-restriction
  			(widen)
  			(if (and (search-backward hbut:source-prefix nil t)
! 				 (or (memq (preceding-char) '(?\n ?\^M))
  				     (= (point) (point-min))))
  			    (hbut:source full)))))
  		   (buffer-file-name
--- 182,188 ----
  		      (save-restriction
  			(widen)
  			(if (and (search-backward hbut:source-prefix nil t)
! 				 (or (memq (char-before (point)) '(?\n ?\^M))
  				     (= (point) (point-min))))
  			    (hbut:source full)))))
  		   (buffer-file-name
***************
*** 266,272 ****
  	  (progn
  	    (setq start (point)
  		  but-start (match-end 1))
! 	    (if (= ?\( (char-syntax (preceding-char)))
  		(condition-case ()
  		    (progn
  		      (forward-char -1)
--- 266,272 ----
  	  (progn
  	    (setq start (point)
  		  but-start (match-end 1))
! 	    (if (= ?\( (char-syntax (char-before (point))))
  		(condition-case ()
  		    (progn
  		      (forward-char -1)
***************
*** 384,390 ****
  	      lbl (buffer-substring (match-beginning 1) (match-end 1)))
  	(save-excursion
  	  (goto-char start)
! 	  (if (or (= (preceding-char) ?\\) (= (preceding-char) ?\{))
  	      ;; Ignore matches with quoted delimiters.
  	      (setq quoted t)))
  	(cond (quoted (setq quoted nil))
--- 384,390 ----
  	      lbl (buffer-substring (match-beginning 1) (match-end 1)))
  	(save-excursion
  	  (goto-char start)
! 	  (if (or (= (char-before (point)) ?\\) (= (char-before (point)) ?\{))
  	      ;; Ignore matches with quoted delimiters.
  	      (setq quoted t)))
  	(cond (quoted (setq quoted nil))
***************
*** 830,836 ****
  		  nil
  		(goto-char start)
  		(insert comment-start)
! 		(if (/= (preceding-char) ? )
  		    (insert ? ))))
  	  ;; Comments have both start and end delimiters
    	  (if (and (re-search-backward
--- 830,836 ----
  		  nil
  		(goto-char start)
  		(insert comment-start)
! 		(if (/= (char-before (point)) ? )
  		    (insert ? ))))
  	  ;; Comments have both start and end delimiters
    	  (if (and (re-search-backward
***************
*** 841,850 ****
  	      nil
  	    (goto-char start)
  	    (insert comment-start)
! 	    (if (/= (preceding-char) ? )
  		(insert ? ))
  	    (goto-char (+ (point) (- end start)))
! 	    (if (/= (following-char) ? )
  		(insert ? ))
  	    (insert comment-end)
  	    )))))
--- 841,850 ----
  	      nil
  	    (goto-char start)
  	    (insert comment-start)
! 	    (if (/= (char-before (point)) ? )
  		(insert ? ))
  	    (goto-char (+ (point) (- end start)))
! 	    (if (/= (char-after (point)) ? )
  		(insert ? ))
  	    (insert comment-end)
  	    )))))
*** hrmail.el.orig	Sun Jun 15 13:36:15 1997
--- hrmail.el	Sun Jun 15 13:37:52 1997
***************
*** 87,93 ****
  		    (goto-char (point-min))
  		    (forward-line 1)
  		    ;; Need to show full header
! 		    (if (= (following-char) ?1)
  			(setq tog t)))))
  	      tog))
  	(progn (rmail-toggle-header)
--- 87,93 ----
  		    (goto-char (point-min))
  		    (forward-line 1)
  		    ;; Need to show full header
! 		    (if (= (char-after (point)) ?1)
  			(setq tog t)))))
  	      tog))
  	(progn (rmail-toggle-header)
***************
*** 182,188 ****
    (save-excursion
      (Rmail-msg-widen)
      (goto-char (point-max))
!     (if (/= (preceding-char) ?\n)
  	(insert "\n"))
      ;; Adjust the marker that points to the end of this message.
      (set-marker (aref rmail-message-vector (1+ rmail-current-message))
--- 182,188 ----
    (save-excursion
      (Rmail-msg-widen)
      (goto-char (point-max))
!     (if (/= (char-before (point)) ?\n)
  	(insert "\n"))
      ;; Adjust the marker that points to the end of this message.
      (set-marker (aref rmail-message-vector (1+ rmail-current-message))
*** hui-mini.el.orig	Sun Jun 15 13:36:29 1997
--- hui-mini.el	Sun Jun 15 13:38:05 1997
***************
*** 478,484 ****
  		(save-excursion
  		  (if (search-backward " " nil t)
  		      (progn (skip-chars-forward " ")
! 			     (setq key (following-char))
  			     nil)  ;; Drop through.
  		    t))))
  	  (t (if (setq sublist (memq key item-keys))
--- 478,484 ----
  		(save-excursion
  		  (if (search-backward " " nil t)
  		      (progn (skip-chars-forward " ")
! 			     (setq key (char-after (point)))
  			     nil)  ;; Drop through.
  		    t))))
  	  (t (if (setq sublist (memq key item-keys))
*** hui-mouse.el.orig	Sun Jun 15 13:36:37 1997
--- hui-mouse.el	Sun Jun 15 13:38:27 1997
***************
*** 90,96 ****
      ;;
      ((if (not (eobp))
  	 (or (eolp) (if selective-display
! 			(= (following-char) ?\^M)))) .
       ((smart-scroll-up) . (smart-scroll-down)))
      ;;
      ((eq major-mode 'smart-menu-mode) . 
--- 90,96 ----
      ;;
      ((if (not (eobp))
  	 (or (eolp) (if selective-display
! 			(= (char-after (point)) ?\^M)))) .
       ((smart-scroll-up) . (smart-scroll-down)))
      ;;
      ((eq major-mode 'smart-menu-mode) . 
***************
*** 940,946 ****
  (defun smart-outline-subtree-hidden-p ()
    "Returns t if at least initial subtree of heading is hidden, else nil."
    (save-excursion
!     (if (re-search-forward "[\n\^M]" nil t) (= (preceding-char) ?\^M))))
  
  ;;; ************************************************************************
  ;;; smart-tar functions
--- 940,946 ----
  (defun smart-outline-subtree-hidden-p ()
    "Returns t if at least initial subtree of heading is hidden, else nil."
    (save-excursion
!     (if (re-search-forward "[\n\^M]" nil t) (= (char-before (point)) ?\^M))))
  
  ;;; ************************************************************************
  ;;; smart-tar functions
*** hui.el.orig	Sun Jun 15 13:36:50 1997
--- hui.el	Sun Jun 15 13:38:47 1997
***************
*** 662,668 ****
  			(hproperty:but-delete start))
  		   (skip-chars-backward " \t\n")
  		   (skip-chars-backward "0-9")
! 		   (if (= (preceding-char) (string-to-char ebut:instance-sep))
  		       (setq start (1- (point))))
  		   (if (search-backward ebut:start (- (point) ebut:max-len) t)
  		       (if current-prefix-arg
--- 662,668 ----
  			(hproperty:but-delete start))
  		   (skip-chars-backward " \t\n")
  		   (skip-chars-backward "0-9")
! 		   (if (= (char-before (point)) (string-to-char ebut:instance-sep))
  		       (setq start (1- (point))))
  		   (if (search-backward ebut:start (- (point) ebut:max-len) t)
  		       (if current-prefix-arg
***************
*** 908,915 ****
  		 )
  		(and (fboundp 'smart-emacs-lisp-mode-p)
  		     (smart-emacs-lisp-mode-p)
! 		     (or (= (char-syntax (following-char)) ?\()
! 			 (= (char-syntax (preceding-char)) ?\)))
  		     (setq val (hargs:sexpression-p))
  		     (list 'eval-elisp val))
  		))))
--- 908,915 ----
  		 )
  		(and (fboundp 'smart-emacs-lisp-mode-p)
  		     (smart-emacs-lisp-mode-p)
! 		     (or (= (char-syntax (char-after (point))) ?\()
! 			 (= (char-syntax (char-before (point))) ?\)))
  		     (setq val (hargs:sexpression-p))
  		     (list 'eval-elisp val))
  		))))
*** hvm.el.orig	Sun Jun 15 13:37:02 1997
--- hvm.el	Sun Jun 15 13:38:55 1997
***************
*** 1,4 ****
! ;;!emacs
  ;;
  ;; FILE:         hvm.el
  ;; SUMMARY:      Support Hyperbole buttons in mail reader: Vm.
--- 1,4 ----
! !;;!emacs
  ;;
  ;; FILE:         hvm.el
  ;; SUMMARY:      Support Hyperbole buttons in mail reader: Vm.
***************
*** 280,286 ****
        (error "The folder buffer for this message has been killed."))
    ;; make sure the message ends with a newline
    (goto-char (point-max))
!   (and (/= (preceding-char) ?\n) (insert ?\n))
    ;; munge message separators found in the edited message to
    ;; prevent message from being split into several messages.
    (vm-munge-message-separators (vm-message-type-of (car vm-message-pointer))
--- 280,286 ----
        (error "The folder buffer for this message has been killed."))
    ;; make sure the message ends with a newline
    (goto-char (point-max))
!   (and (/= (char-before (point)) ?\n) (insert ?\n))
    ;; munge message separators found in the edited message to
    ;; prevent message from being split into several messages.
    (vm-munge-message-separators (vm-message-type-of (car vm-message-pointer))
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

