Use new backquote syntax.

lisp/ChangeLog

+1999-11-15  Sam Steingold  <sds@ksp.com>
+
+	* mail/rnews.el, mail/mh-utils.el: Use the new backquote syntax.
+	
 1999-11-15  Dave Love  <fx@gnu.org>
 
 	* cus-edit.el (customize-face, customize-face-other-window):
@@ -7,8 +11,8 @@
 
 1999-11-15  Gerd Moellmann  <gerd@gnu.org>
 
-	* iswitchb.el, hippie-exp.el, progmodes/cperl-mode.el: Use new
-	backquote syntax.
+	* mail/rmail.el, iswitchb.el, hippie-exp.el,
+	progmodes/cperl-mode.el: Use new backquote syntax.
 
 1998-09-14  Michael Ernst  <mernst@alum.mit.edu>
 

lisp/iswitchb.el

@@ -208,7 +208,7 @@
     (defmacro defgroup (&rest args)
       nil)
     (defmacro defcustom (var value doc &rest args) 
-      (` (defvar (, var) (, value) (, doc))))))
+      `(defvar ,var ,value ,doc))))
 
 ;;; User Variables
 ;;

lisp/mail/mh-utils.el

@@ -217,16 +217,16 @@ also show it in a separate Show window."
   ;; If SAVE-MODIFICATION-FLAG-P is non-nil, the buffer's modification
   ;; flag is unchanged, otherwise it is cleared.
   (setq save-modification-flag-p (car save-modification-flag-p)) ; CL style
