diff -r db5d7448744b -r f85ec5e68004 style/graphicx.el
--- a/style/graphicx.el	Sun Sep 03 19:56:34 2017 +0900
+++ b/style/graphicx.el	Sun Sep 03 22:04:37 2017 +0900
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;;  This package supports the includegraphcics macro in graphicx style.
+;;  This package supports the includegraphics macro in graphicx style.
 
 ;; Acknowledgements
 ;;  Dr. Thomas Baumann <address@hidden>
@@ -109,23 +109,22 @@
   "Return appropriate extensions for input files to \\includegraphics."
   (let* ((temp (copy-sequence LaTeX-includegraphics-extensions))
 	 (LaTeX-includegraphics-extensions
-	  (cond (;; 'default TeX-engine:
-		 (if (and (eq TeX-engine 'default)
-			  ;; we want to produce a pdf
-			  (if TeX-PDF-mode
-			      ;; Return t if default compiler produces PDF,
-			      ;; nil for "Dvips" or "Dvipdfmx"
-			      (not (TeX-PDF-from-DVI))
-			    ;; t if pdftex is used in dvi-mode
-			    TeX-DVI-via-PDFTeX))
+	  (cond ((eq TeX-engine 'default) ;; 'default TeX-engine:
+		 (if ;; we want to produce a pdf
+		     (if TeX-PDF-mode
+			 ;; Return t if default compiler produces PDF,
+			 ;; nil for "Dvips" or "Dvipdfmx"
+			 (not (TeX-PDF-from-DVI))
+		       ;; t if pdftex is used in dvi-mode
+		       TeX-DVI-via-PDFTeX)
 		     ;; We're using pdflatex in pdf-mode
 		     (delete-dups
 		      (append LaTeX-includegraphics-pdftex-extensions
-			      LaTeX-includegraphics-extensions))
+			      temp))
 		   ;; We're generating a .dvi to process with dvips or dvipdfmx
 		   (progn
 		     (dolist (x '("jpe?g" "pdf" "png"))
-		       (setq temp (remove x temp)))
+		       (setq temp (delete x temp)))
 		     (delete-dups
 		      (append LaTeX-includegraphics-dvips-extensions
 			      temp)))))
@@ -134,20 +133,20 @@
 		 (if TeX-PDF-mode
 		     (delete-dups
 		      (append LaTeX-includegraphics-pdftex-extensions
-			      LaTeX-includegraphics-extensions))
+			      temp))
 		   (progn
 		     (dolist (x '("jpe?g" "pdf" "png"))
-		       (setq temp (remove x temp)))
+		       (setq temp (delete x temp)))
 		     (delete-dups
 		      (append LaTeX-includegraphics-dvips-extensions
 			      temp)))))
 		;; Running xetex in any mode:
 		((eq TeX-engine 'xetex)
 		 (delete-dups (append LaTeX-includegraphics-xetex-extensions
-				      LaTeX-includegraphics-extensions)))
+				      temp)))
 		;; For anything else
 		(t
-		 LaTeX-includegraphics-extensions))))
+		 temp))))
     (concat "\\."
 	    (mapconcat 'identity
 		       (or list LaTeX-includegraphics-extensions)
@@ -175,7 +174,7 @@
   (file-relative-name
    (read-file-name
     "Image file: " nil nil nil nil
-    ;; FIXME: Emacs 21.3 and XEmacs 21.4.15 dont have PREDICATE as the sixth
+    ;; FIXME: Emacs 21.3 and XEmacs 21.4.15 don't have PREDICATE as the sixth
     ;; argument (Emacs 21.3: five args; XEmacs 21.4.15: sixth is HISTORY).
     (lambda (fname)
       (or (file-directory-p fname)