master 33bb54bb 2/5: Simplify implementation of style/geometry.el

[Arash Esbati]

branch: master
commit 33bb54bb9e55eb443ca2866b7ff7d8663ba0f740
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>

    Simplify implementation of style/geometry.el
    
    * style/geometry.el ("geometry"): Replace `TeX-arg-eval'.
---
 style/geometry.el | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/style/geometry.el b/style/geometry.el
index cc93d840..f1cab730 100644
--- a/style/geometry.el
+++ b/style/geometry.el
@@ -1,6 +1,6 @@
 ;;; geometry.el --- AUCTeX style for `geometry.sty' (v5.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2022 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
@@ -113,27 +113,24 @@ package.")
 
    ;; geometry commands:
    (TeX-add-symbols
-    '("geometry"
-      (TeX-arg-eval TeX-read-key-val nil
-                    (append LaTeX-geometry-preamble-key-val-options
-                            LaTeX-geometry-always-key-val-options)))
+    `("geometry"
+      (TeX-arg-key-val ,(append LaTeX-geometry-preamble-key-val-options
+                                LaTeX-geometry-always-key-val-options)))
     '("newgeometry"
       (TeX-arg-key-val LaTeX-geometry-always-key-val-options))
 
     '("restoregeometry" 0)
 
-    '("savegeometry"
-      (TeX-arg-eval
-       (lambda ()
-         (let ((name (TeX-read-string "Name: ")))
+    `("savegeometry"
+      ,(lambda (optional)
+         (let ((name (TeX-read-string
+                      (TeX-argument-prompt optional nil "Name"))))
            (LaTeX-add-geometry-savegeometries name)
-           (format "%s" name)))))
+           (TeX-argument-insert name optional))))
 
     '("loadgeometry"
-      (TeX-arg-eval
-       (lambda ()
-         (completing-read "Name: "
-                          (LaTeX-geometry-savegeometry-list))))))
+      (TeX-arg-completing-read (LaTeX-geometry-savegeometry-list)
+                               "Name")))
 
    ;; Fontification
    (when (and (featurep 'font-latex)