🚀 go-pugleaf

These changes make the Makefile targets and the info file name a
little more standard, and fix some problems with determining message
authors' names.  The latter are based on patches posted by
kevin@traffic.den.mmc.com (Kevin Rodgers), with an additional patch to
take names out of double quotes.


--- 1.1	1993/08/25 12:24:31
+++ ./Makefile	1993/08/25 12:36:30
@@ -1,10 +1,16 @@
 EMACS=emacs
+MAKEINFO=makeinfo
 
-VM:
-	$(EMACS) -batch -q -l ./vm-message.el -l ./vm-misc.el -f batch-byte-compile *.el
+all: vm.elc vm.info
+
+vm.elc:
+	$(EMACS) -batch -q -l ./vm-message.el -l ./vm-misc.el -f batch-byte-compile vm-*.el
 	cat vm-*.elc > vm.elc
 
-vm:	vm.texinfo
-	$(EMACS) -batch -q vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer
+vm.info:	vm.texinfo
+	$(MAKEINFO) vm.texinfo
 
-all:	VM vm
+clean:
+	rm -f *.elc *.info *~
+	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log 
+	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
--- 1.1	1993/08/25 12:24:31
+++ ./vm-summary.el	1993/08/25 12:41:39
@@ -566,7 +566,15 @@
 	    (buffer-substring (match-beginning 1) (match-end 1)))))))
 
 (defun vm-su-do-author (m)
-  (let (full-name from)
+  (let ((trim-func (function (lambda (string)
+			       (let ((match-data (match-data)))
+				 (unwind-protect
+				     (if (string-match "\\s +$" string)
+					 (substring string
+						    0 (match-beginning 0))
+				       string)
+				   (store-match-data match-data))))))
+	full-name from)
     (setq full-name (vm-get-header-contents m "Full-Name"))
     (setq from (or (vm-get-header-contents m "From") (vm-grok-From_-author m)))
     (cond ((null from)
@@ -573,20 +581,31 @@
 	   (setq from "???")
 	   (if (null full-name)
 	       (setq full-name "???")))
-	  ((string-match "^\\([^< \t\n]+\\([ \t\n]+[^< \t\n]+\\)*\\)?[ \t\n]*\\(<\\([^>]+\\)>\\)"
-			 from)
-	   (if (and (match-beginning 1) (null full-name))
+ 	  ((string-match "^\\s *\\([^<]+\\)<\\(.+\\)>\\s *$" from)
+ 	   (if (null full-name)
 	       (setq full-name
-		     (substring from (match-beginning 1) (match-end 1))))
-	   (setq from (substring from (match-beginning 4) (match-end 4))))
-	  ((string-match "[\000-\177]*(\\([^)]+\\))[\000-\177]*" from)
+		     (funcall trim-func
+			      (substring from
+					 (match-beginning 1) (match-end 1)))))
+	   
+	   ;; Strip "s from full name (cross@eng.umd.edu  9-Jul-93)
+	   (if (not (null full-name))
+	       (if (and (string= (substring full-name 0 1) "\"")
+			(string= (substring full-name -1) "\""))
+		   (setq full-name
+			 (substring full-name 1 -1)))
+	     )
+
+	   (setq from (substring from (match-beginning 2) (match-end 2))))
+	  ((string-match "^\\s *\\([^(]+\\)(\\(.+\\))\\s *$" from)
 	   (if (null full-name)
-	       (setq full-name (substring from (match-beginning 1)
-					  (match-end 1))))
+	       (setq full-name
+		     (substring from (match-beginning 2) (match-end 2))))
 	   (setq from
-		 (concat
-		  (substring from (match-beginning 0) (1- (match-beginning 1)))
-		  (substring from (1+ (match-end 1)) (match-end 0))))))
+ 		 (funcall trim-func
+ 			  (substring from
+ 				     (match-beginning 1) (match-end 1))))))
+		 
     ;; ewe ewe see pee...
     (if (and vm-gargle-uucp (string-match
 "\\([^!@:.]+\\)\\(\\.[^!@:]+\\)?!\\([^!@: \t\n]+\\)\\(@\\([^!@:. \t\n]+\\)\\(.[^ \t\n]+\\)?\\)?[ \t\n]*$"
--- 1.1	1993/08/25 12:28:27
+++ ./vm.texinfo	1993/08/25 12:35:11
@@ -1,5 +1,5 @@
 \input texinfo  @comment -*-Texinfo-*-
-@setfilename vm
+@setfilename vm.info
 @settitle VM User's Manual
 @iftex
 @finalout