diff options
| author | Stefan Monnier | 2012-04-26 08:43:28 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-04-26 08:43:28 -0400 |
| commit | e95a67dc75c3d41c428d6e215426f321b5a2f9e5 (patch) | |
| tree | 942041f2385c9506f52b6c97af7e4cee34f917db /lisp/term | |
| parent | 4c3fa1d9adf3dca80e86b45488b0556f5f0fa495 (diff) | |
| download | emacs-e95a67dc75c3d41c428d6e215426f321b5a2f9e5.tar.gz emacs-e95a67dc75c3d41c428d6e215426f321b5a2f9e5.zip | |
Replace lexical-let by lexical-binding (except Gnus, CEDET, ERT).
* lisp/term/ns-win.el (ns-define-service):
* lisp/progmodes/pascal.el (pascal-goto-defun):
* lisp/progmodes/js.el (js--read-tab):
* lisp/progmodes/etags.el (tags-lazy-completion-table):
* lisp/emacs-lisp/syntax.el (syntax-propertize-via-font-lock):
* lisp/emacs-lisp/ewoc.el (ewoc--wrap):
* lisp/emacs-lisp/assoc.el (aput, adelete, amake):
* lisp/doc-view.el (doc-view-convert-current-doc):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/vc/diff.el (diff-no-select): Replace lexical-let by lexical-binding.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index b681ec3440f..feac0f1c537 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system | 1 | ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993-1994, 2005-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1993-1994, 2005-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| @@ -44,7 +44,7 @@ | |||
| 44 | (error "%s: Loading ns-win.el but not compiled for GNUstep/MacOS" | 44 | (error "%s: Loading ns-win.el but not compiled for GNUstep/MacOS" |
| 45 | (invocation-name))) | 45 | (invocation-name))) |
| 46 | 46 | ||
| 47 | (eval-when-compile (require 'cl)) ; lexical-let | 47 | (eval-when-compile (require 'cl)) |
| 48 | 48 | ||
| 49 | ;; Documentation-purposes only: actually loaded in loadup.el. | 49 | ;; Documentation-purposes only: actually loaded in loadup.el. |
| 50 | (require 'frame) | 50 | (require 'frame) |
| @@ -65,7 +65,7 @@ | |||
| 65 | ;; nsterm.m. | 65 | ;; nsterm.m. |
| 66 | (defvar ns-input-file) | 66 | (defvar ns-input-file) |
| 67 | 67 | ||
| 68 | (defun ns-handle-nxopen (switch &optional temp) | 68 | (defun ns-handle-nxopen (_switch &optional temp) |
| 69 | (setq unread-command-events (append unread-command-events | 69 | (setq unread-command-events (append unread-command-events |
| 70 | (if temp '(ns-open-temp-file) | 70 | (if temp '(ns-open-temp-file) |
| 71 | '(ns-open-file))) | 71 | '(ns-open-file))) |
| @@ -74,7 +74,7 @@ | |||
| 74 | (defun ns-handle-nxopentemp (switch) | 74 | (defun ns-handle-nxopentemp (switch) |
| 75 | (ns-handle-nxopen switch t)) | 75 | (ns-handle-nxopen switch t)) |
| 76 | 76 | ||
| 77 | (defun ns-ignore-1-arg (switch) | 77 | (defun ns-ignore-1-arg (_switch) |
| 78 | (setq x-invocation-args (cdr x-invocation-args))) | 78 | (setq x-invocation-args (cdr x-invocation-args))) |
| 79 | 79 | ||
| 80 | (defun ns-parse-geometry (geom) | 80 | (defun ns-parse-geometry (geom) |
| @@ -201,21 +201,20 @@ The properties returned may include `top', `left', `height', and `width'." | |||
| 201 | (mapconcat 'identity (cons "ns-service" path) "-"))))) | 201 | (mapconcat 'identity (cons "ns-service" path) "-"))))) |
| 202 | ;; This defines the function. | 202 | ;; This defines the function. |
| 203 | (defalias name | 203 | (defalias name |
| 204 | (lexical-let ((service service)) | 204 | (lambda (arg) |
| 205 | (lambda (arg) | 205 | (interactive "p") |
| 206 | (interactive "p") | 206 | (let* ((in-string |
| 207 | (let* ((in-string | 207 | (cond ((stringp arg) arg) |
| 208 | (cond ((stringp arg) arg) | 208 | (mark-active |
| 209 | (mark-active | 209 | (buffer-substring (region-beginning) (region-end))))) |
| 210 | (buffer-substring (region-beginning) (region-end))))) | 210 | (out-string (ns-perform-service service in-string))) |
| 211 | (out-string (ns-perform-service service in-string))) | 211 | (cond |
| 212 | (cond | 212 | ((stringp arg) out-string) |
| 213 | ((stringp arg) out-string) | 213 | ((and out-string (or (not in-string) |
| 214 | ((and out-string (or (not in-string) | 214 | (not (string= in-string out-string)))) |
| 215 | (not (string= in-string out-string)))) | 215 | (if mark-active (delete-region (region-beginning) (region-end))) |
| 216 | (if mark-active (delete-region (region-beginning) (region-end))) | 216 | (insert out-string) |
| 217 | (insert out-string) | 217 | (setq deactivate-mark nil)))))) |
| 218 | (setq deactivate-mark nil))))))) | ||
| 219 | (cond | 218 | (cond |
| 220 | ((lookup-key global-map mapping) | 219 | ((lookup-key global-map mapping) |
| 221 | (while (cdr path) | 220 | (while (cdr path) |