emacs: lisp/mail/mail-extr.el comparison

comparison lisp/mail/mail-extr.el @ 1186:24f248525608

(mail-undo-backslash-quoting): Renamed from undo-... (mail-safe-move-sexp): Renamed from safe-... (mail-variant-method): Renamed from variant-method.

author	Richard M. Stallman <rms@gnu.org>
date	Mon, 21 Sep 1992 14:52:30 +0000
parents	9f3cc03dae67
children	58d613f69b39

comparison

equal deleted inserted replaced

-:4ec50a934e54
+:24f248525608
 ;; * arrange to have syntax tables byte-compiled.
 ;; * speed hacks.
 ;; * delete unused variables.
 ;; * arrange for testing with different relative precedences of ! vs. @
 ;;   and %.
-;; * put variant-method back into mail-extract-address-components.
+;; * put mail-variant-method back into mail-extract-address-components.
 ;; * insert documentation strings!
 ;; * handle X.400-gatewayed addresses according to RFC 1148.
 ;;; Change Log:
 ;;
 ))
 ;; Utility functions and macros.
-(defmacro undo-backslash-quoting (beg end)
+(defmacro mail-undo-backslash-quoting (beg end)
 (`(save-excursion
 (save-restriction
 	(narrow-to-region (, beg) (, end))
 	(goto-char (point-min))
 	;; undo \ quoting
 (` (let ((list (, list)))
 (while (not (null (cdr list)))
 	 (setq list (cdr list)))
 (car list))))
-(defmacro safe-move-sexp (arg)
+(defmacro mail-safe-move-sexp (arg)
 "Safely skip over one balanced sexp, if there is one.  Return t if success."
 (` (condition-case error
 	 (progn
 	   (goto-char (scan-sexps (point) (, arg)))
 	   t)
 		     (forward-char 1)
 		     (skip-chars-forward mail-whitespace)
 		     (not (eq ?\) (char-after (point))))))
 	      (setq comment-beg (point)))
 	  ;; TODO: don't record if unbalanced
-	  (or (safe-move-sexp 1)
+	  (or (mail-safe-move-sexp 1)
 	      (forward-char 1))
 	  (set-syntax-table address-syntax-table)
 	  (if (and comment-beg
 		   (not comment-end))
 	      (setq comment-end (point))))
 		     (forward-char 1)
 		     (skip-chars-forward mail-whitespace)
 		     (not (eq ?\" (char-after (point))))))
 	      (setq quote-beg (point)))
 	  ;; TODO: don't record if unbalanced
-	  (or (safe-move-sexp 1)
+	  (or (mail-safe-move-sexp 1)
 	      (forward-char 1))
 	  (if (and quote-beg
 		   (not quote-end))
 	      (setq quote-end (point))))
 	 ;; domain literals
 	 ((eq char ?\[)
 	  (set-syntax-table address-domain-literal-syntax-table)
-	  (or (safe-move-sexp 1)
+	  (or (mail-safe-move-sexp 1)
 	      (forward-char 1))
 	  (set-syntax-table address-syntax-table))
 	 ;; commas delimit addresses when outside < > pairs.
 	 ((and (eq char ?,)
 	       (or (null <-pos)
 		      (1+ (nth 1 !-pos))
 		    (point-min))
 		  (car !-pos))
 		 (delete-char 1)
 		 (or (save-excursion
-		       (safe-move-sexp -1)
+		       (mail-safe-move-sexp -1)
 		       (skip-chars-backward mail-whitespace)
 		       (eq ?. (preceding-char)))
 		     (insert-before-markers
 		      (if (save-excursion
 			    (skip-chars-backward mail-whitespace)
 	       (while temp
 		 (goto-char (or (nth 1 temp)
 				@-pos))
 		 (skip-chars-backward mail-whitespace)
 		 (save-excursion
-		   (safe-move-sexp -1)
+		   (mail-safe-move-sexp -1)
 		   (setq domain-pos (point))
 		   (skip-chars-backward mail-whitespace)
 		   (setq \.-pos (eq ?. (preceding-char))))
 		 (cond ((and \.-pos
 			     (get
 (cond ((and phrase-beg
 		  (eq quote-beg phrase-beg)
 		  (<= quote-end phrase-end))
 	     (narrow-to-region (1+ quote-beg) (1- quote-end))
-	     (undo-backslash-quoting (point-min) (point-max)))
+	     (mail-undo-backslash-quoting (point-min) (point-max)))
 	    (phrase-beg
 	     (narrow-to-region phrase-beg phrase-end))
 	    (comment-beg
 	     (narrow-to-region (1+ comment-beg) (1- comment-end))
-	     (undo-backslash-quoting (point-min) (point-max)))
+	     (mail-undo-backslash-quoting (point-min) (point-max)))
 	    (t
 	     ;; *** Work in canon buffer instead?  No, can't.  Hmm.
 	     (delete-region (point-min) (point-max))
 	     (insert-buffer-substring canonicalization-buffer
 				      mbox-beg mbox-end)
 		      (not (eobp)))
 	       (setq char (char-after (point)))
 	       (cond
 		((eq char ?\")
 		 (setq quote-beg (point))
-		 (or (safe-move-sexp 1)
+		 (or (mail-safe-move-sexp 1)
 		     ;; TODO: handle this error condition!!!!!
 		     (forward-char 1))
 		 ;; take into account deletions
 		 (setq quote-end (- (point) 2))
 		 (save-excursion
 		   (backward-char 1)
 		   (delete-char 1)
 		   (goto-char quote-beg)
 		   (delete-char 1))
-		 (undo-backslash-quoting quote-beg quote-end)
+		 (mail-undo-backslash-quoting quote-beg quote-end)
 		 (or (eq mail-space-char (char-after (point)))
 		     (insert " "))
 		 (setq \.-ends-name t))
 		((eq char ?.)
 		 (if (eq (char-after (1+ (point))) ?_)
 		     (replace-match "\\1 "))
 		   (goto-char (point-max))))))))
 (set-syntax-table address-text-syntax-table)
-(setq xxx (variant-method (buffer-string)))
+(setq xxx (mail-variant-method (buffer-string)))
 (delete-region (point-min) (point-max))
 (insert xxx)
 (goto-char (point-min))
 ;;       ;; Compress whitespace
 ;;       (goto-char (point-max))
 ;;       (skip-chars-backward mail-whitespace)
 ;;       (cond ((memq (char-after (1- (point))) '(?\) ?\} ?\]))
 ;; 	     (setq comment-end (point))
 ;; 	     (set-syntax-table address-text-comment-syntax-table)
-;; 	     (or (safe-move-sexp -1)
+;; 	     (or (mail-safe-move-sexp -1)
 ;; 		 (backward-char 1))
 ;; 	     (set-syntax-table address-text-syntax-table)
 ;; 	     (setq comment-beg (point))
 ;; 	     (skip-chars-backward mail-whitespace)
 ;; 	     (if (bobp)
 	      (set-buffer canonicalization-buffer)
 	      (buffer-string)))
 )))
 ;; TODO: put this back in the above function now that it's proven:
-(defun variant-method (string)
+(defun mail-variant-method (string)
 (let ((variant-buffer (get-buffer-create "*variant method buffer*"))
 	(word-count 0)
 	mixed-case-flag lower-case-flag upper-case-flag
 	suffix-flag last-name-comma-flag
 	comment-beg comment-end initial beg end
 		   (if (eq ?\' (following-char))
 		       (forward-char 1))
 		   (or (search-forward "'" nil t)
 		       (delete-char 1)))
 		  (t
-		   (or (safe-move-sexp 1)
+		   (or (mail-safe-move-sexp 1)
 		       (goto-char (point-max)))))
 	    (set-syntax-table address-text-syntax-table)
 	    (setq comment-end (point))
 	    (cond
 	     ;; Handle case of entire name being quoted

Mercurial > emacs

comparison lisp/mail/mail-extr.el @ 1186:24f248525608