* lisp/emacs-lisp/cconv.el: New file.

* lisp/emacs-lisp/bytecomp.el: Use cconv.
(byte-compile-file-form, byte-compile):
Call cconv-closure-convert-toplevel when requested.
* lisp/server.el:
* lisp/mpc.el:
* lisp/emacs-lisp/pcase.el:
* lisp/doc-view.el:
* lisp/dired.el: Use lexical-binding.

1 files changed, 168 insertions, 176 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 62c59b41cee..1ee30f5bc3c 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,3 +1,4 @@
+;;; -*- lexical-binding: t -*-
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
 ;; Copyright (C) 1986-1987, 1992, 1994-2011  Free Software Foundation, Inc.
@@ -335,9 +336,9 @@ If CLIENT is non-nil, add a description of it to the logged message."
       (goto-char (point-max))
       (insert (funcall server-log-time-function)
               (cond
-                ((null client) " ")
-                ((listp client) (format " %s: " (car client)))
-                (t (format " %s: " client)))
+               ((null client) " ")
+               ((listp client) (format " %s: " (car client)))
+               (t (format " %s: " client)))
               string)
       (or (bolp) (newline)))))
 
@@ -355,7 +356,7 @@ If CLIENT is non-nil, add a description of it to the logged message."
   (and (process-contact proc :server)
        (eq (process-status proc) 'closed)
        (ignore-errors
-        (delete-file (process-get proc :server-file))))
+         (delete-file (process-get proc :server-file))))
   (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc)
   (server-delete-client proc))
 
