[AUCTeX-diffs] GNU AUCTeX branch, master, updated. cfad977c8747bc72c38533470d00dfa99a0238e0

[Ikumi Keita]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  cfad977c8747bc72c38533470d00dfa99a0238e0 (commit)
      from  cf0ff7040f1f93556c0c91d7091ba4a057edbb02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cfad977c8747bc72c38533470d00dfa99a0238e0
Author: Ikumi Keita <address@hidden>
Date:   Fri Sep 15 15:15:44 2017 +0900

    Make correct extensions are returned
    
    * style/graphicx.el (LaTeX-includegraphics-extensions):
    Fix misaligned form structure which prevented `cond' to enter clauses
    for engines other than default.
    Use copied list for the last argument of `append' so that
    `delete-dups' does not alter the value of
    `LaTeX-includegraphics-extensions'.
    Use `delete' rather than `remove' for copied sequence.
    ():
    (LaTeX-includegraphics-read-file-relative):
    Fix typos.

diff --git a/style/graphicx.el b/style/graphicx.el
index 4fcdc17..6ba58e4 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -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>
@@ -110,22 +110,22 @@ key-val's."
   (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))
+                (eq TeX-engine 'default)
+                (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 +134,20 @@ key-val's."
                 (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 +175,7 @@ doesn't works with Emacs 21.3 or XEmacs.  See
   (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)

-----------------------------------------------------------------------

Summary of changes:
 style/graphicx.el | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX