master 885448d: ; Revert parts of previous commit

[Stefan Kangas]

branch: master
commit 885448d1e66ba70faf3559e4028552fbb090aef5
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    ; Revert parts of previous commit
    
    * admin/unidata/unidata-gen.el (unidata-gen-table)
    (unidata-gen-table-symbol, unidata-gen-table-integer)
    (unidata-gen-table-numeric, unidata-gen-table-word-list)
    (unidata-describe-decomposition):
    * lisp/composite.el (unicode-category-table):
    * lisp/files.el (recover-file):
    * lisp/frame.el (frames-on-display-list, frame-background-mode):
    * lisp/language/indian.el (script-regexp-alist): Revert parts of
    previous commit; it seemed innocent but caused issues.
---
 admin/unidata/unidata-gen.el | 56 ++++++++++++++++++++++----------------------
 lisp/composite.el            |  6 ++---
 lisp/files.el                | 12 +++++-----
 lisp/frame.el                | 10 ++++----
 lisp/language/indian.el      | 12 +++++-----
 5 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index fc397a9..abd41e3 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -583,17 +583,17 @@ Property value is a symbol `o' (Open), `c' (Close), or 
`n' (None)."
                (aset vec (- range start) val-code))
            (setq tail (cdr tail)))
          (setq str "\002" val-code -1 count 0)
-          (mapc (lambda (x)
-                  (if (= val-code x)
-                      (setq count (1+ count))
-                    (if (> count 2)
-                        (setq str (concat str (string val-code
-                                                      (+ count 128))))
-                      (if (= count 2)
-                          (setq str (concat str (string val-code val-code)))
-                        (if (= count 1)
-                            (setq str (concat str (string val-code))))))
-                    (setq val-code x count 1)))
+         (mapc #'(lambda (x)
+                   (if (= val-code x)
+                       (setq count (1+ count))
+                     (if (> count 2)
+                         (setq str (concat str (string val-code
+                                                       (+ count 128))))
+                       (if (= count 2)
+                           (setq str (concat str (string val-code val-code)))
+                         (if (= count 1)
+                             (setq str (concat str (string val-code))))))
+                     (setq val-code x count 1)))
                vec)
          (if (= count 128)
              (if val
@@ -613,8 +613,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' 
(None)."
 
 (defun unidata-gen-table-symbol (prop index default-value val-list)
   (let ((table (unidata-gen-table prop index
-                                  (lambda (x) (and (> (length x) 0)
-                                              (intern x)))
+                                 #'(lambda (x) (and (> (length x) 0)
+                                                    (intern x)))
                                  default-value val-list)))
     (set-char-table-extra-slot table 1 0)
     (set-char-table-extra-slot table 2 1)
@@ -622,8 +622,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' 
(None)."
 
 (defun unidata-gen-table-integer (prop index default-value val-list)
   (let ((table (unidata-gen-table prop index
-                                  (lambda (x) (and (> (length x) 0)
-                                              (string-to-number x)))
+                                 #'(lambda (x) (and (> (length x) 0)
+                                                    (string-to-number x)))
                                  default-value val-list)))
     (set-char-table-extra-slot table 1 0)
     (set-char-table-extra-slot table 2 1)
@@ -631,13 +631,13 @@ Property value is a symbol `o' (Open), `c' (Close), or 
`n' (None)."
 
 (defun unidata-gen-table-numeric (prop index default-value val-list)
   (let ((table (unidata-gen-table prop index
-                                  (lambda (x)
-                                    (if (string-match "/" x)
-                                        (/ (float (string-to-number x))
-                                           (string-to-number
-                                            (substring x (match-end 0))))
-                                      (if (> (length x) 0)
-                                          (string-to-number x))))
+                                 #'(lambda (x)
+                                     (if (string-match "/" x)
+                                         (/ (float (string-to-number x))
+                                            (string-to-number
+                                             (substring x (match-end 0))))
+                                       (if (> (length x) 0)
+                                           (string-to-number x))))
                                  default-value val-list)))
     (set-char-table-extra-slot table 1 0)
     (set-char-table-extra-slot table 2 2)
@@ -1000,7 +1000,7 @@ Property value is a symbol `o' (Open), `c' (Close), or 
`n' (None)."
                       (cl-incf (alist-get elt (cdr word-list) 0)))))
              (set-char-table-range table (cons start limit) vec))))))
     (setq word-list (sort (cdr word-list)
-                          (lambda (x y) (> (cdr x) (cdr y)))))
+                         #'(lambda (x y) (> (cdr x) (cdr y)))))
     (setq tail word-list idx 0)
     (while tail
       (setcdr (car tail) (unidata-encode-word idx))
@@ -1266,11 +1266,11 @@ Property value is a symbol `o' (Open), `c' (Close), or 
`n' (None)."
 
 (defun unidata-describe-decomposition (val)
   (mapconcat
-   (lambda (x)
-     (if (symbolp x) (symbol-name x)
-       (concat (string ?')
-               (compose-string (string x) 0 1 (string ?\t x ?\t))
-               (string ?'))))
+   #'(lambda (x)
+       (if (symbolp x) (symbol-name x)
+        (concat (string ?')
+                (compose-string (string x) 0 1 (string ?\t x ?\t))
+                (string ?'))))
    val " "))
 
 (defun unidata-describe-bidi-bracket-type (val)
diff --git a/lisp/composite.el b/lisp/composite.el
index b5072de..c2289e8 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -739,9 +739,9 @@ All non-spacing characters have this function in
   (let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic]
               [nil 0 compose-gstring-for-graphic])))
     (map-char-table
-     (lambda (key val)
-       (if (memq val '(Mn Mc Me))
-           (set-char-table-range composition-function-table key elt)))
+     #'(lambda (key val)
+        (if (memq val '(Mn Mc Me))
+            (set-char-table-range composition-function-table key elt)))
      unicode-category-table))
   ;; for dotted-circle
   (aset composition-function-table #x25CC
diff --git a/lisp/files.el b/lisp/files.el
index d498e5b..99bff29 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6682,12 +6682,12 @@ auto-save file, if that is more recent than the visited 
file."
                        (abbreviate-file-name file-name)))
          ((with-temp-buffer-window
            "*Directory*" nil
-            (lambda (window _value)
-              (with-selected-window window
-                (unwind-protect
-                    (yes-or-no-p (format "Recover auto save file %s? " 
file-name))
-                  (when (window-live-p window)
-                    (quit-restore-window window 'kill)))))
+           #'(lambda (window _value)
+               (with-selected-window window
+                 (unwind-protect
+                     (yes-or-no-p (format "Recover auto save file %s? " 
file-name))
+                   (when (window-live-p window)
+                     (quit-restore-window window 'kill)))))
            (with-current-buffer standard-output
              (let ((switches dired-listing-switches))
                (if (file-symlink-p file)
diff --git a/lisp/frame.el b/lisp/frame.el
index dfbd751..2c73737 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -987,8 +987,8 @@ HOST:SERVER.SCREEN).
 If DEVICE is omitted or nil, it defaults to the selected
 frame's terminal device."
   (let* ((terminal (get-device-terminal device))
-         (func (lambda (frame)
-                 (eq (frame-terminal frame) terminal))))
+        (func #'(lambda (frame)
+                  (eq (frame-terminal frame) terminal))))
     (filtered-frame-list func)))
 
 (defun framep-on-display (&optional terminal)
@@ -1165,9 +1165,9 @@ If you change this without using customize, you should use
 `frame-set-background-mode' to update existing frames;
 e.g. (mapc \\='frame-set-background-mode (frame-list))."
   :group 'faces
-  :set (lambda (var value)
-         (set-default var value)
-         (mapc #'frame-set-background-mode (frame-list)))
+  :set #'(lambda (var value)
+          (set-default var value)
+          (mapc #'frame-set-background-mode (frame-list)))
   :initialize #'custom-initialize-changed
   :type '(choice (const dark)
                 (const light)
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d373c82..6f9d270 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -376,12 +376,12 @@ South Indian language Malayalam is supported in this 
language environment."))
         (kannada . ,kannada-composable-pattern)
         (malayalam . ,malayalam-composable-pattern))))
   (map-char-table
-   (lambda (key val)
-     (let ((slot (assq val script-regexp-alist)))
-       (if slot
-           (set-char-table-range
-            composition-function-table key
-            (list (vector (cdr slot) 0 #'font-shape-gstring))))))
+   #'(lambda (key val)
+       (let ((slot (assq val script-regexp-alist)))
+        (if slot
+            (set-char-table-range
+             composition-function-table key
+             (list (vector (cdr slot) 0 #'font-shape-gstring))))))
    char-script-table))
 
 (provide 'indian)