@@ -410,10 +411,10 @@ If CLIENT is non-nil, add a description of it to the logged message."
                proc
                ;; See if this is the last frame for this client.
                (>= 1 (let ((frame-num 0))
-                      (dolist (f (frame-list))
-                        (when (eq proc (frame-parameter f 'client))
-                          (setq frame-num (1+ frame-num))))
-                      frame-num)))
+                       (dolist (f (frame-list))
+                         (when (eq proc (frame-parameter f 'client))
+                           (setq frame-num (1+ frame-num))))
+                       frame-num)))
       (server-log (format "server-handle-delete-frame, frame %s" frame) proc)
       (server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later.
 
@@ -534,8 +535,8 @@ To force-start a server, do \\[server-force-delete] and then
       (if (not (eq t (server-running-p server-name)))
           ;; Remove any leftover socket or authentication file
           (ignore-errors
-           (let (delete-by-moving-to-trash)
-             (delete-file server-file)))
+            (let (delete-by-moving-to-trash)
+              (delete-file server-file)))
         (setq server-mode nil) ;; already set by the minor mode code
         (display-warning
          'server
@@ -590,11 +591,11 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
           (when server-use-tcp
             (let ((auth-key
                    (loop
-                      ;; The auth key is a 64-byte string of random chars in the
-                      ;; range `!'..`~'.
-                      repeat 64
-                      collect (+ 33 (random 94)) into auth
-                      finally return (concat auth))))
+                    ;; The auth key is a 64-byte string of random chars in the
+                    ;; range `!'..`~'.
+                    repeat 64
+                    collect (+ 33 (random 94)) into auth
+                    finally return (concat auth))))
               (process-put server-process :auth-key auth-key)
               (with-temp-file server-file
                 (set-buffer-multibyte nil)
@@ -689,31 +690,31 @@ Server mode runs a process that accepts commands from the
   (add-to-list 'frame-inherited-parameters 'client)
   (let ((frame
          (server-with-environment (process-get proc 'env)
-             '("LANG" "LC_CTYPE" "LC_ALL"
-               ;; For tgetent(3); list according to ncurses(3).
-               "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
-               "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
-               "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
-               "TERMINFO_DIRS" "TERMPATH"
-               ;; rxvt wants these
-               "COLORFGBG" "COLORTERM")
-             (make-frame `((window-system . nil)
-                           (tty . ,tty)
-                           (tty-type . ,type)
-                           ;; Ignore nowait here; we always need to
-                           ;; clean up opened ttys when the client dies.
-                           (client . ,proc)
-                           ;; This is a leftover from an earlier
-                           ;; attempt at making it possible for process
-                           ;; run in the server process to use the
-                           ;; environment of the client process.
-                           ;; It has no effect now and to make it work
-                           ;; we'd need to decide how to make
-                           ;; process-environment interact with client
-                           ;; envvars, and then to change the
-                           ;; C functions `child_setup' and
-                           ;; `getenv_internal' accordingly.
-                           (environment . ,(process-get proc 'env)))))))
+                                  '("LANG" "LC_CTYPE" "LC_ALL"
+                                    ;; For tgetent(3); list according to ncurses(3).
+                                    "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
+                                    "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
+                                    "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
+                                    "TERMINFO_DIRS" "TERMPATH"
+                                    ;; rxvt wants these
+                                    "COLORFGBG" "COLORTERM")
+                                  (make-frame `((window-system . nil)
+                                                (tty . ,tty)
+                                                (tty-type . ,type)
+                                                ;; Ignore nowait here; we always need to
+                                                ;; clean up opened ttys when the client dies.
+                                                (client . ,proc)
+                                                ;; This is a leftover from an earlier
+                                                ;; attempt at making it possible for process
+                                                ;; run in the server process to use the
+                                                ;; environment of the client process.
+                                                ;; It has no effect now and to make it work
+                                                ;; we'd need to decide how to make
+                                                ;; process-environment interact with client
+                                                ;; envvars, and then to change the
+                                                ;; C functions `child_setup' and
+                                                ;; `getenv_internal' accordingly.
+                                                (environment . ,(process-get proc 'env)))))))
 
     ;; ttys don't use the `display' parameter, but callproc.c does to set
     ;; the DISPLAY environment on subprocesses.
@@ -777,8 +778,7 @@ Server mode runs a process that accepts commands from the
     ;; frame because input from that display will be blocked (until exiting
     ;; the minibuffer).  Better exit this minibuffer right away.
     ;; Similarly with recursive-edits such as the splash screen.
-    (run-with-timer 0 nil (lexical-let ((proc proc))
-                            (lambda () (server-execute-continuation proc))))
+    (run-with-timer 0 nil (lambda () (server-execute-continuation proc)))
     (top-level)))
 
 ;; We use various special properties on process objects:
@@ -944,119 +944,119 @@ The following commands are accepted by the client:
             (setq command-line-args-left
                   (mapcar 'server-unquote-arg (split-string request " " t)))
             (while (setq arg (pop command-line-args-left))
-                (cond
-                 ;; -version CLIENT-VERSION: obsolete at birth.
-                 ((and (equal "-version" arg) command-line-args-left)
-                  (pop command-line-args-left))
-
-                 ;; -nowait:  Emacsclient won't wait for a result.
-                 ((equal "-nowait" arg) (setq nowait t))
-
-                 ;; -current-frame:  Don't create frames.
-                 ((equal "-current-frame" arg) (setq use-current-frame t))
-
-                 ;; -display DISPLAY:
-                 ;; Open X frames on the given display instead of the default.
-                 ((and (equal "-display" arg) command-line-args-left)
-                  (setq display (pop command-line-args-left))
-                  (if (zerop (length display)) (setq display nil)))
-
-                 ;; -parent-id ID:
-                 ;; Open X frame within window ID, via XEmbed.
-                 ((and (equal "-parent-id" arg) command-line-args-left)
-                  (setq parent-id (pop command-line-args-left))
-                  (if (zerop (length parent-id)) (setq parent-id nil)))
-
-                 ;; -window-system:  Open a new X frame.
-                 ((equal "-window-system" arg)
-                  (setq dontkill t)
-                  (setq tty-name 'window-system))
-
-                 ;; -resume:  Resume a suspended tty frame.
-                 ((equal "-resume" arg)
-                  (lexical-let ((terminal (process-get proc 'terminal)))
-                    (setq dontkill t)
-                    (push (lambda ()
-                            (when (eq (terminal-live-p terminal) t)
-                              (resume-tty terminal)))
-                          commands)))
-
-                 ;; -suspend:  Suspend the client's frame.  (In case we
-                 ;; get out of sync, and a C-z sends a SIGTSTP to
-                 ;; emacsclient.)
-                 ((equal "-suspend" arg)
-                  (lexical-let ((terminal (process-get proc 'terminal)))
-                    (setq dontkill t)
-                    (push (lambda ()
-                            (when (eq (terminal-live-p terminal) t)
-                              (suspend-tty terminal)))
-                          commands)))
-
-                 ;; -ignore COMMENT:  Noop; useful for debugging emacsclient.
-                 ;; (The given comment appears in the server log.)
-                 ((and (equal "-ignore" arg) command-line-args-left
+              (cond
+               ;; -version CLIENT-VERSION: obsolete at birth.
+               ((and (equal "-version" arg) command-line-args-left)
+                (pop command-line-args-left))
+
+               ;; -nowait:  Emacsclient won't wait for a result.
+               ((equal "-nowait" arg) (setq nowait t))
+
+               ;; -current-frame:  Don't create frames.
+               ((equal "-current-frame" arg) (setq use-current-frame t))
+
+               ;; -display DISPLAY:
+               ;; Open X frames on the given display instead of the default.
+               ((and (equal "-display" arg) command-line-args-left)
+                (setq display (pop command-line-args-left))
+                (if (zerop (length display)) (setq display nil)))
+
+               ;; -parent-id ID:
+               ;; Open X frame within window ID, via XEmbed.
+               ((and (equal "-parent-id" arg) command-line-args-left)
+                (setq parent-id (pop command-line-args-left))
+                (if (zerop (length parent-id)) (setq parent-id nil)))
+
+               ;; -window-system:  Open a new X frame.
+               ((equal "-window-system" arg)
+                (setq dontkill t)
+                (setq tty-name 'window-system))
+
+               ;; -resume:  Resume a suspended tty frame.
+               ((equal "-resume" arg)
+                (let ((terminal (process-get proc 'terminal)))
+                  (setq dontkill t)
+                  (push (lambda ()
+                          (when (eq (terminal-live-p terminal) t)
+                            (resume-tty terminal)))
+                        commands)))
+
+               ;; -suspend:  Suspend the client's frame.  (In case we
+               ;; get out of sync, and a C-z sends a SIGTSTP to
+               ;; emacsclient.)
+               ((equal "-suspend" arg)
+                (let ((terminal (process-get proc 'terminal)))
                   (setq dontkill t)
-                  (pop command-line-args-left)))
-
-                 ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
-                 ((and (equal "-tty" arg)
-                       (cdr command-line-args-left))
-                  (setq tty-name (pop command-line-args-left)
-                        tty-type (pop command-line-args-left)
-                        dontkill (or dontkill
-                                     (not use-current-frame))))
-
-                 ;; -position LINE[:COLUMN]:  Set point to the given
-                 ;;  position in the next file.
-                 ((and (equal "-position" arg)
-                       command-line-args-left
-                       (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
-                                     (car command-line-args-left)))
-                  (setq arg (pop command-line-args-left))
-                  (setq filepos
-                        (cons (string-to-number (match-string 1 arg))
-                              (string-to-number (or (match-string 2 arg) "")))))
-
-                 ;; -file FILENAME:  Load the given file.
-                 ((and (equal "-file" arg)
-                       command-line-args-left)
-                  (let ((file (pop command-line-args-left)))
-                    (if coding-system
-                        (setq file (decode-coding-string file coding-system)))
-                    (setq file (expand-file-name file dir))
-                    (push (cons file filepos) files)
-                    (server-log (format "New file: %s %s"
-                                        file (or filepos "")) proc))
-                  (setq filepos nil))
-
-                 ;; -eval EXPR:  Evaluate a Lisp expression.
-                 ((and (equal "-eval" arg)
-                       command-line-args-left)
-                  (if use-current-frame
-                      (setq use-current-frame 'always))
-                  (lexical-let ((expr (pop command-line-args-left)))
-                    (if coding-system
-                        (setq expr (decode-coding-string expr coding-system)))
-                    (push (lambda () (server-eval-and-print expr proc))
-                          commands)
-                    (setq filepos nil)))
-
-                 ;; -env NAME=VALUE:  An environment variable.
-                 ((and (equal "-env" arg) command-line-args-left)
-                  (let ((var (pop command-line-args-left)))
-                    ;; XXX Variables should be encoded as in getenv/setenv.
-                    (process-put proc 'env
-                                 (cons var (process-get proc 'env)))))
-
-                 ;; -dir DIRNAME:  The cwd of the emacsclient process.
-                 ((and (equal "-dir" arg) command-line-args-left)
-                  (setq dir (pop command-line-args-left))
+                  (push (lambda ()
+                          (when (eq (terminal-live-p terminal) t)
+                            (suspend-tty terminal)))
+                        commands)))
+
+               ;; -ignore COMMENT:  Noop; useful for debugging emacsclient.
+               ;; (The given comment appears in the server log.)
+               ((and (equal "-ignore" arg) command-line-args-left
+                     (setq dontkill t)
+                     (pop command-line-args-left)))
+
+               ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
+               ((and (equal "-tty" arg)
+                     (cdr command-line-args-left))
+                (setq tty-name (pop command-line-args-left)
+                      tty-type (pop command-line-args-left)
+                      dontkill (or dontkill
+                                   (not use-current-frame))))
+
+               ;; -position LINE[:COLUMN]:  Set point to the given
+               ;;  position in the next file.
+               ((and (equal "-position" arg)
+                     command-line-args-left
+                     (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
+                                   (car command-line-args-left)))
+                (setq arg (pop command-line-args-left))
+                (setq filepos
+                      (cons (string-to-number (match-string 1 arg))
+                            (string-to-number (or (match-string 2 arg) "")))))
+
+               ;; -file FILENAME:  Load the given file.
+               ((and (equal "-file" arg)
+                     command-line-args-left)
+                (let ((file (pop command-line-args-left)))
                   (if coding-system
-                      (setq dir (decode-coding-string dir coding-system)))
-                  (setq dir (command-line-normalize-file-name dir)))
-
-                 ;; Unknown command.
-                 (t (error "Unknown command: %s" arg))))
+                      (setq file (decode-coding-string file coding-system)))
+                  (setq file (expand-file-name file dir))
+                  (push (cons file filepos) files)
+                  (server-log (format "New file: %s %s"
+                                      file (or filepos "")) proc))
+                (setq filepos nil))
+
+               ;; -eval EXPR:  Evaluate a Lisp expression.
+               ((and (equal "-eval" arg)
+                     command-line-args-left)
+                (if use-current-frame
+                    (setq use-current-frame 'always))
+                (let ((expr (pop command-line-args-left)))
+                  (if coding-system
+                      (setq expr (decode-coding-string expr coding-system)))
+                  (push (lambda () (server-eval-and-print expr proc))
+                        commands)
+                  (setq filepos nil)))
+
+               ;; -env NAME=VALUE:  An environment variable.
+               ((and (equal "-env" arg) command-line-args-left)
+                (let ((var (pop command-line-args-left)))
+                  ;; XXX Variables should be encoded as in getenv/setenv.
+                  (process-put proc 'env
+                               (cons var (process-get proc 'env)))))
+
+               ;; -dir DIRNAME:  The cwd of the emacsclient process.
+               ((and (equal "-dir" arg) command-line-args-left)
+                (setq dir (pop command-line-args-left))
+                (if coding-system
+                    (setq dir (decode-coding-string dir coding-system)))
+                (setq dir (command-line-normalize-file-name dir)))
+
+               ;; Unknown command.
+               (t (error "Unknown command: %s" arg))))
 
             (setq frame
                   (cond
@@ -1079,23 +1079,15 @@ The following commands are accepted by the client:
 
             (process-put
              proc 'continuation
-             (lexical-let ((proc proc)
-                           (files files)
-                           (nowait nowait)
-                           (commands commands)
-                           (dontkill dontkill)
-                           (frame frame)
-                           (dir dir)
-                           (tty-name tty-name))
-               (lambda ()
-                 (with-current-buffer (get-buffer-create server-buffer)
-                   ;; Use the same cwd as the emacsclient, if possible, so
-                   ;; relative file names work correctly, even in `eval'.
-                   (let ((default-directory
-                          (if (and dir (file-directory-p dir))
-                              dir default-directory)))
-                     (server-execute proc files nowait commands
-                                     dontkill frame tty-name))))))
+             (lambda ()
+               (with-current-buffer (get-buffer-create server-buffer)
+                 ;; Use the same cwd as the emacsclient, if possible, so
+                 ;; relative file names work correctly, even in `eval'.
+                 (let ((default-directory
+                         (if (and dir (file-directory-p dir))
+                             dir default-directory)))
+                   (server-execute proc files nowait commands
+                                   dontkill frame tty-name)))))
 
             (when (or frame files)
               (server-goto-toplevel proc))
@@ -1372,12 +1364,12 @@ If invoked with a prefix argument, or if there is no server process running,
 starts server process and that is all.  Invoked by \\[server-edit]."
   (interactive "P")
   (cond
-    ((or arg
-         (not server-process)
-         (memq (process-status server-process) '(signal exit)))
-     (server-mode 1))
-    (server-clients (apply 'server-switch-buffer (server-done)))
-    (t (message "No server editing buffers exist"))))
+   ((or arg
+        (not server-process)
+        (memq (process-status server-process) '(signal exit)))
+    (server-mode 1))
+   (server-clients (apply 'server-switch-buffer (server-done)))
+   (t (message "No server editing buffers exist"))))
 
 (defun server-switch-buffer (&optional next-buffer killed-one filepos)
   "Switch to another buffer, preferably one that has a client.