-  (` (prog1
-	 (let ((mh-folder-updating-mod-flag (buffer-modified-p))
-	       (buffer-read-only nil)
-	       (buffer-file-name nil))	;don't let the buffer get locked
-	   (prog1
-	       (progn
-		 (,@ body))
-	     (mh-set-folder-modified-p mh-folder-updating-mod-flag)))
-       (,@ (if (not save-modification-flag-p)
-	       '((mh-set-folder-modified-p nil)))))))
+  `(prog1
+       (let ((mh-folder-updating-mod-flag (buffer-modified-p))
+	     (buffer-read-only nil)
+	     (buffer-file-name nil))	;don't let the buffer get locked
+	 (prog1
+	     (progn
+	       ,@body)
+	   (mh-set-folder-modified-p mh-folder-updating-mod-flag)))
+     ,@(if (not save-modification-flag-p)
+	   '((mh-set-folder-modified-p nil)))))
 
 (put 'with-mh-folder-updating 'lisp-indent-hook 1)
 
@@ -235,13 +235,13 @@ also show it in a separate Show window."
   ;; Display buffer SHOW-BUFFER in other window and execute BODY in it.
   ;; Stronger than save-excursion, weaker than save-window-excursion.
   (setq show-buffer (car show-buffer))	; CL style
-  (` (let ((mh-in-show-buffer-saved-window (selected-window)))
-       (switch-to-buffer-other-window (, show-buffer))
-       (if mh-bury-show-buffer (bury-buffer (current-buffer)))
-       (unwind-protect
-	   (progn
-	     (,@ body))
-	 (select-window mh-in-show-buffer-saved-window)))))
+  `(let ((mh-in-show-buffer-saved-window (selected-window)))
+     (switch-to-buffer-other-window ,show-buffer)
+     (if mh-bury-show-buffer (bury-buffer (current-buffer)))
+     (unwind-protect
+	 (progn
+           ,@body)
+       (select-window mh-in-show-buffer-saved-window))))
 
 (put 'mh-in-show-buffer 'lisp-indent-hook 1)
 

lisp/mail/rmail.el

@@ -465,25 +465,25 @@ The first parenthesized expression should match the MIME-charset name.")
 ;; Perform BODY in the summary buffer
 ;; in such a way that its cursor is properly updated in its own window.
 (defmacro rmail-select-summary (&rest body)
-  (` (let ((total rmail-total-messages))
-       (if (rmail-summary-displayed)
-	   (let ((window (selected-window)))
-	     (save-excursion
-	       (unwind-protect
-		   (progn
-		     (pop-to-buffer rmail-summary-buffer)
-		     ;; rmail-total-messages is a buffer-local var
-		     ;; in the rmail buffer.
-		     ;; This way we make it available for the body
-		     ;; even tho the rmail buffer is not current.
-		     (let ((rmail-total-messages total))
-		       (,@ body)))
-		 (select-window window))))
-	 (save-excursion
-	   (set-buffer rmail-summary-buffer)
-	   (let ((rmail-total-messages total))
-	     (,@ body))))
-       (rmail-maybe-display-summary))))
+  `(let ((total rmail-total-messages))
+     (if (rmail-summary-displayed)
+	 (let ((window (selected-window)))
+	   (save-excursion
+	     (unwind-protect
+		 (progn
+		   (pop-to-buffer rmail-summary-buffer)
+		   ;; rmail-total-messages is a buffer-local var
+		   ;; in the rmail buffer.
+		   ;; This way we make it available for the body
+		   ;; even tho the rmail buffer is not current.
+		   (let ((rmail-total-messages total))
+		     ,@body))
+	       (select-window window))))
+       (save-excursion
+	 (set-buffer rmail-summary-buffer)
+	 (let ((rmail-total-messages total))
+	   ,@body)))
+     (rmail-maybe-display-summary)))
 
 ;;;; *** Rmail Mode ***
 

lisp/mail/rnews.el

@@ -151,7 +151,7 @@ Not currently used.")
 (defmacro news-cdadr (x) (list 'cdr (list 'car (list 'cdr x))))
 
 (defmacro news-wins (pfx index)
-  (` (file-exists-p (concat (, pfx) "/" (int-to-string (, index))))))
+  `(file-exists-p (concat ,pfx "/" (int-to-string ,index))))
 
 (defvar news-max-plausible-gap 2
 	"* In an rnews directory, the maximum possible gap size.
@@ -166,10 +166,10 @@ An empty file does not contribute to a gap -- it ends one.")
 (defmacro news-/ (a1 a2)
 ;; a form of / that guarantees that (/ -1 2) = 0
   (if (zerop (/ -1 2))
-      (` (/ (, a1) (, a2)))
-    (` (if (< (, a1) 0)
-	   (- (/ (- (, a1)) (, a2)))
-	 (/ (, a1) (, a2))))))
+      `(/ ,a1 ,a2)
+    `(if (< ,a1 0)
+	 (- (/ (- ,a1) ,a2))
+       (/ ,a1 ,a2))))
 
 (defun news-find-first-or-last (pfx base dirn)
   ;; first use powers of two to find a plausible ceiling

lisp/progmodes/cperl-mode.el

@@ -64,48 +64,48 @@
 
 ;; Some macros are needed for `defcustom'
 (if (fboundp 'eval-when-compile)
-   (eval-when-compile
+    (eval-when-compile
       (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
       (defmacro cperl-is-face (arg)	; Takes quoted arg
-	    (cond ((fboundp 'find-face)
-		   (` (find-face (, arg))))
-		  (;;(and (fboundp 'face-list)
-		   ;;	(face-list))
-		   (fboundp 'face-list)
-		   (` (member (, arg) (and (fboundp 'face-list)
-					   (face-list)))))
-		  (t
-		   (` (boundp (, arg))))))
+	(cond ((fboundp 'find-face)
+	       `(find-face ,arg))
+	      (;;(and (fboundp 'face-list)
+	       ;;	(face-list))
+	       (fboundp 'face-list)
+	       `(member ,arg (and (fboundp 'face-list)
+				  (face-list))))
+	      (t
+	       `(boundp ,arg))))
       (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
 	(cond ((fboundp 'make-face)
-	       (` (make-face (quote (, arg)))))
+	       `(make-face (quote ,arg)))
 	      (t
-	       (` (defconst (, arg) (quote (, arg)) (, descr))))))
+	       `(defconst ,arg (quote ,arg) ,descr))))
       (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
-	(` (progn
-	     (or (cperl-is-face (quote (, arg)))
-		 (cperl-make-face (, arg) (, descr)))
-	     (or (boundp (quote (, arg))) ; We use unquoted variants too
-		 (defconst (, arg) (quote (, arg)) (, descr))))))
+	`(progn
+	   (or (cperl-is-face (quote ,arg))
+	       (cperl-make-face ,arg ,descr))
+	   (or (boundp (quote ,arg))	; We use unquoted variants too
+	       (defconst ,arg (quote ,arg) ,descr))))
       (if cperl-xemacs-p
 	  (defmacro cperl-etags-snarf-tag (file line)
-	    (` (progn
-		 (beginning-of-line 2)
-		 (list (, file) (, line)))))
+	    `(progn
+	       (beginning-of-line 2)
+	       (list ,file ,line)))
 	(defmacro cperl-etags-snarf-tag (file line)
-	  (` (etags-snarf-tag))))
+	  `(etags-snarf-tag)))
       (if cperl-xemacs-p
 	  (defmacro cperl-etags-goto-tag-location (elt)
-	    (` ;;(progn
-		 ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
-		 ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
-		 ;; Probably will not work due to some save-excursion???
-		 ;; Or save-file-position?
-		 ;; (message "Did I get to line %s?" (elt (, elt) 1))
-		 (goto-line (string-to-int (elt (, elt) 1)))))
-	    ;;)
+	    ;;(progn
+	    ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
+	    ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
+	    ;; Probably will not work due to some save-excursion???
+	    ;; Or save-file-position?
+	    ;; (message "Did I get to line %s?" (elt (, elt) 1))
+	    `(goto-line (string-to-int (elt ,elt 1))))
+	;;)
 	(defmacro cperl-etags-goto-tag-location (elt)
-	  (` (etags-goto-tag-location (, elt)))))))
+	  `(etags-goto-tag-location ,elt)))))
 
 (defun cperl-choose-color (&rest list)
   (let (answer)
@@ -518,41 +518,41 @@ when syntaxifying a chunk of buffer."
 	(cperl-choose-color "orchid1" "orange"))
 
       (defface cperl-nonoverridable-face
-	(` ((((class grayscale) (background light))
-	     (:background "Gray90" :italic t :underline t))
-	    (((class grayscale) (background dark))
-	     (:foreground "Gray80" :italic t :underline t :bold t))
-	    (((class color) (background light)) 
-	     (:foreground "chartreuse3"))
-	    (((class color) (background dark)) 
-	     (:foreground (, cperl-dark-foreground)))
-	    (t (:bold t :underline t))))
+	`((((class grayscale) (background light))
+	   (:background "Gray90" :italic t :underline t))
+	  (((class grayscale) (background dark))
+	   (:foreground "Gray80" :italic t :underline t :bold t))
+	  (((class color) (background light)) 
+	   (:foreground "chartreuse3"))
+	  (((class color) (background dark)) 
+	   (:foreground ,cperl-dark-foreground))
+	  (t (:bold t :underline t)))
 	"Font Lock mode face used to highlight array names."
 	:group 'cperl-faces)
 
       (defface cperl-array-face
-	(` ((((class grayscale) (background light))
-	     (:background "Gray90" :bold t))
-	    (((class grayscale) (background dark))
-	     (:foreground "Gray80" :bold t))
-	    (((class color) (background light)) 
-	     (:foreground "Blue" :background "lightyellow2" :bold t))
-	    (((class color) (background dark)) 
-	     (:foreground "yellow" :background (, cperl-dark-background) :bold t))
-	    (t (:bold t))))
+	`((((class grayscale) (background light))
+	   (:background "Gray90" :bold t))
+	  (((class grayscale) (background dark))
+	   (:foreground "Gray80" :bold t))
+	  (((class color) (background light)) 
+	   (:foreground "Blue" :background "lightyellow2" :bold t))
+	  (((class color) (background dark)) 
+	   (:foreground "yellow" :background ,cperl-dark-background :bold t))
+	  (t (:bold t)))
 	"Font Lock mode face used to highlight array names."
 	:group 'cperl-faces)
 
       (defface cperl-hash-face
-	(` ((((class grayscale) (background light))
-	     (:background "Gray90" :bold t :italic t))
-	    (((class grayscale) (background dark))
-	     (:foreground "Gray80" :bold t :italic t))
-	    (((class color) (background light)) 
-	     (:foreground "Red" :background "lightyellow2" :bold t :italic t))
-	    (((class color) (background dark)) 
-	     (:foreground "Red" :background (, cperl-dark-background) :bold t :italic t))
-	    (t (:bold t :italic t))))
+	`((((class grayscale) (background light))
+	   (:background "Gray90" :bold t :italic t))
+	  (((class grayscale) (background dark))
+	   (:foreground "Gray80" :bold t :italic t))
+	  (((class color) (background light)) 
+	   (:foreground "Red" :background "lightyellow2" :bold t :italic t))
+	  (((class color) (background dark)) 
+	   (:foreground "Red" :background ,cperl-dark-background :bold t :italic t))
+	  (t (:bold t :italic t)))
 	"Font Lock mode face used to highlight hash names."
 	:group 'cperl-faces)))
 
@@ -883,11 +883,11 @@ the faces: please specify bold, italic, underline, shadow and box.)
 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
 
 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key)
-  (` (define-key cperl-mode-map
-       (, (if xemacs-key
-	      (` (if cperl-xemacs-p (, xemacs-key) (, emacs-key)))
-	    emacs-key))
-       (, definition))))
+  `(define-key cperl-mode-map
+     ,(if xemacs-key
+	  `(if cperl-xemacs-p ,xemacs-key ,emacs-key)
+	emacs-key)
+     ,definition))
 
 (defvar cperl-del-back-ch
   (car (append (where-is-internal 'delete-backward-char)
@@ -986,9 +986,9 @@ the faces: please specify bold, italic, underline, shadow and box.)
 	(error nil))
       (if (fboundp 'ps-extend-face-list)
 	  (defmacro cperl-ps-extend-face-list (arg)
-	    (` (ps-extend-face-list (, arg))))
+	    `(ps-extend-face-list ,arg))
 	(defmacro cperl-ps-extend-face-list (arg)
-	  (` (error "This version of Emacs has no `ps-extend-face-list'."))))
+	  `(error "This version of Emacs has no `ps-extend-face-list'.")))
       ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs,
       ;; macros instead of defsubsts don't work on Emacs, so we do the
       ;; expansion manually.  Any other suggestions?