From 2cd04527f8ba8c464913282440ca486ace77c8fb Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 22 Mar 2021 23:20:24 -0700 Subject: [PATCH] Use lexical scoping in all fuel sources Signed-off-by: Rudi Grinberg --- misc/fuel/factor-mode.el | 2 +- misc/fuel/fuel-autodoc.el | 2 +- misc/fuel/fuel-autohelp.el | 2 +- misc/fuel/fuel-base.el | 2 +- misc/fuel/fuel-completion.el | 2 +- misc/fuel/fuel-connection.el | 2 +- misc/fuel/fuel-debug-uses.el | 2 +- misc/fuel/fuel-debug.el | 2 +- misc/fuel/fuel-edit.el | 2 +- misc/fuel/fuel-eval.el | 2 +- misc/fuel/fuel-help.el | 2 +- misc/fuel/fuel-listener.el | 2 +- misc/fuel/fuel-log.el | 2 +- misc/fuel/fuel-markup.el | 2 +- misc/fuel/fuel-menu.el | 2 +- misc/fuel/fuel-mode.el | 2 +- misc/fuel/fuel-popup.el | 2 +- misc/fuel/fuel-refactor.el | 5 ++--- misc/fuel/fuel-scaffold.el | 2 +- misc/fuel/fuel-stack.el | 2 +- misc/fuel/fuel-table.el | 2 +- misc/fuel/fuel-tests.el | 2 +- misc/fuel/fuel-xref.el | 2 +- 23 files changed, 24 insertions(+), 25 deletions(-) diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el index dc6f450db9..4b135788f0 100644 --- a/misc/fuel/factor-mode.el +++ b/misc/fuel/factor-mode.el @@ -1,4 +1,4 @@ -;;; factor-mode.el --- Major mode for editing Factor programs. +;;; factor-mode.el --- Major mode for editing Factor programs. -*- lexical-binding: t -*- ;; Copyright (C) 2013 Erik Charlebois ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz diff --git a/misc/fuel/fuel-autodoc.el b/misc/fuel/fuel-autodoc.el index a8aa568d3a..9b6cb5f59d 100644 --- a/misc/fuel/fuel-autodoc.el +++ b/misc/fuel/fuel-autodoc.el @@ -1,4 +1,4 @@ -;;; fuel-autodoc.el -- doc snippets in the echo area +;;; fuel-autodoc.el -- doc snippets in the echo area -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-autohelp.el b/misc/fuel/fuel-autohelp.el index bacea61c4a..1401153829 100644 --- a/misc/fuel/fuel-autohelp.el +++ b/misc/fuel/fuel-autohelp.el @@ -1,4 +1,4 @@ -;;; fuel-autohelp.el -- help pages in another window +;;; fuel-autohelp.el -- help pages in another window -*- lexical-binding: t -*- ;; Copyright (C) 2013 Erik Charlebois ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-base.el b/misc/fuel/fuel-base.el index 48d8026558..e62d9672d5 100644 --- a/misc/fuel/fuel-base.el +++ b/misc/fuel/fuel-base.el @@ -1,4 +1,4 @@ -;;; fuel-base.el --- Basic FUEL support code +;;; fuel-base.el --- Basic FUEL support code -*- lexical-binding: t -*- ;; Copyright (C) 2008 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-completion.el b/misc/fuel/fuel-completion.el index 7bca713601..32d59babf9 100644 --- a/misc/fuel/fuel-completion.el +++ b/misc/fuel/fuel-completion.el @@ -1,4 +1,4 @@ -;;; fuel-completion.el -- completion utilities +;;; fuel-completion.el -- completion utilities -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-connection.el b/misc/fuel/fuel-connection.el index 19c2e97ea1..f7b8d5a323 100644 --- a/misc/fuel/fuel-connection.el +++ b/misc/fuel/fuel-connection.el @@ -1,4 +1,4 @@ -;;; fuel-connection.el -- asynchronous comms with the fuel listener +;;; fuel-connection.el -- asynchronous comms with the fuel listener -*- lexical-binding: t -*- ;; Copyright (C) 2018 Björn Lindqvist ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz diff --git a/misc/fuel/fuel-debug-uses.el b/misc/fuel/fuel-debug-uses.el index c27d749d3a..730b034966 100644 --- a/misc/fuel/fuel-debug-uses.el +++ b/misc/fuel/fuel-debug-uses.el @@ -1,4 +1,4 @@ -;;; fuel-debug-uses.el -- retrieving USING: stanzas +;;; fuel-debug-uses.el -- retrieving USING: stanzas -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-debug.el b/misc/fuel/fuel-debug.el index 0ee277ede8..c9f67d2311 100644 --- a/misc/fuel/fuel-debug.el +++ b/misc/fuel/fuel-debug.el @@ -1,4 +1,4 @@ -;;; fuel-debug.el -- debugging factor code +;;; fuel-debug.el -- debugging factor code -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-edit.el b/misc/fuel/fuel-edit.el index 27e51ab2df..bbc7049049 100644 --- a/misc/fuel/fuel-edit.el +++ b/misc/fuel/fuel-edit.el @@ -1,4 +1,4 @@ -;;; fuel-edit.el -- utilities for file editing +;;; fuel-edit.el -- utilities for file editing -*- lexical-binding: t -*- ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el index 374c5a56f9..50114858fc 100644 --- a/misc/fuel/fuel-eval.el +++ b/misc/fuel/fuel-eval.el @@ -1,4 +1,4 @@ -;;; fuel-eval.el --- evaluating Factor expressions +;;; fuel-eval.el --- evaluating Factor expressions -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el index c7d8455e81..4058b3e6f3 100644 --- a/misc/fuel/fuel-help.el +++ b/misc/fuel/fuel-help.el @@ -1,4 +1,4 @@ -;;; fuel-help.el -- accessing Factor's help system +;;; fuel-help.el -- accessing Factor's help system -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el index 3b3ce39901..02ba2e8d52 100644 --- a/misc/fuel/fuel-listener.el +++ b/misc/fuel/fuel-listener.el @@ -1,4 +1,4 @@ -;;; fuel-listener.el --- starting the fuel listener +;;; fuel-listener.el --- starting the fuel listener -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-log.el b/misc/fuel/fuel-log.el index 515e023173..bff72c1b84 100644 --- a/misc/fuel/fuel-log.el +++ b/misc/fuel/fuel-log.el @@ -1,4 +1,4 @@ -;;; fuel-log.el -- logging utilities +;;; fuel-log.el -- logging utilities -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 3fd8a89c8c..fa71209469 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -1,4 +1,4 @@ -;;; fuel-markup.el -- printing factor help markup +;;; fuel-markup.el -- printing factor help markup -*- lexical-binding: t -*- ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-menu.el b/misc/fuel/fuel-menu.el index e1060e9aca..b0008feeed 100644 --- a/misc/fuel/fuel-menu.el +++ b/misc/fuel/fuel-menu.el @@ -1,4 +1,4 @@ -;;; fuel-menu.el -- menu utilities +;;; fuel-menu.el -- menu utilities -*- lexical-binding: t -*- ;; Copyright (c) 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el index 072291cdfc..005582f63b 100644 --- a/misc/fuel/fuel-mode.el +++ b/misc/fuel/fuel-mode.el @@ -1,4 +1,4 @@ -;;; fuel-mode.el --- Major mode for editing Factor programs. +;;; fuel-mode.el --- Major mode for editing Factor programs. -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-popup.el b/misc/fuel/fuel-popup.el index 2b63130f24..cefefa85ee 100644 --- a/misc/fuel/fuel-popup.el +++ b/misc/fuel/fuel-popup.el @@ -1,4 +1,4 @@ -;;; fuel-popup.el -- popup windows +;;; fuel-popup.el -- popup windows -*- lexical-binding: t -*- ;; Copyright (C) 2008 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index b0522af647..33a2ed738d 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -1,4 +1,4 @@ -;;; fuel-refactor.el -- code refactoring support +;;; fuel-refactor.el -- code refactoring support -*- lexical-binding: t -*- ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. @@ -223,8 +223,7 @@ With prefix argument, use word at point instead." (interactive "P") (let* ((from (if arg (factor-symbol-at-point) (fuel-refactor--def-word))) (from (read-string "Rename word: " from)) - (to (read-string (format "Rename '%s' to: " from))) - (buffer (current-buffer))) + (to (read-string (format "Rename '%s' to: " from)))) (fuel-refactor--rename-word from to (buffer-file-name)))) diff --git a/misc/fuel/fuel-scaffold.el b/misc/fuel/fuel-scaffold.el index ae0091b933..1851e4290d 100644 --- a/misc/fuel/fuel-scaffold.el +++ b/misc/fuel/fuel-scaffold.el @@ -1,4 +1,4 @@ -;;; fuel-scaffold.el -- interaction with tools.scaffold +;;; fuel-scaffold.el -- interaction with tools.scaffold -*- lexical-binding: t -*- ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-stack.el b/misc/fuel/fuel-stack.el index bccda83024..7c1886db91 100644 --- a/misc/fuel/fuel-stack.el +++ b/misc/fuel/fuel-stack.el @@ -1,4 +1,4 @@ -;;; fuel-stack.el -- stack inference help +;;; fuel-stack.el -- stack inference help -*- lexical-binding: t -*- ;; Copyright (C) 2008 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-table.el b/misc/fuel/fuel-table.el index 40b9abeff0..a3ae55ac33 100644 --- a/misc/fuel/fuel-table.el +++ b/misc/fuel/fuel-table.el @@ -1,4 +1,4 @@ -;;; fuel-table.el -- table creation +;;; fuel-table.el -- table creation -*- lexical-binding: t -*- ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-tests.el b/misc/fuel/fuel-tests.el index 4b13a89185..5b2ac7879b 100644 --- a/misc/fuel/fuel-tests.el +++ b/misc/fuel/fuel-tests.el @@ -1,4 +1,4 @@ -;;; fuel-tests.el -- unit tests for fuel +;;; fuel-tests.el -- unit tests for fuel -*- lexical-binding: t -*- ;; Copyright (C) 2014 Björn Lindqvist ;; See http://factorcode.org/license.txt for BSD license. diff --git a/misc/fuel/fuel-xref.el b/misc/fuel/fuel-xref.el index 24141d4534..b40669a02d 100644 --- a/misc/fuel/fuel-xref.el +++ b/misc/fuel/fuel-xref.el @@ -1,4 +1,4 @@ -;;; fuel-xref.el -- showing cross-reference info +;;; fuel-xref.el -- showing cross-reference info -*- lexical-binding: t -*- ;; Copyright (C) 2008, 2009, 2010 Jose Antonio Ortega Ruiz ;; See http://factorcode.org/license.txt for BSD license. -- 2.34.1