From cbb2e845187bfbcc62e2accc9df7891a2326608a Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Wed, 28 Sep 2016 13:08:12 -0400 Subject: [PATCH] Turn on more lexical-binding * lisp/dom.el: * lisp/faces.el: * lisp/htmlfontify.el: Turn on lexical-binding. (htmlfontify-string): Use pushnew instead of add-to-list. * lisp/info-xref.el: * lisp/isearch.el: * lisp/man.el: * lisp/ps-def.el: * lisp/ps-print.el: * lisp/replace.el: Turn on lexical-binding. Require cl-lib at compile time. (multi-occur): Use cl-pushnew instead of add-to-list. (replace-match-string-symbols): Remove unused lexical variable. (replace-search, replace-highlight): Fix argument shadowing. * lisp/sort.el: * lisp/xml.el: Turn on lexical-binding. (xml--parse-buffer): Use push instead of add-to-list. * lisp/xt-mouse.el: Turn on lexical-binding. --- lisp/dom.el | 2 +- lisp/faces.el | 2 +- lisp/htmlfontify.el | 5 ++--- lisp/info-xref.el | 2 +- lisp/isearch.el | 2 +- lisp/man.el | 2 +- lisp/ps-def.el | 2 +- lisp/ps-print.el | 2 +- lisp/replace.el | 15 ++++++++------- lisp/sort.el | 2 +- lisp/xml.el | 6 +++--- lisp/xt-mouse.el | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lisp/dom.el b/lisp/dom.el index cf3a02a51db..9f5e177e986 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -1,4 +1,4 @@ -;;; dom.el --- XML/HTML (etc.) DOM manipulation and searching functions +;;; dom.el --- XML/HTML (etc.) DOM manipulation and searching functions -*- lexical-binding: t -*- ;; Copyright (C) 2014-2016 Free Software Foundation, Inc. diff --git a/lisp/faces.el b/lisp/faces.el index a7c4cce741f..15090e1f94a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1,4 +1,4 @@ -;;; faces.el --- Lisp faces +;;; faces.el --- Lisp faces -*- lexical-binding: t -*- ;; Copyright (C) 1992-1996, 1998-2016 Free Software Foundation, Inc. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 8cbe3c1dc9e..52bc36e3606 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1,4 +1,4 @@ -;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks +;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks -*- lexical-binding: t -*- ;; Copyright (C) 2002-2003, 2009-2016 Free Software Foundation, Inc. @@ -1805,8 +1805,7 @@ It is assumed that STRING has text properties that allow it to be fontified. This is a simple convenience wrapper around `htmlfontify-buffer'." (let* ((hfy-optimizations-1 (copy-sequence hfy-optimizations)) - (hfy-optimizations (add-to-list 'hfy-optimizations-1 - 'skip-refontification))) + (hfy-optimizations (pushnew 'skip-refontification hfy-optimizations-1))) (with-temp-buffer (insert string) (htmlfontify-buffer) diff --git a/lisp/info-xref.el b/lisp/info-xref.el index cafc0e4b06a..81a2a5a0167 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -1,4 +1,4 @@ -;;; info-xref.el --- check external references in an Info document +;;; info-xref.el --- check external references in an Info document -*- lexical-binding: t -*- ;; Copyright (C) 2003-2016 Free Software Foundation, Inc. diff --git a/lisp/isearch.el b/lisp/isearch.el index 39ed8af3702..ce87d1bac3c 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1,4 +1,4 @@ -;;; isearch.el --- incremental search minor mode +;;; isearch.el --- incremental search minor mode -*- lexical-binding: t -*- ;; Copyright (C) 1992-1997, 1999-2016 Free Software Foundation, Inc. diff --git a/lisp/man.el b/lisp/man.el index d127decfebd..0f3c4ba98e8 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,4 +1,4 @@ -;;; man.el --- browse UNIX manual pages +;;; man.el --- browse UNIX manual pages -*- lexical-binding: t -*- ;; Copyright (C) 1993-1994, 1996-1997, 2001-2016 Free Software ;; Foundation, Inc. diff --git a/lisp/ps-def.el b/lisp/ps-def.el index 60016285e7c..fbb61b53e73 100644 --- a/lisp/ps-def.el +++ b/lisp/ps-def.el @@ -1,4 +1,4 @@ -;;; ps-def.el --- XEmacs and Emacs definitions for ps-print +;;; ps-def.el --- XEmacs and Emacs definitions for ps-print -*- lexical-binding: t -*- ;; Copyright (C) 2007-2016 Free Software Foundation, Inc. diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 54ffe2874df..6c2a8c6161a 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,4 +1,4 @@ -;;; ps-print.el --- print text from the buffer as PostScript +;;; ps-print.el --- print text from the buffer as PostScript -*- lexical-binding: t -*- ;; Copyright (C) 1993-2016 Free Software Foundation, Inc. diff --git a/lisp/replace.el b/lisp/replace.el index e6124f44c9f..42567516e47 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,4 +1,4 @@ -;;; replace.el --- replace commands for Emacs +;;; replace.el --- replace commands for Emacs -*- lexical-binding: t -*- ;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2016 Free ;; Software Foundation, Inc. @@ -28,6 +28,8 @@ ;;; Code: +(eval-when-compile (require 'cl-lib)) + (defcustom case-replace t "Non-nil means `query-replace' should preserve case in replacements." :type 'boolean @@ -1408,7 +1410,7 @@ See also `multi-occur-in-matching-buffers'." "Next buffer to search (RET to end): ") nil t)) "")) - (add-to-list 'bufs buf) + (cl-pushnew buf bufs) (setq ido-ignore-item-temp-list bufs)) (nreverse (mapcar #'get-buffer bufs))) (occur-read-primary-args))) @@ -1945,7 +1947,6 @@ type them using Lisp syntax." (defun replace-eval-replacement (expression count) (let* ((replace-count count) - err (replacement (condition-case err (eval expression) @@ -2046,7 +2047,7 @@ It is called with three arguments, as if it were `re-search-forward'.") (defun replace-search (search-string limit regexp-flag delimited-flag - case-fold-search &optional backward) + case-fold &optional backward) "Search for the next occurrence of SEARCH-STRING to replace." ;; Let-bind global isearch-* variables to values used ;; to search the next replacement. These let-bindings @@ -2065,7 +2066,7 @@ It is called with three arguments, as if it were replace-lax-whitespace) (isearch-regexp-lax-whitespace replace-regexp-lax-whitespace) - (isearch-case-fold-search case-fold-search) + (isearch-case-fold-search case-fold) (isearch-adjusted nil) (isearch-nonincremental t) ; don't use lax word mode (isearch-forward (not backward)) @@ -2080,7 +2081,7 @@ It is called with three arguments, as if it were (defun replace-highlight (match-beg match-end range-beg range-end search-string regexp-flag delimited-flag - case-fold-search &optional backward) + case-fold &optional backward) (if query-replace-highlight (if replace-overlay (move-overlay replace-overlay match-beg match-end (current-buffer)) @@ -2095,7 +2096,7 @@ It is called with three arguments, as if it were replace-lax-whitespace) (isearch-regexp-lax-whitespace replace-regexp-lax-whitespace) - (isearch-case-fold-search case-fold-search) + (isearch-case-fold-search case-fold) (isearch-forward (not backward)) (isearch-other-end match-beg) (isearch-error nil)) diff --git a/lisp/sort.el b/lisp/sort.el index 8bc71388ad5..7f8acfc9b83 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -1,4 +1,4 @@ -;;; sort.el --- commands to sort text in an Emacs buffer +;;; sort.el --- commands to sort text in an Emacs buffer -*- lexical-binding: t -*- ;; Copyright (C) 1986-1987, 1994-1995, 2001-2016 Free Software ;; Foundation, Inc. diff --git a/lisp/xml.el b/lisp/xml.el index 414300cb402..2563c13094f 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -1,4 +1,4 @@ -;;; xml.el --- XML parser +;;; xml.el --- XML parser -*- lexical-binding: t -*- ;; Copyright (C) 2000-2016 Free Software Foundation, Inc. @@ -401,9 +401,9 @@ Both features can be combined by providing a cons cell parse-dtd) (setq dtd (car result)) (if (cdr result) ; possible leading comment - (add-to-list 'xml (cdr result)))) + (push (cdr result) xml))) (t - (add-to-list 'xml result)))) + (push result xml)))) (goto-char (point-max)))) (if parse-dtd (cons dtd (nreverse xml)) diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index a2b64019f97..5fb977d99e5 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -1,4 +1,4 @@ -;;; xt-mouse.el --- support the mouse when emacs run in an xterm +;;; xt-mouse.el --- support the mouse when emacs run in an xterm -*- lexical-binding: t -*- ;; Copyright (C) 1994, 2000-2016 Free Software Foundation, Inc. -- 2.39.5