[elpa] externals/auctex 243961c 06/30: ; Silence the compiler

[Tassilo Horn]

branch: externals/auctex
commit 243961c71b0dc4b62a380eba4d3017d65cd122a7
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>

    ; Silence the compiler
    
    * style/dinbrief.el ("dinbrief"): Remove unnecessary `function'
    and ": " from query strings.
    (LaTeX-dinbrief-style, LaTeX-dinbrief-env-recipient): Check if
    `indent-relative-first-indent-point' is defined and use it,
    otherwise stick with `indent-relative-maybe' which is obsolete
    since 26.1.
    Minor indentation fixes.
    
    * style/letter.el ("letter"): Remove unnecessary ": " from query
    strings.
    (LaTeX-env-recipient): Check if
    `indent-relative-first-indent-point' is defined and use it,
    otherwise stick with `indent-relative-maybe' which is obsolete
    since 26.1.
---
 style/dinbrief.el | 144 ++++++++++++++++++++++++++++--------------------------
 style/letter.el   |  23 +++++----
 2 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/style/dinbrief.el b/style/dinbrief.el
index 4707654..6375afd 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,6 +1,6 @@
 ;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.
 
-;; Copyright (C) 1994, 2013, 2014, 2018, 2020  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2013, 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Werner Fink <werner@suse.de>
 ;; Maintainer: auctex-devel@gnu.org
@@ -33,36 +33,36 @@
 
 (require 'tex)
 
-(TeX-add-style-hook "dinbrief"
- (function
-  (lambda ()
-    (add-hook 'LaTeX-document-style-hook
-     'LaTeX-dinbrief-style)
-    (LaTeX-add-environments
-     '("letter" LaTeX-dinbrief-env-recipient)
-     "dinquote")
-    (TeX-add-symbols
-     '("address" "Absender: ")
-     '("postremark" "Postvermerk: ")
-     '("date" "Datum: ")
-     '("subject" "Betreff: ")
-     '("handling" "Behandlungsvermerk: ")
-     '("cc" "Verteiler: ")
-     '("place" "Heutiger Ort: ")
-     "makelabels"
-     "nowindowrules"
-     "windowrules"
-     "nowindowtics"
-     "windowtics"
-     "disabledraftstandard"
-     "enabledraftstandard"
-     "centeraddress"
-     "normaladdress"
-     '("encl" "Anlagen: ")
-     '("backaddress" "Retouradresse: ")
-     '("signature" "Unterschrift: ")
-     '("opening" "Anrede: ")
-     '("closing" "Schluss: "))))
+(TeX-add-style-hook
+ "dinbrief"
+ (lambda ()
+   (add-hook 'LaTeX-document-style-hook
+            'LaTeX-dinbrief-style)
+   (LaTeX-add-environments
+    '("letter" LaTeX-dinbrief-env-recipient)
+    "dinquote")
+   (TeX-add-symbols
+    '("address" "Absender")
+    '("postremark" "Postvermerk")
+    '("date" "Datum")
+    '("subject" "Betreff")
+    '("handling" "Behandlungsvermerk")
+    '("cc" "Verteiler")
+    '("place" "Heutiger Ort")
+    "makelabels"
+    "nowindowrules"
+    "windowrules"
+    "nowindowtics"
+    "windowtics"
+    "disabledraftstandard"
+    "enabledraftstandard"
+    "centeraddress"
+    "normaladdress"
+    '("encl" "Anlagen: ")
+    '("backaddress" "Retouradresse")
+    '("signature" "Unterschrift")
+    '("opening" "Anrede")
+    '("closing" "Schluss")))
  LaTeX-dialect)
 
 (defmacro LaTeX-dinbrief-insert (&rest args)
@@ -72,41 +72,45 @@
 
 (defun LaTeX-dinbrief-style ()
   "Insert some useful packages for writing german letters."
-  (save-excursion
-    (goto-char (point-min)) ; insert before \begin{document}
-    (if (re-search-forward ".begin.document." (point-max) t)
-        (beginning-of-line 1))
-    (open-line 2)
-    (indent-relative-maybe)
-    (LaTeX-dinbrief-insert TeX-esc "usepackage"
-                          LaTeX-optop "latin1,utf8" LaTeX-optcl
-                          TeX-grop "inputenc" TeX-grcl)
-    (newline-and-indent)
-    (LaTeX-dinbrief-insert TeX-esc "usepackage"
-                          LaTeX-optop "T1" LaTeX-optcl
-                          TeX-grop "fontenc" TeX-grcl)
-    (newline-and-indent)
-    (LaTeX-dinbrief-insert TeX-esc "usepackage"
-                          TeX-grop "ngerman" TeX-grcl)
+  (let ((func (if (fboundp 'indent-relative-first-indent-point)
+                 'indent-relative-first-indent-point
+               'indent-relative-maybe)))
+    (save-excursion
+      (goto-char (point-min)) ; insert before \begin{document}
+      (if (re-search-forward ".begin.document." (point-max) t)
+          (beginning-of-line 1))
+      (open-line 2)
+      (funcall func)
+      (LaTeX-dinbrief-insert TeX-esc "usepackage"
+                            LaTeX-optop "latin1,utf8" LaTeX-optcl
+                            TeX-grop "inputenc" TeX-grcl)
+      (newline-and-indent)
+      (LaTeX-dinbrief-insert TeX-esc "usepackage"
+                            LaTeX-optop "T1" LaTeX-optcl
+                            TeX-grop "fontenc" TeX-grcl)
+      (funcall func)
+      (LaTeX-dinbrief-insert TeX-esc "usepackage"
+                            TeX-grop "ngerman" TeX-grcl))
     (TeX-run-style-hooks "inputenc" "fontenc" "ngerman")))
 
 (defun LaTeX-dinbrief-env-recipient (environment)
   "Insert ENVIRONMENT and prompt for recipient and address."
-  (let (
-       (sender (LaTeX-dinbrief-sender))
+  (let ((sender (LaTeX-dinbrief-sender))
        (recipient (TeX-read-string "Empfänger: "))
        (address (LaTeX-dinbrief-recipient))
        (date (TeX-read-string "Datum: " (LaTeX-dinbrief-today)))
        (postremark (TeX-read-string "Postvermerk: "))
-       (fenster (TeX-read-string "Fenster \(ja/nein\): "))
+       (fenster (TeX-read-string "Fenster (ja/nein): "))
        (vermerk (TeX-read-string "Behandlungsvermerk: "))
        (verteil (TeX-read-string "Verteiler: "))
        (betreff (TeX-read-string "Betreff: "))
        (opening (TeX-read-string "Anrede: "))
        (closing (TeX-read-string "Schluss: "))
        (signature (TeX-read-string "Unterschrift: "))
-       (anlage (TeX-read-string "Anlagen: ")))
-
+       (anlage (TeX-read-string "Anlagen: "))
+       (func (if (fboundp 'indent-relative-first-indent-point)
+                 'indent-relative-first-indent-point
+               'indent-relative-maybe)))
     (if (string= fenster "ja")
        (progn
          (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard")
@@ -119,11 +123,11 @@
          (newline-and-indent)
          (let ((retouradr (TeX-read-string "Retouradresse: " sender)))
            (newline-and-indent)
-         (if (not (zerop (length retouradr)))
-             (progn
-               (if mark-active (deactivate-mark))
-               (LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr 
TeX-grcl)
-               (newline-and-indent)))))
+           (if (not (zerop (length retouradr)))
+               (progn
+                 (if mark-active (deactivate-mark))
+                 (LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop 
retouradr TeX-grcl)
+                 (newline-and-indent)))))
       (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard")
       (newline-and-indent)
       (LaTeX-dinbrief-insert TeX-esc "centeraddress")
@@ -131,7 +135,7 @@
       (LaTeX-dinbrief-insert TeX-esc "nowindowrules")
       (newline-and-indent)
       (LaTeX-dinbrief-insert TeX-esc "windowtics"))
-      (newline-and-indent)
+    (newline-and-indent)
     (if (not (zerop (length signature)))
        (progn
          (LaTeX-dinbrief-insert TeX-esc "signature" TeX-grop signature 
TeX-grcl)
@@ -187,21 +191,21 @@
          (LaTeX-dinbrief-insert TeX-esc "encl" TeX-grop anlage TeX-grcl)
          (newline-and-indent)))
     (LaTeX-dinbrief-insert TeX-esc "opening"
-           TeX-grop
-           (if (zerop (length opening))
-               (concat TeX-esc " ")
-             opening)
-           TeX-grcl "\n")
+                          TeX-grop
+                          (if (zerop (length opening))
+                              (concat TeX-esc " ")
+                            opening)
+                          TeX-grcl "\n")
 
-    (indent-relative-maybe)
+    (funcall func)
     (save-excursion
       (LaTeX-dinbrief-insert "\n" TeX-esc "closing"
-             TeX-grop
-             (if (zerop (length closing))
-                 (concat TeX-esc " ")
-               closing)
-             TeX-grcl "\n")
-      (indent-relative-maybe))))
+                            TeX-grop
+                            (if (zerop (length closing))
+                                (concat TeX-esc " ")
+                              closing)
+                            TeX-grcl "\n")
+      (funcall func))))
 
 (defun LaTeX-dinbrief-sender ()
   "Read and write the senders address."
diff --git a/style/letter.el b/style/letter.el
index 5757b06..e2cc8be 100644
--- a/style/letter.el
+++ b/style/letter.el
@@ -1,6 +1,6 @@
 ;;; letter.el - Special code for letter style.
 
-;; Copyright (C) 1993, 2012, 2013, 2014, 2018  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2012, 2013, 2014, 2018, 2020 Free Software Foundation, 
Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: auctex-devel@gnu.org
@@ -49,11 +49,11 @@
    (LaTeX-add-pagestyles "headings" "firstpage")
    (setq LaTeX-default-document-environment "letter")
    (TeX-add-symbols
-    '("name" "Sender: ")
-    '("address" "Sender address: ")
-    '("signature" "Signature: ")
-    '("opening" "Opening: ")
-    '("closing" "Closing: ")
+    '("name" "Sender")
+    '("address" "Sender address")
+    '("signature" "Signature")
+    '("opening" "Opening")
+    '("closing" "Closing")
     "location"
     "telephone"
     "makelabels"
@@ -92,13 +92,16 @@
   "Insert ENVIRONMENT and prompt for recipient and address."
   (let ((sender (TeX-read-string "Sender: " (user-full-name)))
        (sender-address (TeX-read-string "Sender address: "
-                                    LaTeX-letter-sender-address))
+                                        LaTeX-letter-sender-address))
        (recipient (TeX-read-string "Recipient: "))
        (address (TeX-read-string "Recipient address: "))
        (signature (TeX-read-string "Signature: "))
        (opening (TeX-read-string "Opening: "))
        (closing (TeX-read-string "Closing: "))
-       (date (TeX-read-string "Date: " (LaTeX-today))))
+       (date (TeX-read-string "Date: " (LaTeX-today)))
+       (func (if (fboundp 'indent-relative-first-indent-point)
+                 'indent-relative-first-indent-point
+               'indent-relative-maybe)))
 
     (insert TeX-esc "name" TeX-grop sender TeX-grcl)
     (newline-and-indent)
@@ -148,7 +151,7 @@
              opening)
            TeX-grcl "\n")
 
-    (indent-relative-maybe)
+    (funcall func)
     (save-excursion
       (insert "\n" TeX-esc "closing"
              TeX-grop
@@ -156,7 +159,7 @@
                  (concat TeX-esc " ")
                closing)
              TeX-grcl "\n")
-      (indent-relative-maybe))))
+      (funcall func))))
 
 (defun LaTeX-today nil
   "Return a string representing todays date according to flavor."