From d5291fa3538ae3e38a1c002588580c2a6521bf94 Mon Sep 17 00:00:00 2001 From: Lassi Kortela Date: Mon, 26 Apr 2021 14:57:47 +0300 Subject: [PATCH] Drop usual-integrations and clean up whitespace --- edwin.ldr | 4 ++-- edwin/abbrev.scm | 4 ++-- edwin/adapters.scm | 4 ++-- edwin/ansi.scm | 4 ++-- edwin/argred.scm | 4 ++-- edwin/artdebug.scm | 4 ++-- edwin/autold.scm | 4 ++-- edwin/autosv.scm | 4 ++-- edwin/basic.scm | 6 +++--- edwin/bios.scm | 4 ++-- edwin/bufcom.scm | 4 ++-- edwin/buffer.scm | 4 ++-- edwin/buffrm.scm | 6 +++--- edwin/bufinp.scm | 4 ++-- edwin/bufmnu.scm | 4 ++-- edwin/bufout.scm | 4 ++-- edwin/bufset.scm | 4 ++-- edwin/bufwfs.scm | 6 +++--- edwin/bufwin.scm | 4 ++-- edwin/bufwiu.scm | 4 ++-- edwin/bufwmc.scm | 4 ++-- edwin/c-mode.scm | 4 ++-- edwin/calias.scm | 4 ++-- edwin/cinden.scm | 4 ++-- edwin/class.scm | 4 ++-- edwin/clscon.scm | 4 ++-- edwin/clsmac.scm | 4 ++-- edwin/comatch.scm | 4 ++-- edwin/comhst.scm | 6 +++--- edwin/comint.scm | 10 +++++----- edwin/comman.scm | 4 ++-- edwin/compile.scm | 4 ++-- edwin/comred.scm | 4 ++-- edwin/comtab.scm | 4 ++-- edwin/comwin.scm | 4 ++-- edwin/curren.scm | 4 ++-- edwin/dabbrev.scm | 6 +++--- edwin/debian-changelog.scm | 6 +++--- edwin/debug.scm | 4 ++-- edwin/debuge.scm | 4 ++-- edwin/decls.scm | 4 ++-- edwin/diff.scm | 2 +- edwin/dired.scm | 6 +++--- edwin/dirunx.scm | 4 ++-- edwin/dirw32.scm | 4 ++-- edwin/display.scm | 4 ++-- edwin/docstr.scm | 4 ++-- edwin/dos.scm | 4 ++-- edwin/doscom.scm | 4 ++-- edwin/dosfile.scm | 4 ++-- edwin/dosproc.scm | 4 ++-- edwin/dosshell.scm | 6 +++--- edwin/ed-ffi.scm | 4 ++-- edwin/editor.scm | 6 +++--- edwin/edtfrm.scm | 4 ++-- edwin/edtstr.scm | 4 ++-- edwin/evlcom.scm | 4 ++-- edwin/eystep.scm | 6 +++--- edwin/filcom.scm | 4 ++-- edwin/fileio.scm | 6 +++--- edwin/fill.scm | 4 ++-- edwin/hlpcom.scm | 4 ++-- edwin/htmlmode.scm | 4 ++-- edwin/image.scm | 3 +-- edwin/info.scm | 4 ++-- edwin/input.scm | 4 ++-- edwin/intmod.scm | 4 ++-- edwin/iserch.scm | 4 ++-- edwin/javamode.scm | 4 ++-- edwin/key-w32.scm | 4 ++-- edwin/keymap.scm | 4 ++-- edwin/keyparse.scm | 6 +++--- edwin/kilcom.scm | 6 +++--- edwin/kmacro.scm | 4 ++-- edwin/lincom.scm | 6 +++--- edwin/linden.scm | 4 ++-- edwin/loadef.scm | 6 +++--- edwin/lspcom.scm | 4 ++-- edwin/macros.scm | 4 ++-- edwin/make.scm | 4 ++-- edwin/malias.scm | 4 ++-- edwin/manual.scm | 4 ++-- edwin/midas.scm | 4 ++-- edwin/modefs.scm | 4 ++-- edwin/modes.scm | 4 ++-- edwin/modlin.scm | 4 ++-- edwin/modwin.scm | 4 ++-- edwin/motcom.scm | 4 ++-- edwin/motion.scm | 4 ++-- edwin/mousecom.scm | 4 ++-- edwin/nntp.scm | 4 ++-- edwin/notify.scm | 6 +++--- edwin/nvector.scm | 4 ++-- edwin/occur.scm | 4 ++-- edwin/outline.scm | 4 ++-- edwin/paredit.scm | 4 ++-- edwin/pasmod.scm | 4 ++-- edwin/paths.scm | 4 ++-- edwin/print.scm | 4 ++-- edwin/process.scm | 4 ++-- edwin/prompt.scm | 4 ++-- edwin/pwedit.scm | 4 ++-- edwin/pwparse.scm | 4 ++-- edwin/rcsparse.scm | 4 ++-- edwin/reccom.scm | 6 +++--- edwin/regcom.scm | 4 ++-- edwin/regexp.scm | 4 ++-- edwin/regops.scm | 4 ++-- edwin/replaz.scm | 4 ++-- edwin/rfc822.scm | 4 ++-- edwin/ring.scm | 4 ++-- edwin/rmail.scm | 6 +++--- edwin/rmailsrt.scm | 28 ++++++++++++++-------------- edwin/rmailsum.scm | 4 ++-- edwin/schmod.scm | 4 ++-- edwin/scrcom.scm | 4 ++-- edwin/screen.scm | 4 ++-- edwin/search.scm | 4 ++-- edwin/sendmail.scm | 4 ++-- edwin/sercom.scm | 6 +++--- edwin/shell.scm | 6 +++--- edwin/simple.scm | 4 ++-- edwin/snr.scm | 4 ++-- edwin/sort.scm | 4 ++-- edwin/string.scm | 4 ++-- edwin/strpad.scm | 4 ++-- edwin/strtab.scm | 4 ++-- edwin/struct.scm | 4 ++-- edwin/syntax.scm | 10 +++++----- edwin/tagutl.scm | 10 +++++----- edwin/techinfo.scm | 4 ++-- edwin/telnet.scm | 8 ++++---- edwin/termcap.scm | 8 ++++---- edwin/texcom.scm | 4 ++-- edwin/things.scm | 4 ++-- edwin/tparse.scm | 4 ++-- edwin/tterm.scm | 4 ++-- edwin/tximod.scm | 4 ++-- edwin/txtprp.scm | 4 ++-- edwin/undo.scm | 2 +- edwin/unix.scm | 4 ++-- edwin/utils.scm | 4 ++-- edwin/utlwin.scm | 4 ++-- edwin/vc-bzr.scm | 4 ++-- edwin/vc-cvs.scm | 4 ++-- edwin/vc-git.scm | 4 ++-- edwin/vc-rcs.scm | 4 ++-- edwin/vc-svn.scm | 4 ++-- edwin/vc.scm | 18 +++++++++--------- edwin/verilog.scm | 4 ++-- edwin/vhdl.scm | 4 ++-- edwin/webster.scm | 4 ++-- edwin/win32.scm | 4 ++-- edwin/win32com.scm | 4 ++-- edwin/wincom.scm | 4 ++-- edwin/window.scm | 4 ++-- edwin/winout.scm | 4 ++-- edwin/world-monitor.scm | 4 ++-- edwin/xform.scm | 4 ++-- edwin/xterm.scm | 4 ++-- 160 files changed, 369 insertions(+), 370 deletions(-) diff --git a/edwin.ldr b/edwin.ldr index 525465e..11e5a43 100644 --- a/edwin.ldr +++ b/edwin.ldr @@ -27,7 +27,7 @@ USA. ;;; program to load package contents ;;; **** This program (unlike most .ldr files) is not generated by a program. -(declare (usual-integrations)) + (lambda (package/loader key-alist) (let ((to-avoid-list (if (file-exists? "edwin.bad") @@ -258,4 +258,4 @@ USA. (if (access *external-doc-strings?* environment) (begin (set! (access *external-doc-strings?* environment) false) - (warn "Remember to use ``dump-doc-strings''!"))))))) \ No newline at end of file + (warn "Remember to use ``dump-doc-strings''!"))))))) diff --git a/edwin/abbrev.scm b/edwin/abbrev.scm index c4d6fc2..30aa0c6 100644 --- a/edwin/abbrev.scm +++ b/edwin/abbrev.scm @@ -26,7 +26,7 @@ USA. ;;;; Abbrev Mode -(declare (usual-integrations)) + ;;;; Low-level data structures @@ -631,4 +631,4 @@ The argument FILENAME is the file name to write." ((ref-command write-abbrev-file) #f)) ;; Don't keep bothering user if he says no. (set! abbrevs-changed? #f) - #t))) \ No newline at end of file + #t))) diff --git a/edwin/adapters.scm b/edwin/adapters.scm index 9be2acd..b7ab8a5 100644 --- a/edwin/adapters.scm +++ b/edwin/adapters.scm @@ -40,7 +40,7 @@ USA. ;;; string) package, which contains a copy of the runtime's old string ;;; implementation. Other things, like file I/O, are handled here. -(declare (usual-integrations)) + (define (call-with-file-adapter procedure) (lambda (pathname receiver) @@ -61,4 +61,4 @@ USA. (define char-set:graphic (char-set-union (ucs-range->char-set #x20 #x7F) - (ucs-range->char-set #xA0 #x100))) \ No newline at end of file + (ucs-range->char-set #xA0 #x100))) diff --git a/edwin/ansi.scm b/edwin/ansi.scm index 6351b66..846960c 100644 --- a/edwin/ansi.scm +++ b/edwin/ansi.scm @@ -26,7 +26,7 @@ USA. ;;;; Hard-coded ANSI terminal type for lack of termcap on DOS/NT -(declare (usual-integrations)) + (define (make-ansi-terminal-description columns lines) (define (get-numstring base-name) @@ -150,4 +150,4 @@ USA. false ; ts-set-window false ; ts-visible-bell '() ; termcap-description-keys - )))) \ No newline at end of file + )))) diff --git a/edwin/argred.scm b/edwin/argred.scm index 350f8af..b3da879 100644 --- a/edwin/argred.scm +++ b/edwin/argred.scm @@ -26,7 +26,7 @@ USA. ;;;; Command Argument Reader -(declare (usual-integrations)) + (define-command universal-argument "Begin a numeric argument for the following command. @@ -140,4 +140,4 @@ Otherwise, the character inserts itself." (else argument))) (define (command-argument-numeric-value argument) - (or (command-argument-value argument) 1)) \ No newline at end of file + (or (command-argument-value argument) 1)) diff --git a/edwin/artdebug.scm b/edwin/artdebug.scm index 633f725..c749360 100644 --- a/edwin/artdebug.scm +++ b/edwin/artdebug.scm @@ -26,7 +26,7 @@ USA. ;;;; Continuation Browser -(declare (usual-integrations)) + #| TO DO @@ -1353,4 +1353,4 @@ Prefix argument means do not kill the debugger buffer." (DEBUGGER-PRESENTATION ,debugger-presentation) (PROMPT-FOR-EXPRESSION ,operation/prompt-for-expression) (PROMPT-FOR-CONFIRMATION ,operation/prompt-for-confirmation)) - #f)) \ No newline at end of file + #f)) diff --git a/edwin/autold.scm b/edwin/autold.scm index db58545..edb4b2e 100644 --- a/edwin/autold.scm +++ b/edwin/autold.scm @@ -26,7 +26,7 @@ USA. ;;;; Autoloads for Edwin -(declare (usual-integrations)) + ;;;; Definitions @@ -236,4 +236,4 @@ Second arg PURIFY? means purify the file's contents after loading; evaluation-error-handler (lambda () (parameterize ((param:suppress-loading-message? #t)) - (load filename environment 'DEFAULT purify?))))))) \ No newline at end of file + (load filename environment 'DEFAULT purify?))))))) diff --git a/edwin/autosv.scm b/edwin/autosv.scm index a641ab3..dd5825a 100644 --- a/edwin/autosv.scm +++ b/edwin/autosv.scm @@ -26,7 +26,7 @@ USA. ;;;; Auto Save -(declare (usual-integrations)) + (define-variable auto-save-visited-file-name "True says auto-save a buffer in the file it is visiting, when practical. @@ -177,4 +177,4 @@ This file is not the file you visited; that changes only when you save." #f 'DEFAULT) (set-buffer-save-length! buffer) - (set-buffer-auto-saved! buffer)))) \ No newline at end of file + (set-buffer-auto-saved! buffer)))) diff --git a/edwin/basic.scm b/edwin/basic.scm index d160aaf..a357435 100644 --- a/edwin/basic.scm +++ b/edwin/basic.scm @@ -26,7 +26,7 @@ USA. ;;;; Basic Commands -(declare (usual-integrations)) + (define-command self-insert-command "Insert the character you type. @@ -161,7 +161,7 @@ This command followed by an = is equivalent to a Control-=." (merge-bucky-bits char char-bit:control))))) (define-command meta-prefix - "Sets Meta-bit of following character. + "Sets Meta-bit of following character. Turns a following A into a Meta-A. If the Metizer character is Altmode, it turns ^A into Control-Meta-A. Otherwise, it turns ^A into plain Meta-A." @@ -570,4 +570,4 @@ In addition, if the first character of the string is '*' then an error is signaled if the buffer is read-only. This happens before reading any arguments." () - (lambda () (editor-error "DEFINE-COMMAND shouldn't be invoked"))) \ No newline at end of file + (lambda () (editor-error "DEFINE-COMMAND shouldn't be invoked"))) diff --git a/edwin/bios.scm b/edwin/bios.scm index da89418..80704c6 100644 --- a/edwin/bios.scm +++ b/edwin/bios.scm @@ -27,7 +27,7 @@ USA. ;;;; IBM-PC BIOS Screen Implementation ;;; package: (edwin screen console-screen) -(declare (usual-integrations)) + (define (make-bios-screen) ;; What is the baud rate needed for? It's not even meaningful. @@ -184,4 +184,4 @@ USA. (define (bios-console-scroll-lines-up! screen xl xu yl yu amount) screen (bios:scroll-lines-up! xl (fix:-1+ xu) yl (fix:-1+ yu) amount) - 'CLEARED) \ No newline at end of file + 'CLEARED) diff --git a/edwin/bufcom.scm b/edwin/bufcom.scm index ba056de..f35b1f6 100644 --- a/edwin/bufcom.scm +++ b/edwin/bufcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Commands -(declare (usual-integrations)) + (define (prompt-for-select-buffer prompt) (lambda () @@ -336,4 +336,4 @@ This variable has no effect if select-buffer-create is false." (and default-buffer (buffer-name default-buffer)) (buffer-names) 'DEFAULT-TYPE (if default-buffer 'VISIBLE-DEFAULT 'NO-DEFAULT) - options)) \ No newline at end of file + options)) diff --git a/edwin/buffer.scm b/edwin/buffer.scm index 184c99f..2234413 100644 --- a/edwin/buffer.scm +++ b/edwin/buffer.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Abstraction -(declare (usual-integrations)) + (define-structure (buffer (constructor %make-buffer (%name %default-directory)) @@ -563,4 +563,4 @@ The buffer is guaranteed to be deselected at that time." (delq! (minor-mode-comtab mode) (buffer-comtabs buffer))) (remove-minor-mode-line-entry! buffer mode) - (buffer-modeline-event! buffer 'buffer-modes))))))) \ No newline at end of file + (buffer-modeline-event! buffer 'buffer-modes))))))) diff --git a/edwin/buffrm.scm b/edwin/buffrm.scm index 3e59497..2b5c225 100644 --- a/edwin/buffrm.scm +++ b/edwin/buffrm.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Frames -(declare (usual-integrations)) + (define-class buffer-frame combination-leaf-window ( @@ -332,7 +332,7 @@ Automatically becomes local when set in any fashion." (and (string? (vector-ref object i)) (<= 1 (string-length (vector-ref object i)) 255) (loop (+ i 1)))))))) - + (let ((setup-truncate-lines! (lambda (buffer variable) variable ;ignore @@ -529,4 +529,4 @@ Automatically becomes local when set in any fashion." (set! restore-saved-continuation? #f)) unspecific) -(define restore-saved-continuation?) \ No newline at end of file +(define restore-saved-continuation?) diff --git a/edwin/bufinp.scm b/edwin/bufinp.scm index 48885f8..4f6687f 100644 --- a/edwin/bufinp.scm +++ b/edwin/bufinp.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Input Ports -(declare (usual-integrations)) + (define (with-input-from-mark mark thunk #!optional receiver) (let ((port (make-buffer-input-port mark (group-end mark)))) @@ -113,4 +113,4 @@ USA. ,(lambda (port output) (write-string " from buffer at " output) (write (input-port/mark port) output)))) - #f)) \ No newline at end of file + #f)) diff --git a/edwin/bufmnu.scm b/edwin/bufmnu.scm index 1518061..bdd5b76 100644 --- a/edwin/bufmnu.scm +++ b/edwin/bufmnu.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Menu -(declare (usual-integrations)) + (define-variable buffer-menu-kill-on-quit "If not false, kill the *Buffer-List* buffer when leaving it." @@ -429,4 +429,4 @@ and then move up one line." ((char=? (mark-right-char (mark+ lstart column)) char) (cons (mark-permanent! lstart) (loop next))) (else (loop next))))) - (loop (line-start (buffer-start (current-buffer)) 2))) \ No newline at end of file + (loop (line-start (buffer-start (current-buffer)) 2))) diff --git a/edwin/bufout.scm b/edwin/bufout.scm index 2b5a23b..5aa3815 100644 --- a/edwin/bufout.scm +++ b/edwin/bufout.scm @@ -27,7 +27,7 @@ USA. ;;;; Buffer Output Ports ;;; Package: (edwin buffer-output-port) -(declare (usual-integrations)) + (define (with-output-to-mark mark thunk) (call-with-output-mark mark @@ -107,4 +107,4 @@ USA. (WRITE-SELF ,operation/write-self) (WRITE-SUBSTRING ,operation/write-substring) (X-SIZE ,operation/x-size)) - #f)) \ No newline at end of file + #f)) diff --git a/edwin/bufset.scm b/edwin/bufset.scm index 533b5fe..c439854 100644 --- a/edwin/bufset.scm +++ b/edwin/bufset.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Set Abstraction -(declare (usual-integrations)) + (define-structure (bufferset (constructor %make-bufferset)) buffer-list @@ -103,4 +103,4 @@ USA. (let ((names (bufferset-names bufferset))) (string-table-remove! names (buffer-name buffer)) (set-buffer-name! buffer new-name) - (string-table-put! names new-name buffer))) \ No newline at end of file + (string-table-put! names new-name buffer))) diff --git a/edwin/bufwfs.scm b/edwin/bufwfs.scm index 53660e7..869b671 100644 --- a/edwin/bufwfs.scm +++ b/edwin/bufwfs.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Windows: Fill and Scroll -(declare (usual-integrations)) + (define (fill-top window start) (let ((group (%window-group window)) @@ -212,7 +212,7 @@ USA. end-index 'HIGHLIGHTED) end-index)) - ;; If line is clipped off top of window, draw it + ;; If line is clipped off top of window, draw it ;; anyway so that index and column calculations ;; get done. Use first visible line for image ;; output so as to avoid consing a dummy image @@ -429,4 +429,4 @@ USA. (deallocate-outlines! window (o3-outline start) (o3-outline end)) (deallocate-o3! window start) (deallocate-o3! window end) - false))))) \ No newline at end of file + false))))) diff --git a/edwin/bufwin.scm b/edwin/bufwin.scm index c1e84ef..34c71f2 100644 --- a/edwin/bufwin.scm +++ b/edwin/bufwin.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Windows: Base -(declare (usual-integrations)) + ;;; The following instance variables contain permanent marks, which ;;; must be copied if they are passed to someone outside the buffer @@ -1261,4 +1261,4 @@ If this is zero, point is always centered after it moves off screen." (update-cursor! window))))) (define point-not-visible-error? - #f) \ No newline at end of file + #f) diff --git a/edwin/bufwiu.scm b/edwin/bufwiu.scm index 81b992e..a28cd9b 100644 --- a/edwin/bufwiu.scm +++ b/edwin/bufwiu.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Windows: Image Update -(declare (usual-integrations)) + ;;;; Insert/Delete @@ -546,4 +546,4 @@ USA. (%set-inferior-y-start! (%window-cursor-inferior window) end-y)) (update-modified-tick! window) (set-interrupt-enables! mask) - unspecific)) \ No newline at end of file + unspecific)) diff --git a/edwin/bufwmc.scm b/edwin/bufwmc.scm index 4c45187..7477b99 100644 --- a/edwin/bufwmc.scm +++ b/edwin/bufwmc.scm @@ -26,7 +26,7 @@ USA. ;;;; Buffer Windows: Mark <-> Coordinate Maps -(declare (usual-integrations)) + (define-integrable (buffer-window/mark->x window mark) (buffer-window/index->x window (mark-index mark))) @@ -585,4 +585,4 @@ USA. (fix:quotient column x-max))))) (define-integrable (coordinates->column x y x-size) - (fix:+ x (fix:* y (fix:- x-size 1)))) \ No newline at end of file + (fix:+ x (fix:* y (fix:- x-size 1)))) diff --git a/edwin/c-mode.scm b/edwin/c-mode.scm index 515e3ae..58f7696 100644 --- a/edwin/c-mode.scm +++ b/edwin/c-mode.scm @@ -26,7 +26,7 @@ USA. ;;;; C Mode (from GNU Emacs) -(declare (usual-integrations)) + (define-major-mode c fundamental "C" "Major mode for editing C code. @@ -271,4 +271,4 @@ The relative indentation among the lines of the expression are preserved." "Indent each line of the C grouping following point." () (lambda () - (c-indent-expression (current-point)))) \ No newline at end of file + (c-indent-expression (current-point)))) diff --git a/edwin/calias.scm b/edwin/calias.scm index 2857442..4b4c7fd 100644 --- a/edwin/calias.scm +++ b/edwin/calias.scm @@ -26,7 +26,7 @@ USA. ;;;; Alias Keys -(declare (usual-integrations)) + (define alias-keys '()) @@ -287,4 +287,4 @@ USA. (define-special-key left) (define-special-key right) (define-special-key select) -(define-special-key print) \ No newline at end of file +(define-special-key print) diff --git a/edwin/cinden.scm b/edwin/cinden.scm index add6163..9c60960 100644 --- a/edwin/cinden.scm +++ b/edwin/cinden.scm @@ -26,7 +26,7 @@ USA. ;;;; C Indentation (from GNU Emacs) -(declare (usual-integrations)) + (define-variable c-indent-level "Indentation of C statements with respect to containing block." @@ -413,4 +413,4 @@ This is in addition to c-continued-statement-offset." (let loop ((depth-delta depth-delta) (stack stack)) (if (= -1 depth-delta) (cdr stack) - (loop (+ depth-delta 1) (cdr stack))))))) \ No newline at end of file + (loop (+ depth-delta 1) (cdr stack))))))) diff --git a/edwin/class.scm b/edwin/class.scm index f477227..7e9c820 100644 --- a/edwin/class.scm +++ b/edwin/class.scm @@ -26,7 +26,7 @@ USA. ;;;; Class/Object System -(declare (usual-integrations)) + ;;; ****************************************************************** ;;; This software is intended for use in the Edwin window system only. @@ -108,4 +108,4 @@ USA. (and method (apply method object args)))) (define (send-usual class object operation . args) - (apply (usual-method class operation) object args)) \ No newline at end of file + (apply (usual-method class operation) object args)) diff --git a/edwin/clscon.scm b/edwin/clscon.scm index 0b63ff0..4408671 100644 --- a/edwin/clscon.scm +++ b/edwin/clscon.scm @@ -26,7 +26,7 @@ USA. ;;;; Class/Object System: Class Constructor -(declare (usual-integrations)) + ;;; ****************************************************************** ;;; This software is intended for use in the Edwin window system only. @@ -96,4 +96,4 @@ USA. (cdr entry))) (define class-descriptors - '()) \ No newline at end of file + '()) diff --git a/edwin/clsmac.scm b/edwin/clsmac.scm index 3448148..dad9121 100644 --- a/edwin/clsmac.scm +++ b/edwin/clsmac.scm @@ -26,7 +26,7 @@ USA. ;;;; Class/Object System -(declare (usual-integrations)) + ;;; ****************************************************************** ;;; This software is intended for use in the Edwin window system only. @@ -120,4 +120,4 @@ USA. (syntax-rules () ((usual==> object operation argument ...) (let ((temp object)) - ((usual-method (object-class temp) 'operation) temp argument ...))))) \ No newline at end of file + ((usual-method (object-class temp) 'operation) temp argument ...))))) diff --git a/edwin/comatch.scm b/edwin/comatch.scm index 718ffab..cb3ba64 100644 --- a/edwin/comatch.scm +++ b/edwin/comatch.scm @@ -26,7 +26,7 @@ USA. ;;;; Combinatoric Matcher -(declare (usual-integrations)) + ;;; This matcher allows compex matching patterns to be built up from ;;; primitives using combinators. With this implementation, the @@ -148,4 +148,4 @@ USA. (comatch:general (lambda (start end) (and (comatch-apply c1 start end) - (comatch-apply c2 start end))))))) \ No newline at end of file + (comatch-apply c2 start end))))))) diff --git a/edwin/comhst.scm b/edwin/comhst.scm index 706f645..d3e9c29 100644 --- a/edwin/comhst.scm +++ b/edwin/comhst.scm @@ -27,7 +27,7 @@ USA. ;;;; Command interpreter history ;;; Translated from "comint.el", by Olin Shivers. -(declare (usual-integrations)) + (define-variable-per-buffer comint-input-ring-size "Size of input history ring." @@ -78,7 +78,7 @@ USA. (mark-right-inserting-copy point))))) (set-command-message! comint-input-ring-tag index point point))))))) - + (define-command comint-next-input "Cycle forwards through input history." "*p" @@ -127,4 +127,4 @@ USA. (set-variable! comint-last-input-match string) ((ref-command comint-previous-input) (- index start))) (else - (loop index)))))))))) \ No newline at end of file + (loop index)))))))))) diff --git a/edwin/comint.scm b/edwin/comint.scm index 112b6b5..bbe66b5 100644 --- a/edwin/comint.scm +++ b/edwin/comint.scm @@ -27,7 +27,7 @@ USA. ;;;; Command interpreter subprocess control ;;; Translated from "comint.el", by Olin Shivers. -(declare (usual-integrations)) + (define (make-comint mode buffer program . switches) (let ((buffer @@ -116,7 +116,7 @@ the appropriate regular expression. An input history is maintained of size comint-input-ring-size, and can be accessed with the commands comint-next-input [\\[comint-next-input]] and comint-previous-input [\\[comint-previous-input]]. Commands not keybound by -default are send-invisible, comint-dynamic-complete, and +default are send-invisible, comint-dynamic-complete, and comint-list-dynamic-completions. If you accidentally suspend your process, use \\[comint-continue-subjob] @@ -227,7 +227,7 @@ history list. Default is to save anything that isn't all whitespace." (define-command send-invisible "Read a string without echoing, and send it to the process running -in the current buffer. A new-line is additionally sent. +in the current buffer. A new-line is additionally sent. String is not saved on comint input history list. Security bug: your string can still be temporarily recovered with \\[view-lossage]." @@ -425,7 +425,7 @@ See also \\[comint-dynamic-complete]." (define (comint-dynamic-complete-filename) "Complete the filename at point. This function is similar to \\[comint-replace-by-expanded-filename], except -that it won't change parts of the filename already entered in the buffer; +that it won't change parts of the filename already entered in the buffer; it just adds completion characters to the end of the filename." (let ((region (comint-current-filename-region))) (let ((pathname @@ -493,4 +493,4 @@ assumed to have occurred." (let loop ((thunks (ref-variable comint-dynamic-complete-functions))) (if (not (null? thunks)) (if (not ((car thunks))) - (loop (cdr thunks))))))) \ No newline at end of file + (loop (cdr thunks))))))) diff --git a/edwin/comman.scm b/edwin/comman.scm index 97ea436..58120db 100644 --- a/edwin/comman.scm +++ b/edwin/comman.scm @@ -26,7 +26,7 @@ USA. ;;;; Commands and Variables -(declare (usual-integrations)) + (define-structure (command (constructor %make-command ()) @@ -203,4 +203,4 @@ USA. (hash-table-ref/default permanent-local-variables variable #f)) (define permanent-local-variables - (make-key-weak-eq-hash-table)) \ No newline at end of file + (make-key-weak-eq-hash-table)) diff --git a/edwin/compile.scm b/edwin/compile.scm index 58272d5..f94376b 100644 --- a/edwin/compile.scm +++ b/edwin/compile.scm @@ -26,7 +26,7 @@ USA. ;;;; Compilation Subprocess -(declare (usual-integrations)) + (define-variable compile-command "Initial contents of \\[compile] prompt." @@ -136,4 +136,4 @@ with output going to the buffer *compilation*." unspecific))))) (define compilation-process - #f) \ No newline at end of file + #f) diff --git a/edwin/comred.scm b/edwin/comred.scm index 496fceb..6aff4c2 100644 --- a/edwin/comred.scm +++ b/edwin/comred.scm @@ -26,7 +26,7 @@ USA. ;;;; Command Reader -(declare (usual-integrations)) + (define *command-key*) ;Key read to find current command (define *command*) ;The current command @@ -519,4 +519,4 @@ USA. (string? sexp) (char? sexp)) sexp - `(QUOTE ,sexp))) \ No newline at end of file + `(QUOTE ,sexp))) diff --git a/edwin/comtab.scm b/edwin/comtab.scm index edcaf8f..85ca78e 100644 --- a/edwin/comtab.scm +++ b/edwin/comtab.scm @@ -26,7 +26,7 @@ USA. ;;;; Command Tables -(declare (usual-integrations)) + (define-structure (comtab (constructor make-comtab ())) (vector 0) @@ -418,4 +418,4 @@ USA. ((comtab-alias? datum) (datum-loop (comtab-alias/dereference datum) keys)) (else - (error "Illegal comtab datum:" datum))))))))) \ No newline at end of file + (error "Illegal comtab datum:" datum))))))))) diff --git a/edwin/comwin.scm b/edwin/comwin.scm index 32c24e9..565bac3 100644 --- a/edwin/comwin.scm +++ b/edwin/comwin.scm @@ -26,7 +26,7 @@ USA. ;;;; Combination Windows -(declare (usual-integrations)) + ;;; Combination windows are used to split a window into vertically or ;;; horizontally divided areas. That window's initial superior must @@ -687,4 +687,4 @@ USA. (inferior-containing-coordinates combination x y leaf?)) (define-method combination-leaf-window (:leaf-containing-coordinates leaf x y) - (values leaf x y)) \ No newline at end of file + (values leaf x y)) diff --git a/edwin/curren.scm b/edwin/curren.scm index fa1cc70..c5688e3 100644 --- a/edwin/curren.scm +++ b/edwin/curren.scm @@ -26,7 +26,7 @@ USA. ;;;; Current State -(declare (usual-integrations)) + ;;;; Screens @@ -744,4 +744,4 @@ If false, don't display any message." (enable-buffer-minor-mode! (selected-buffer) mode)) (define (disable-current-minor-mode! mode) - (disable-buffer-minor-mode! (selected-buffer) mode)) \ No newline at end of file + (disable-buffer-minor-mode! (selected-buffer) mode)) diff --git a/edwin/dabbrev.scm b/edwin/dabbrev.scm index 4207f9b..c29da9c 100644 --- a/edwin/dabbrev.scm +++ b/edwin/dabbrev.scm @@ -26,7 +26,7 @@ USA. ;;;; Dynamic Abbrev -(declare (usual-integrations)) + (define-variable dabbrevs-backward-only "If true, dabbrevs-expand only looks backwards." @@ -205,7 +205,7 @@ with the next possible expansion not yet tried." (ref-variable last-dabbrevs-direction)) (do-from-scratch)))) -;; Search function used by dabbrevs library. +;; Search function used by dabbrevs library. ;; pattern is string to find as prefix of word. ;; reverse? is true for reverse search, false for forward. ;; Variable abbrevs-limit controls the maximum search region size. @@ -245,4 +245,4 @@ with the next possible expansion not yet tried." example))) (ref-variable last-dabbrev-table)) (loop (if reverse? start end)) - (values end result)))))))) \ No newline at end of file + (values end result)))))))) diff --git a/edwin/debian-changelog.scm b/edwin/debian-changelog.scm index 9ccfe0c..53ed1a8 100644 --- a/edwin/debian-changelog.scm +++ b/edwin/debian-changelog.scm @@ -26,7 +26,7 @@ USA. ;;;; Debian changelog mode -(declare (usual-integrations)) + (define-command debian-changelog-mode "Enter Debian changelog mode." @@ -146,7 +146,7 @@ Key bindings: (map (lambda (s) (cons s s)) '("stable" "frozen" - "unstable" + "unstable" "stable frozen unstable" "stable unstable frozen" "unstable stable frozen" @@ -270,4 +270,4 @@ address and release date) so that new entries can be made." (define title-regexp-index:package-name 1) (define title-regexp-index:version 2) (define title-regexp-index:distribution 3) -(define title-regexp-index:urgency 5) \ No newline at end of file +(define title-regexp-index:urgency 5) diff --git a/edwin/debug.scm b/edwin/debug.scm index 8964768..6360cb3 100644 --- a/edwin/debug.scm +++ b/edwin/debug.scm @@ -27,7 +27,7 @@ USA. ;;;; Browser-style Debug and Where ;;; Package: (edwin debugger) -(declare (usual-integrations)) + ;;;; Text prop setup stuff @@ -1785,4 +1785,4 @@ once it has been renamed, it will not be deleted automatically.") (string-length separator)))) (lambda () (write value))) port))))) - (debugger-newline port))) \ No newline at end of file + (debugger-newline port))) diff --git a/edwin/debuge.scm b/edwin/debuge.scm index 70141c2..40f7b79 100644 --- a/edwin/debuge.scm +++ b/edwin/debuge.scm @@ -26,7 +26,7 @@ USA. ;;;; Debugging Stuff -(declare (usual-integrations)) + (define (debug-save-files) (for-each debug-save-buffer @@ -174,4 +174,4 @@ USA. (set-screen-debug-trace! screen false) (let ((result trace-output)) (set! trace-output '()) - (map list->vector (reverse! result))))) \ No newline at end of file + (map list->vector (reverse! result))))) diff --git a/edwin/decls.scm b/edwin/decls.scm index 108127e..a21c273 100644 --- a/edwin/decls.scm +++ b/edwin/decls.scm @@ -26,7 +26,7 @@ USA. ;;;; Edwin: Syntaxing Declarations -(declare (usual-integrations)) + (let* ((sf-names (lambda (file) (sf/pathname-defaulting file #f #f))) (scm-file (lambda (file) (receive (scm bin spec) (sf-names file) scm))) @@ -242,4 +242,4 @@ USA. (sf-class "bufwfs" "bufwin" "window" "class" "buffer" "struct") (sf-class "bufwiu" "bufwin" "window" "class" "buffer" "struct") (sf-class "bufwmc" "bufwin" "window" "class" "buffer" "struct") - (sf-class "buffrm" "bufwin" "window" "class" "struct")) \ No newline at end of file + (sf-class "buffrm" "bufwin" "window" "class" "struct")) diff --git a/edwin/diff.scm b/edwin/diff.scm index fe9a964..a56cdf3 100644 --- a/edwin/diff.scm +++ b/edwin/diff.scm @@ -11,7 +11,7 @@ Domain. All warranties are disclaimed. ;;; bells & whistles for converting between unified and context diffs, ;;; like in GNU Emacs. Some day. -(declare (usual-integrations)) + (define-variable diff-program "The name of the diff program." diff --git a/edwin/dired.scm b/edwin/dired.scm index 5bb4005..fe6cb8d 100644 --- a/edwin/dired.scm +++ b/edwin/dired.scm @@ -27,7 +27,7 @@ USA. ;;;; Directory Editor ;; package: (edwin dired) -(declare (usual-integrations)) + (define-variable dired-trivial-filenames "Regexp of files to skip when finding first file of a directory. @@ -432,7 +432,7 @@ negative numeric arg overrides kept-old-versions with minus the arg." (define-command dired-unmark-all-files "Remove a specific mark (or any mark) from every file. -After this command, type the mark character to remove, +After this command, type the mark character to remove, or type RET to remove all marks. With prefix arg, query for each marked file. Type \\[help-command] at that time for help." @@ -1061,4 +1061,4 @@ Actions controlled by variables list-directory-brief-switches (procedure (car filename) (cdr filename)) (mark-temporary! (cdr filename))) filenames))) - (length filenames))) \ No newline at end of file + (length filenames))) diff --git a/edwin/dirunx.scm b/edwin/dirunx.scm index c2ed697..1862183 100644 --- a/edwin/dirunx.scm +++ b/edwin/dirunx.scm @@ -27,7 +27,7 @@ USA. ;;;; Directory Editor (Unix Customizations) ;;; package: (edwin dired) -(declare (usual-integrations)) + (define (dired-change-inode program) (lambda (attribute argument) @@ -108,4 +108,4 @@ with the same names that the files currently have." "P" (lambda (argument) )) -|# \ No newline at end of file +|# diff --git a/edwin/dirw32.scm b/edwin/dirw32.scm index bd5453b..98a69a1 100644 --- a/edwin/dirw32.scm +++ b/edwin/dirw32.scm @@ -27,7 +27,7 @@ USA. ;;;; Directory Editor (Win32 Customizations) ;;; package: (edwin dired) -(declare (usual-integrations)) + (define-key 'dired #\Z 'dired-do-compress) (define-key 'dired #\S 'dired-hidden-toggle) @@ -123,4 +123,4 @@ The files are compressed or uncompressed using gzip." mask)) unspecific) letters) - mask)) \ No newline at end of file + mask)) diff --git a/edwin/display.scm b/edwin/display.scm index b630edb..39abfbf 100644 --- a/edwin/display.scm +++ b/edwin/display.scm @@ -27,7 +27,7 @@ USA. ;;;; Display-Type Abstraction ;;; package: (edwin display-type) -(declare (usual-integrations)) + (define-structure (display-type (conc-name display-type/) @@ -93,4 +93,4 @@ USA. (find (lambda (display-type) (eq? name (display-type/name display-type))) display-types))) - display-type)) \ No newline at end of file + display-type)) diff --git a/edwin/docstr.scm b/edwin/docstr.scm index e91a9cb..f430e83 100644 --- a/edwin/docstr.scm +++ b/edwin/docstr.scm @@ -26,7 +26,7 @@ USA. ;;;; Documentation Strings -(declare (usual-integrations)) + (define *external-doc-strings?* #t) (define *external-doc-strings-file* #f) @@ -199,4 +199,4 @@ USA. string)))) (define (description-append . descriptions) - (lambda () (apply string-append (map description->string descriptions)))) \ No newline at end of file + (lambda () (apply string-append (map description->string descriptions)))) diff --git a/edwin/dos.scm b/edwin/dos.scm index afa2a75..89a83a9 100644 --- a/edwin/dos.scm +++ b/edwin/dos.scm @@ -26,7 +26,7 @@ USA. ;;;; Win32 Customizations for Edwin -(declare (usual-integrations)) + (define (os/set-file-modes-writeable! pathname) (set-file-modes! pathname @@ -155,4 +155,4 @@ USA. (define (os/rmail-spool-directory) #f) (define (os/rmail-primary-inbox-list system-mailboxes) system-mailboxes '()) (define (os/sendmail-program) "sendmail.exe") -(define (os/rmail-pop-procedure) #f) \ No newline at end of file +(define (os/rmail-pop-procedure) #f) diff --git a/edwin/doscom.scm b/edwin/doscom.scm index f18b2a1..b8e7325 100644 --- a/edwin/doscom.scm +++ b/edwin/doscom.scm @@ -26,7 +26,7 @@ USA. ;;;; Shell commands for DOS -(declare (usual-integrations)) + (load-option 'DOSPROCESS) @@ -105,4 +105,4 @@ Prefix arg means replace the region with it." (if input-region (core (make-buffer-input-port (region-start input-region) (region-end input-region))) - (call-with-input-file "\\dev\\nul" core)))))) \ No newline at end of file + (call-with-input-file "\\dev\\nul" core)))))) diff --git a/edwin/dosfile.scm b/edwin/dosfile.scm index 5d2b0dd..1b7c67d 100644 --- a/edwin/dosfile.scm +++ b/edwin/dosfile.scm @@ -26,7 +26,7 @@ USA. ;;;; DOS-Syntax File Customizations -(declare (usual-integrations)) + (define-variable version-control "Control use of version numbers for backup files. @@ -565,4 +565,4 @@ filename suffix \".gz\"." (apply string-append (map (lambda (argument) (string-append " " argument)) - arguments)))) \ No newline at end of file + arguments)))) diff --git a/edwin/dosproc.scm b/edwin/dosproc.scm index 082910f..6990ba8 100644 --- a/edwin/dosproc.scm +++ b/edwin/dosproc.scm @@ -27,7 +27,7 @@ USA. ;;;; Dummy subprocess support ;; package: (edwin process) -(declare (usual-integrations)) + (define subprocesses-available? #f) @@ -54,4 +54,4 @@ USA. #f) (define (process-output-available?) - #f) \ No newline at end of file + #f) diff --git a/edwin/dosshell.scm b/edwin/dosshell.scm index b40cbe9..8f23b58 100644 --- a/edwin/dosshell.scm +++ b/edwin/dosshell.scm @@ -27,7 +27,7 @@ USA. ;;;; Pseudo Shell subprocess in a buffer ;;; Inspired by "cmushell.el", by Olin Shivers. -(declare (usual-integrations)) + (load-option 'DOSPROCESS) @@ -123,7 +123,7 @@ and tracking directories." (define (insert-pseudo-shell-prompt! #!optional point) ;; This corresponds to the $p$g prompt pattern. (insert-string (string-append - (pseudo-directory-namestring + (pseudo-directory-namestring (buffer-default-directory (current-buffer))) ">") (if (default-object? point) @@ -326,4 +326,4 @@ With argument, don't skip the prompt -- go straight to column 0." (define-variable-local-value! (mark-buffer output-mark) (ref-variable-object pseudo-shell-active?) false) - (message "Pseudo exitted")))))) \ No newline at end of file + (message "Pseudo exitted")))))) diff --git a/edwin/ed-ffi.scm b/edwin/ed-ffi.scm index 7bb1555..eff0628 100644 --- a/edwin/ed-ffi.scm +++ b/edwin/ed-ffi.scm @@ -24,7 +24,7 @@ USA. |# -(declare (usual-integrations)) + ;; This list must be kept in alphabetical order by filename. @@ -185,4 +185,4 @@ USA. ("window" (edwin window)) ("winout" (edwin window-output-port)) ("xform" (edwin class-macros transform-instance-variables)) - ("xterm" (edwin screen x-screen)))) \ No newline at end of file + ("xterm" (edwin screen x-screen)))) diff --git a/edwin/editor.scm b/edwin/editor.scm index 51888bd..329f15f 100644 --- a/edwin/editor.scm +++ b/edwin/editor.scm @@ -26,7 +26,7 @@ USA. ;;;; Editor Top Level -(declare (usual-integrations)) + (define (edit . args) (call-with-current-continuation @@ -156,7 +156,7 @@ USA. (if (null? display-type-names) (find-any) (let ((next (name->display-type (car display-type-names)))) - (if (and next + (if (and next (display-type/available? next)) next (find-preferred (cdr display-type-names)))))) @@ -660,4 +660,4 @@ TRANSCRIPT messages appear in transcript buffer, if it is enabled; (with-interrupt-mask interrupt-mask (lambda (interrupt-mask) interrupt-mask - (processor)))))))) \ No newline at end of file + (processor)))))))) diff --git a/edwin/edtfrm.scm b/edwin/edtfrm.scm index 400e564..49c8cca 100644 --- a/edwin/edtfrm.scm +++ b/edwin/edtfrm.scm @@ -26,7 +26,7 @@ USA. ;;;; Editor Frame -(declare (usual-integrations)) + ;;; Editor Frame @@ -187,4 +187,4 @@ USA. (make-button-event frame relative-x relative-y) (lambda () (execute-command command))))) ((button-down? button) - (editor-beep))))))) \ No newline at end of file + (editor-beep))))))) diff --git a/edwin/edtstr.scm b/edwin/edtstr.scm index fc323d6..62dd94c 100644 --- a/edwin/edtstr.scm +++ b/edwin/edtstr.scm @@ -26,7 +26,7 @@ USA. ;;;; Editor Data Abstraction -(declare (usual-integrations)) + (define-structure (editor (constructor %make-editor)) (name #f read-only #t) @@ -158,4 +158,4 @@ USA. unspecific) thunk (lambda () - (set-editor-button-event! current-editor old-button-event))))) \ No newline at end of file + (set-editor-button-event! current-editor old-button-event))))) diff --git a/edwin/evlcom.scm b/edwin/evlcom.scm index fc16435..26e11bd 100644 --- a/edwin/evlcom.scm +++ b/edwin/evlcom.scm @@ -27,7 +27,7 @@ USA. ;;;; Evaluation Commands ;;; Package: (edwin) -(declare (usual-integrations)) + ;;;; Variables @@ -567,4 +567,4 @@ Set by Scheme evaluation code to update the mode line." (local-set-variable! evaluate-in-inferior-repl #f buffer) (local-set-variable! run-light #f buffer)))) - buffer))))) \ No newline at end of file + buffer))))) diff --git a/edwin/eystep.scm b/edwin/eystep.scm index 302a3f5..2cb6862 100644 --- a/edwin/eystep.scm +++ b/edwin/eystep.scm @@ -26,7 +26,7 @@ USA. ;;;; Edwin Interface to YStep -(declare (usual-integrations)) + (define-command step-expression "Single-step an expression." @@ -128,7 +128,7 @@ c contract the step under the cursor") (define-command stepper-contract "Contract the current step." () - (lambda () + (lambda () (let ((state (current-stepper-state)) (node (current-node))) (ynode-contract! node) @@ -286,4 +286,4 @@ c contract the step under the cursor") (if region-munger (region-munger (make-region start point))) (mark-temporary! start))) -(initialize-package!) \ No newline at end of file +(initialize-package!) diff --git a/edwin/filcom.scm b/edwin/filcom.scm index 5543fa5..e18032a 100644 --- a/edwin/filcom.scm +++ b/edwin/filcom.scm @@ -26,7 +26,7 @@ USA. ;;;; File Commands -(declare (usual-integrations)) + (define (find-file filename) (select-buffer (find-file-noselect filename #t))) @@ -896,4 +896,4 @@ Prefix arg means treat the plaintext file as binary data." (sort filenames stringnamestring filename))) \ No newline at end of file + (os/completion-ignore-filename? (->namestring filename))) diff --git a/edwin/fileio.scm b/edwin/fileio.scm index 7736d27..57e9313 100644 --- a/edwin/fileio.scm +++ b/edwin/fileio.scm @@ -26,7 +26,7 @@ USA. ;;;; File <-> Buffer I/O -(declare (usual-integrations)) + ;;;; Encrypted files @@ -173,7 +173,7 @@ of the predicates is satisfied, the file is written in the usual way." (define (insert-file mark filename) (%insert-file - mark + mark (bind-condition-handler (list condition-type:file-error) (lambda (condition) condition @@ -795,4 +795,4 @@ Otherwise, a message is written both before and after long file writes." (file-chase-links (pathname-simplify (merge-pathnames contents (directory-pathname pathname)))) - pathname))) \ No newline at end of file + pathname))) diff --git a/edwin/fill.scm b/edwin/fill.scm index fe4d4e3..9d6e043 100644 --- a/edwin/fill.scm +++ b/edwin/fill.scm @@ -26,7 +26,7 @@ USA. ;;;; Text Fill Commands -(declare (usual-integrations)) + (define-variable-per-buffer fill-column "Column beyond which automatic line-wrapping should happen. @@ -581,4 +581,4 @@ With argument, turn auto-fill mode on iff argument is positive." (begin (move-mark-to! m (line-end m 1 'ERROR)) (loop))))) - (mark-temporary! m))) \ No newline at end of file + (mark-temporary! m))) diff --git a/edwin/hlpcom.scm b/edwin/hlpcom.scm index 4fb3a29..a7ab6d8 100644 --- a/edwin/hlpcom.scm +++ b/edwin/hlpcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Help Commands -(declare (usual-integrations)) + (define-command help-prefix "This is a prefix for more commands. @@ -439,4 +439,4 @@ If you want VALUE to be a string, you must surround it with doublequotes." (define (finish start) (list (substring string start end))) - (apply string-append (find-escape 0 (buffer-comtabs buffer))))) \ No newline at end of file + (apply string-append (find-escape 0 (buffer-comtabs buffer))))) diff --git a/edwin/htmlmode.scm b/edwin/htmlmode.scm index 318dba2..ebee7a4 100644 --- a/edwin/htmlmode.scm +++ b/edwin/htmlmode.scm @@ -26,7 +26,7 @@ USA. ;;;; Major Mode for XML -(declare (usual-integrations)) + (define-major-mode xml text "XML" "Major mode for editing XML. @@ -104,4 +104,4 @@ USA. (define-editor-alias command html-mode xml-mode) (define-editor-alias variable html-mode-hook xml-mode-hook) (define-editor-alias variable html-mode-abbrev-table xml-mode-abbrev-table) -(define html-syntax-table xml-syntax-table) \ No newline at end of file +(define html-syntax-table xml-syntax-table) diff --git a/edwin/image.scm b/edwin/image.scm index aa18573..c571cb1 100644 --- a/edwin/image.scm +++ b/edwin/image.scm @@ -26,7 +26,7 @@ USA. ;;;; Display Imaging -(declare (usual-integrations)) + (define (group-columns group start end column tab-width char-image-strings) (let ((text (group-text group)) @@ -412,4 +412,3 @@ USA. (begin (string-set! image image-index (string-ref picture i)) (loop (fix:+ i 1) (fix:+ image-index 1)))))))))) - diff --git a/edwin/info.scm b/edwin/info.scm index bc47691..ad5bf8c 100644 --- a/edwin/info.scm +++ b/edwin/info.scm @@ -27,7 +27,7 @@ USA. ;;;; Info Mode ;;; Shamelessly copied from GNU Emacs. -(declare (usual-integrations)) + (define-command info "Create a buffer for Info, the documentation browser program." @@ -1268,4 +1268,4 @@ The name may be an abbreviation of the reference name." (if (and (integer? index) (positive? index)) (-1+ index) - (lose))))))) \ No newline at end of file + (lose))))))) diff --git a/edwin/input.scm b/edwin/input.scm index 97714e3..7455162 100644 --- a/edwin/input.scm +++ b/edwin/input.scm @@ -26,7 +26,7 @@ USA. ;;;; Keyboard Input -(declare (usual-integrations)) + #| @@ -290,4 +290,4 @@ B 3BAB8C (set-current-message! command-prompt-string)) (clear-current-message!)))) (reader))) - discard?))) \ No newline at end of file + discard?))) diff --git a/edwin/intmod.scm b/edwin/intmod.scm index 66b3a5d..2371916 100644 --- a/edwin/intmod.scm +++ b/edwin/intmod.scm @@ -27,7 +27,7 @@ USA. ;;;; Inferior REPL Mode ;;; Package: (edwin inferior-repl) -(declare (usual-integrations)) + (define-variable repl-enable-transcript-buffer "If true, record input and output from inferior REPLs in transcript buffer. @@ -1183,4 +1183,4 @@ If this is an error, the debugger examines the error condition." (READ ,operation/read) (CURRENT-EXPRESSION-CONTEXT ,operation/current-expression-context) (WRITE-VALUES ,operation/write-values)) - #f)) \ No newline at end of file + #f)) diff --git a/edwin/iserch.scm b/edwin/iserch.scm index 611a222..9e6678b 100644 --- a/edwin/iserch.scm +++ b/edwin/iserch.scm @@ -26,7 +26,7 @@ USA. ;;;; Incremental Search -(declare (usual-integrations)) + (define (isearch forward? regexp?) (reset-command-prompt!) @@ -364,4 +364,4 @@ USA. (let ((end (group-start start))) (if regexp? (re-search-backward text start end) - (search-backward text start end))))))))))))) \ No newline at end of file + (search-backward text start end))))))))))))) diff --git a/edwin/javamode.scm b/edwin/javamode.scm index f42df98..972c3e3 100644 --- a/edwin/javamode.scm +++ b/edwin/javamode.scm @@ -35,7 +35,7 @@ USA. ;;; could be done using the keyparser, but that would be much more ;;; work than this was. -(declare (usual-integrations)) + (define-major-mode java c "Java" "Major mode for editing Java code. @@ -132,4 +132,4 @@ This is just like C mode, except that (define php-syntax-table (let ((syntax-table (make-char-syntax-table java-syntax-table))) (set-char-syntax! syntax-table #\$ ". p") - syntax-table)) \ No newline at end of file + syntax-table)) diff --git a/edwin/key-w32.scm b/edwin/key-w32.scm index bbc5b43..29eb327 100644 --- a/edwin/key-w32.scm +++ b/edwin/key-w32.scm @@ -27,7 +27,7 @@ USA. ;;;; Windows Keys ;;; Package: (edwin win32-keys) -(declare (usual-integrations)) + (define (initialize-package!) (set! end (make-special-key 'END 0)) @@ -151,4 +151,4 @@ USA. (VK_NONAME #xFC) (VK_PA1 #xFD) (VK_OEM_CLEAR #xFE))) - v)) \ No newline at end of file + v)) diff --git a/edwin/keymap.scm b/edwin/keymap.scm index dce74ab..9b7810d 100644 --- a/edwin/keymap.scm +++ b/edwin/keymap.scm @@ -26,7 +26,7 @@ USA. ;;;; Command Summary -(declare (usual-integrations)) + (define-command describe-bindings "Show a list of all defined keys, and their definitions. @@ -210,4 +210,4 @@ Previous contents of that buffer are killed first." (caar last)) command-name) (group-elements (cdr last)))) - (cons (car elements) (group-elements (cdr elements))))))) \ No newline at end of file + (cons (car elements) (group-elements (cdr elements))))))) diff --git a/edwin/keyparse.scm b/edwin/keyparse.scm index 0c70e67..3c03090 100644 --- a/edwin/keyparse.scm +++ b/edwin/keyparse.scm @@ -26,7 +26,7 @@ USA. ;;;; Keyword Syntax Parser -(declare (usual-integrations)) + (define-structure (description (keyword-constructor make-keyparser-description) @@ -174,7 +174,7 @@ See \\[complete-keyword]." "Perform completion on keyword preceding point." () (lambda () - (let ((end + (let ((end (let ((point (current-point))) (let ((end (group-end point))) (or (re-match-forward "\\sw+" point end #f) @@ -518,4 +518,4 @@ See \\[complete-keyword]." (let ((match-header (keyparser-fragment/match-header fragment))) (if match-header (match-header end stack) - end))))) \ No newline at end of file + end))))) diff --git a/edwin/kilcom.scm b/edwin/kilcom.scm index 7a711e1..35e367a 100644 --- a/edwin/kilcom.scm +++ b/edwin/kilcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Kill Commands -(declare (usual-integrations)) + ;;;; Deletion @@ -71,7 +71,7 @@ Negative args kill characters backward." (define-command kill-line "Kill to end of line, or kill an end of line. At the end of a line (only blanks following) kill through the newline. -Otherwise, kill the rest of the line but not the newline. +Otherwise, kill the rest of the line but not the newline. With argument (positive or negative), kill specified number of lines. An argument of zero means kill to beginning of line, nothing if at beginning. Killed text is pushed onto the kill ring for retrieval." @@ -430,4 +430,4 @@ are transposed." (let ((char (extract-left-char m1))) (delete-left-char m1) (insert-char char m*)) - (set-current-point! m*))) \ No newline at end of file + (set-current-point! m*))) diff --git a/edwin/kmacro.scm b/edwin/kmacro.scm index ff1337e..1ba52c5 100644 --- a/edwin/kmacro.scm +++ b/edwin/kmacro.scm @@ -26,7 +26,7 @@ USA. ;;;; Keyboard Macros -(declare (usual-integrations)) + (define *defining-keyboard-macro?* #f) (define *executing-keyboard-macro?* #f) @@ -254,4 +254,4 @@ Without argument, reads a character. Your options are: (loop)) (else (editor-beep) - (loop)))))))))) \ No newline at end of file + (loop)))))))))) diff --git a/edwin/lincom.scm b/edwin/lincom.scm index a5284a3..ef8c6a9 100644 --- a/edwin/lincom.scm +++ b/edwin/lincom.scm @@ -26,7 +26,7 @@ USA. ;;;; Line/Indentation Commands -(declare (usual-integrations)) + ;;;; Lines @@ -379,7 +379,7 @@ With argument COLUMN, indent each line to that column." Inserts a newline, and then enough tabs/spaces so that what had been the rest of the current line is indented as much as it had been. Point does not move, except to skip over indentation -that originally followed it. +that originally followed it. With argument, makes extra blank lines in between." "p" (lambda (argument) @@ -519,4 +519,4 @@ The variable tab-width controls the action." (delete-string start (re-match-end 0)) (insert-horizontal-space end-column start tab-width))) (mark-temporary! start) - (mark-temporary! end))) \ No newline at end of file + (mark-temporary! end))) diff --git a/edwin/linden.scm b/edwin/linden.scm index 03aec03..5e32f3c 100644 --- a/edwin/linden.scm +++ b/edwin/linden.scm @@ -26,7 +26,7 @@ USA. ;;;; Lisp Indentation -(declare (usual-integrations)) + (define-variable lisp-indent-offset "If not false, the number of extra columns to indent a subform." @@ -361,4 +361,4 @@ is used to calculate the indentation for that form." (if (= -1 n) (cdr stack) (down-stack (1+ n) (cdr stack)))) (define (up-stack n stack) - (if (= 1 n) (cons false stack) (up-stack (-1+ n) (cons false stack)))) \ No newline at end of file + (if (= 1 n) (cons false stack) (up-stack (-1+ n) (cons false stack)))) diff --git a/edwin/loadef.scm b/edwin/loadef.scm index d8502d0..1c90589 100644 --- a/edwin/loadef.scm +++ b/edwin/loadef.scm @@ -26,7 +26,7 @@ USA. ;;;; Autoload Definitions -(declare (usual-integrations)) + ;;; **************** @@ -139,7 +139,7 @@ Otherwise, a new buffer is created for each topic." boolean?) (define-variable manual-command - "A string containing the manual page formatting command. + "A string containing the manual page formatting command. Section (if any) and topic strings are appended (with space separators) and the resulting string is provided to a shell running in a subprocess." false @@ -425,4 +425,4 @@ This defaults to the value of `user-mail-address'." 'DOSSHELL "Major mode for executing DOS commands.") (define-autoload-command 'shell 'DOSSHELL - "Run an inferior pseudo shell, with I/O through buffer *shell*."))) \ No newline at end of file + "Run an inferior pseudo shell, with I/O through buffer *shell*."))) diff --git a/edwin/lspcom.scm b/edwin/lspcom.scm index 01caf09..7dc206f 100644 --- a/edwin/lspcom.scm +++ b/edwin/lspcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Lisp Commands -(declare (usual-integrations)) + ;;;; S-expression Commands @@ -299,4 +299,4 @@ No argument is equivalent to zero: just insert () and leave point between." (lambda (f b) (set! forward-definition-end f) (set! backward-definition-end b) - unspecific)) \ No newline at end of file + unspecific)) diff --git a/edwin/macros.scm b/edwin/macros.scm index 92955f9..670da0d 100644 --- a/edwin/macros.scm +++ b/edwin/macros.scm @@ -26,7 +26,7 @@ USA. ;;;; Editor Macros -(declare (usual-integrations)) + ;; Upwards compatibility: (define edwin-syntax-table (->environment '(EDWIN))) @@ -261,4 +261,4 @@ USA. (ill-formed-syntax form))))) (define (mode-name->scheme-name name) - (symbol 'edwin-mode$ name)) \ No newline at end of file + (symbol 'edwin-mode$ name)) diff --git a/edwin/make.scm b/edwin/make.scm index 00e91d1..b9715e0 100644 --- a/edwin/make.scm +++ b/edwin/make.scm @@ -26,7 +26,7 @@ USA. ;;;; Edwin: System Construction -(declare (usual-integrations)) + (load-option 'xml) (with-loader-base-uri (system-library-uri "edwin/") @@ -34,4 +34,4 @@ USA. (load-package-set "edwin" `((alternate-package-loader . ,(load "edwin.bld" system-global-environment)))))) -(add-subsystem-identification! "Edwin" '(3 117)) \ No newline at end of file +(add-subsystem-identification! "Edwin" '(3 117)) diff --git a/edwin/malias.scm b/edwin/malias.scm index 99b008f..cb6c7db 100644 --- a/edwin/malias.scm +++ b/edwin/malias.scm @@ -26,7 +26,7 @@ USA. ;;;; Mail Aliases -(declare (usual-integrations)) + (define-command define-mail-alias "Define NAME as a mail-alias that translates to DEFINITION." @@ -172,4 +172,4 @@ USA. (define char-set:newline (char-set #\newline)) (define char-set:blank (char-set #\space #\tab)) -(define char-set:nonblank (char-set-invert char-set:blank)) \ No newline at end of file +(define char-set:nonblank (char-set-invert char-set:blank)) diff --git a/edwin/manual.scm b/edwin/manual.scm index b6da05b..af270a6 100644 --- a/edwin/manual.scm +++ b/edwin/manual.scm @@ -26,7 +26,7 @@ USA. ;;;; Display Manual Pages -(declare (usual-integrations)) + (define-command manual-entry "Display the Unix manual entry for TOPIC. @@ -202,4 +202,4 @@ The current buffer should contain a formatted manual entry." (group-right-char group index))) (find-end (fix:+ index 1)) (group-delete! group nl+2 index)))) - (loop nl+2)))))))))) \ No newline at end of file + (loop nl+2)))))))))) diff --git a/edwin/midas.scm b/edwin/midas.scm index 2a78d00..2f403b7 100644 --- a/edwin/midas.scm +++ b/edwin/midas.scm @@ -26,7 +26,7 @@ USA. ;;;; Midas Mode -(declare (usual-integrations)) + (define-command midas-mode "Enter Midas mode." @@ -62,4 +62,4 @@ USA. (if (match-forward ";;;" mark) 0 (max (+ (mark-column (horizontal-space-start mark)) 1) - (ref-variable comment-column mark)))) \ No newline at end of file + (ref-variable comment-column mark)))) diff --git a/edwin/modefs.scm b/edwin/modefs.scm index 3c5e842..5b096dd 100644 --- a/edwin/modefs.scm +++ b/edwin/modefs.scm @@ -26,7 +26,7 @@ USA. ;;;; Fundamental Mode -(declare (usual-integrations)) + (define-command fundamental-mode "Make the current mode be Fundamental Mode. @@ -395,4 +395,4 @@ Like Fundamental mode, but no self-inserting characters.") (define-key 'fundamental '(#\c-x #\v #\v) 'vc-next-action) (define-key 'fundamental '(#\c-x #\v #\=) 'vc-diff) (define-key 'fundamental '(#\c-x #\v #\~) 'vc-version-other-window) - )) \ No newline at end of file + )) diff --git a/edwin/modes.scm b/edwin/modes.scm index 4f50d64..1e8212b 100644 --- a/edwin/modes.scm +++ b/edwin/modes.scm @@ -26,7 +26,7 @@ USA. ;;;; Modes -(declare (usual-integrations)) + (define-structure (mode (constructor %make-mode @@ -138,4 +138,4 @@ USA. (let ((m1 (mode-super-mode m1))) (and m1 (or (eq? m1 m2) - (loop m1)))))) \ No newline at end of file + (loop m1)))))) diff --git a/edwin/modlin.scm b/edwin/modlin.scm index 48b7b7e..0e91f56 100644 --- a/edwin/modlin.scm +++ b/edwin/modlin.scm @@ -27,7 +27,7 @@ USA. ;;;; Modeline Format ;;; package: (edwin mode-line-format) -(declare (usual-integrations)) + (define-variable-per-buffer mode-line-format "Template for displaying mode line for current buffer. @@ -368,4 +368,4 @@ If #F, the normal method is used." (set-variable-local-value! buffer minor-mode-alist - (del-assq predicate (variable-local-value buffer minor-mode-alist))))) \ No newline at end of file + (del-assq predicate (variable-local-value buffer minor-mode-alist))))) diff --git a/edwin/modwin.scm b/edwin/modwin.scm index 9fcdebe..a7f73ee 100644 --- a/edwin/modwin.scm +++ b/edwin/modwin.scm @@ -26,7 +26,7 @@ USA. ;;;; Modeline Window -(declare (usual-integrations)) + (define-class modeline-window vanilla-window (shows-buffer-modified?)) @@ -79,4 +79,4 @@ USA. (if (not (boolean=? (buffer-modified? (window-buffer (window-superior window))) (modeline-window/shows-buffer-modified? window))) - (window-needs-redisplay! window))) \ No newline at end of file + (window-needs-redisplay! window))) diff --git a/edwin/motcom.scm b/edwin/motcom.scm index 281f321..3536853 100644 --- a/edwin/motcom.scm +++ b/edwin/motcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Motion Commands -(declare (usual-integrations)) + (define-command beginning-of-line "Move point to beginning of line." @@ -186,4 +186,4 @@ Continuation lines are skipped." "Deliver super menu joke." () (lambda () - (message "Big Mac, Medium Fries, Small Coke"))) \ No newline at end of file + (message "Big Mac, Medium Fries, Small Coke"))) diff --git a/edwin/motion.scm b/edwin/motion.scm index c2d8ee4..3c2756b 100644 --- a/edwin/motion.scm +++ b/edwin/motion.scm @@ -26,7 +26,7 @@ USA. ;;;; Motion within Groups -(declare (usual-integrations)) + ;;;; Motion by Characters @@ -195,4 +195,4 @@ USA. column (group-tab-width group) (group-char-image-strings group)) - 0)))) \ No newline at end of file + 0)))) diff --git a/edwin/mousecom.scm b/edwin/mousecom.scm index 0904d95..c9e010f 100644 --- a/edwin/mousecom.scm +++ b/edwin/mousecom.scm @@ -26,7 +26,7 @@ USA. ;;;; Mouse Commands -(declare (usual-integrations)) + (define-command mouse-select "Select window the mouse is on." @@ -121,4 +121,4 @@ Display cursor at that position for a second." (define button2-up (make-up-button 1)) (define button3-up (make-up-button 2)) (define button4-up (make-up-button 3)) -(define button5-up (make-up-button 4)) \ No newline at end of file +(define button5-up (make-up-button 4)) diff --git a/edwin/nntp.scm b/edwin/nntp.scm index 7d58722..43ce471 100644 --- a/edwin/nntp.scm +++ b/edwin/nntp.scm @@ -36,7 +36,7 @@ USA. ;;; it contains, and the headers in each group. It also provides a ;;; method for combining headers into conversation threads. -(declare (usual-integrations)) + ;;;; NNTP Connection @@ -1869,4 +1869,4 @@ USA. (loop (cdr items) (if (memq (car items) result) result - (cons (car items) result)))))) \ No newline at end of file + (cons (car items) result)))))) diff --git a/edwin/notify.scm b/edwin/notify.scm index 2b13af2..a67b5ff 100644 --- a/edwin/notify.scm +++ b/edwin/notify.scm @@ -26,7 +26,7 @@ USA. ;;;; Mode-line notifications (e.g. presence of mail, load average) -(declare (usual-integrations)) + (define-variable notify-show-time "If true, the notifier displays the current time." @@ -73,7 +73,7 @@ USA. (let ((result (if (re-search-forward ".*load average:[ ]*\\([0-9.]*\\)," - start + start (buffer-end temporary-buffer)) (extract-string (re-match-start 1) (re-match-end 1)) @@ -213,4 +213,4 @@ which can show various things including time, load average, and mail status." (set! notifier-thread-registration #f) unspecific)))) (update-notifier-strings! "" "") - (set-variable! global-mode-string override-notifier-mail-string #f))) \ No newline at end of file + (set-variable! global-mode-string override-notifier-mail-string #f))) diff --git a/edwin/nvector.scm b/edwin/nvector.scm index 9403ce1..9279975 100644 --- a/edwin/nvector.scm +++ b/edwin/nvector.scm @@ -26,10 +26,10 @@ USA. ;;;; New Vector Operations -(declare (usual-integrations)) + (define (vector-delq! vector index item) (vector-set! vector index (delq! item (vector-ref vector index)))) (define (vector-push! vector index item) - (vector-set! vector index (cons item (vector-ref vector index)))) \ No newline at end of file + (vector-set! vector index (cons item (vector-ref vector index)))) diff --git a/edwin/occur.scm b/edwin/occur.scm index 9fb094f..bd72a52 100644 --- a/edwin/occur.scm +++ b/edwin/occur.scm @@ -26,7 +26,7 @@ USA. ;;;; Occurrence Commands -(declare (usual-integrations)) + (define-command keep-lines "Delete all lines except those containing matches for REGEXP. @@ -277,4 +277,4 @@ It serves as a menu to find any of the occurrences in this buffer. (insert-region ls le output) (insert-newline output) (if (and (not (group-end? le)) (> n 1)) - (loop (mark1+ le) (- n 1)))))))))) \ No newline at end of file + (loop (mark1+ le) (- n 1)))))))))) diff --git a/edwin/outline.scm b/edwin/outline.scm index ed50899..f0a2461 100644 --- a/edwin/outline.scm +++ b/edwin/outline.scm @@ -26,7 +26,7 @@ USA. ;;;; Outline minor mode -(declare (usual-integrations)) + (define (%forward-up-topic start end outline-pattern) (if (not (mark<= start end)) (error "Marks incorrectly related:" start end)) @@ -286,4 +286,4 @@ With argument, turn outline mode on iff argument is positive." (define-key 'outline '(#\C-c #\C-n) 'narrow-to-topic) (define-key 'outline '(#\C-c #\C-a) 'forward-up-topic) (define-key 'outline '(#\C-c #\C-u) 'backward-up-topic) -(define-key 'outline '(#\C-c #\C-d) 'forward-down-topic) \ No newline at end of file +(define-key 'outline '(#\C-c #\C-d) 'forward-down-topic) diff --git a/edwin/paredit.scm b/edwin/paredit.scm index d93b450..a5b129b 100644 --- a/edwin/paredit.scm +++ b/edwin/paredit.scm @@ -7,7 +7,7 @@ Domain. All warranties are disclaimed. ;;;; Paredit: Parenthesis-Editing Minor Mode (based on paredit.el) -(declare (usual-integrations)) + (define-command paredit-mode "Toggle pseudo-structural editing of Lisp code. @@ -585,7 +585,7 @@ With a numerical prefix argument N, kill N S-expressions backward in (if argument (paredit-kill-surrounding-sexps-for-splice argument)) (let* ((before-open (backward-up-list (current-point) 1 'ERROR)) (before-close - (mark-1+ (forward-sexp before-open 1 'ERROR)))) + (mark-1+ (forward-sexp before-open 1 'ERROR)))) (delete-right-char before-close) (delete-right-char before-open) (with-current-point before-open diff --git a/edwin/pasmod.scm b/edwin/pasmod.scm index bd7ae97..e441bf9 100644 --- a/edwin/pasmod.scm +++ b/edwin/pasmod.scm @@ -26,7 +26,7 @@ USA. ;;;; Pascal Mode -(declare (usual-integrations)) + (define-command pascal-mode "Enter Pascal mode." @@ -164,4 +164,4 @@ With an argument, shifts left that many times." start)) (+ indentation (ref-variable pascal-shift-increment)) - indentation)))))))))) \ No newline at end of file + indentation)))))))))) diff --git a/edwin/paths.scm b/edwin/paths.scm index 7fac8c1..f1fa682 100644 --- a/edwin/paths.scm +++ b/edwin/paths.scm @@ -26,7 +26,7 @@ USA. ;;;; Edwin Pathnames -(declare (usual-integrations)) + (define (edwin-library-directory-pathname envvar required?) (let ((envval (get-environment-variable envvar))) @@ -60,4 +60,4 @@ USA. (define default-homedir-pathname ;; This binding exists to allow uses of the "home" directory as a ;; default directory to be overridden. - user-homedir-pathname) \ No newline at end of file + user-homedir-pathname) diff --git a/edwin/print.scm b/edwin/print.scm index 3f3c283..9266a16 100644 --- a/edwin/print.scm +++ b/edwin/print.scm @@ -26,7 +26,7 @@ USA. ;;;; Print Buffers and Regions -(declare (usual-integrations)) + (define-command lpr-buffer "Print buffer contents as with Unix command `lpr'. @@ -157,4 +157,4 @@ Variable LPR-SWITCHES is a list of extra switches (strings) to pass to lpr." false (begin (set! most-recent-name job-name) - job-name))))))) \ No newline at end of file + job-name))))))) diff --git a/edwin/process.scm b/edwin/process.scm index c43b876..3901e41 100644 --- a/edwin/process.scm +++ b/edwin/process.scm @@ -27,7 +27,7 @@ USA. ;;;; Subprocess Support ;; package: (edwin process) -(declare (usual-integrations)) + (define subprocesses-available? #t) @@ -700,4 +700,4 @@ Prefix arg means replace the region with it." (apply run-synchronous-process input-region output-mark directory pty? (ref-variable shell-file-name) - (os/form-shell-command command))) \ No newline at end of file + (os/form-shell-command command))) diff --git a/edwin/prompt.scm b/edwin/prompt.scm index 0a28895..fcca4b6 100644 --- a/edwin/prompt.scm +++ b/edwin/prompt.scm @@ -27,7 +27,7 @@ USA. ;;;; User Prompting ;;; Package: (edwin prompt) -(declare (usual-integrations)) + (define typein-edit-abort-flag "Abort") (define typein-edit-continuation) @@ -1130,4 +1130,4 @@ Set this to zero if you don't want pass-phrase retention." (lambda () (string-fill! clear-text #\NUL) (set! clear-text) - unspecific)))) \ No newline at end of file + unspecific)))) diff --git a/edwin/pwedit.scm b/edwin/pwedit.scm index 92244ae..f21c4c4 100644 --- a/edwin/pwedit.scm +++ b/edwin/pwedit.scm @@ -33,7 +33,7 @@ USA. ;;; displays a set of key names, and the user selectively reveals the ;;; password information hidden behind those keys. -(declare (usual-integrations)) + (define-command view-password-file "Read in a password file and show it in password-view mode. @@ -207,4 +207,4 @@ If password-file is #f, or if prefix arg supplied, prompts for a filename." (cond ((< column 8) "\t\t") ((< column 16) "\t") (else " "))) - point)) \ No newline at end of file + point)) diff --git a/edwin/pwparse.scm b/edwin/pwparse.scm index 7d24761..6e0037b 100644 --- a/edwin/pwparse.scm +++ b/edwin/pwparse.scm @@ -28,7 +28,7 @@ USA. ;;; This program implements I/O for a text-format password database. -(declare (usual-integrations)) + (define (read-pw-forms port) (parse/neutral port '())) @@ -179,4 +179,4 @@ USA. (cdr body))) (else (error "Illegal form type:" form))))) - forms))) \ No newline at end of file + forms))) diff --git a/edwin/rcsparse.scm b/edwin/rcsparse.scm index b30870f..466bda7 100644 --- a/edwin/rcsparse.scm +++ b/edwin/rcsparse.scm @@ -26,7 +26,7 @@ USA. ;;;; RCS Parser -(declare (usual-integrations)) + (define (parse-rcs-admin filename) (call-with-input-file filename @@ -482,4 +482,4 @@ USA. (define (rcs-semicolon? word) (and (pair? word) - (eq? 'SEMICOLON (car word)))) \ No newline at end of file + (eq? 'SEMICOLON (car word)))) diff --git a/edwin/reccom.scm b/edwin/reccom.scm index 00fa3a1..bf33143 100644 --- a/edwin/reccom.scm +++ b/edwin/reccom.scm @@ -26,7 +26,7 @@ USA. ;;;; Rectangle Commands -(declare (usual-integrations)) + (define rectangle-ring (list 'RECTANGLE)) @@ -109,7 +109,7 @@ The text previously in the region is overwritten by the blanks." (sl (string-length next$)) (final$ (if (< sl columns) (string-append next$ (Make-string (- columns sl) #\space)) - next$)) + next$)) (end-of-line (if line-mark (mark-left-inserting line-mark) (let () (insert-newline before-line-mark) before-line-mark))) @@ -127,4 +127,4 @@ The text previously in the region is overwritten by the blanks." "Yank the last killed rectangle with upper left corner at point." () (lambda () - (yank-rectangle rectangle-ring (current-point)))) \ No newline at end of file + (yank-rectangle rectangle-ring (current-point)))) diff --git a/edwin/regcom.scm b/edwin/regcom.scm index 676cb74..6fbcc25 100644 --- a/edwin/regcom.scm +++ b/edwin/regcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Register Commands -(declare (usual-integrations)) + (define-command point-to-register "Store current location of point in a register." @@ -188,4 +188,4 @@ With prefix arg, delete as well." (cadr position)) (define-integrable (buffer-position-buffer position) - (unhash-object (cddr position))) \ No newline at end of file + (unhash-object (cddr position))) diff --git a/edwin/regexp.scm b/edwin/regexp.scm index 4b7f052..1dd0cfa 100644 --- a/edwin/regexp.scm +++ b/edwin/regexp.scm @@ -26,7 +26,7 @@ USA. ;;;; Regular Expressions -(declare (usual-integrations)) + (define hash-of-false (hash-object #f)) (define match-group hash-of-false) @@ -251,4 +251,4 @@ USA. (define (compute-match-group group index) (if index (group-hash-number group) - hash-of-false)) \ No newline at end of file + hash-of-false)) diff --git a/edwin/regops.scm b/edwin/regops.scm index 564b468..1d3740f 100644 --- a/edwin/regops.scm +++ b/edwin/regops.scm @@ -26,7 +26,7 @@ USA. ;;;; Region/Mark Operations -(declare (usual-integrations)) + (define (region-insert! mark region) (let ((string (region->string region)) @@ -150,4 +150,4 @@ USA. (define (group-unclipped-region group) (make-region (make-mark group 0) - (make-mark group (group-length group)))) \ No newline at end of file + (make-mark group (group-length group)))) diff --git a/edwin/replaz.scm b/edwin/replaz.scm index b553fca..c5877f5 100644 --- a/edwin/replaz.scm +++ b/edwin/replaz.scm @@ -26,7 +26,7 @@ USA. ;;;; Replacement Commands -(declare (usual-integrations)) + (define-variable case-replace "If true, means replacement commands should preserve case." @@ -221,4 +221,4 @@ C-R to enter recursive edit, C-W to delete match and recursive edit, (push-current-mark! point) (if query? (query-loop point) - (replacement-loop point))))) \ No newline at end of file + (replacement-loop point))))) diff --git a/edwin/rfc822.scm b/edwin/rfc822.scm index 6b70ca6..54ecf8b 100644 --- a/edwin/rfc822.scm +++ b/edwin/rfc822.scm @@ -26,7 +26,7 @@ USA. ;;;; IMAIL mail reader: RFC-822 support -(declare (usual-integrations)) + (define rfc822:char-set:header-constituents (char-set-difference (ucs-range->char-set 33 127) @@ -575,4 +575,4 @@ USA. (define (char-lwsp? char) (or (char=? #\space char) - (char=? #\tab char))) \ No newline at end of file + (char=? #\tab char))) diff --git a/edwin/ring.scm b/edwin/ring.scm index add6bf7..55a9455 100644 --- a/edwin/ring.scm +++ b/edwin/ring.scm @@ -26,7 +26,7 @@ USA. ;;;; Rings -(declare (usual-integrations)) + (define (ring-list ring) (list-copy (vector-ref ring 2))) @@ -88,4 +88,4 @@ USA. (named-lambda (ring-set! ring index object) (list-set! (vector-ref ring 2) (modulo index (ring-size ring)) object))) -) \ No newline at end of file +) diff --git a/edwin/rmail.scm b/edwin/rmail.scm index 31e5bc9..f9fe6d2 100644 --- a/edwin/rmail.scm +++ b/edwin/rmail.scm @@ -26,7 +26,7 @@ USA. ;;;; RMAIL Mail Reader -(declare (usual-integrations)) + (define rmail-spool-directory #f) @@ -1481,7 +1481,7 @@ buffer visiting that file." rmail-summary-vector rmail-summary-buffer))) (if rmail-summary-vector - (vector-set! + (vector-set! rmail-summary-vector (- (msg-memo/number memo) 1) false))))) @@ -2203,4 +2203,4 @@ Note: it means the file has no messages in it.\n\037") "\n*\n\n----------------------------*\n*") (define digest-separator-replacement - (string-append "\n\037" babyl-initial-message-start)) \ No newline at end of file + (string-append "\n\037" babyl-initial-message-start)) diff --git a/edwin/rmailsrt.scm b/edwin/rmailsrt.scm index 3a1a1c9..2f2ad7e 100644 --- a/edwin/rmailsrt.scm +++ b/edwin/rmailsrt.scm @@ -26,7 +26,7 @@ USA. ;;;; RMAIL Sorting Utilities -(declare (usual-integrations)) + ;; GNUS compatible key bindings. (define-key 'rmail (list #\C-c #\C-s #\C-d) 'rmail-sort-by-date) @@ -35,12 +35,12 @@ USA. (define-key 'rmail (list #\C-c #\C-s #\C-r) 'rmail-sort-by-recipient) (define-key 'rmail (list #\C-c #\C-s #\C-l) 'rmail-sort-by-size-lines) -(define-command rmail-sort-by-date +(define-command rmail-sort-by-date "Sort messages of current Rmail file by date. If prefix argument REVERSE is non-nil, sort them in reverse order." "P" (lambda (reverse) - (rmail-sort-messages + (rmail-sort-messages reverse (lambda (memo) (fetch-first-field "date" (msg-memo/start memo) (msg-memo/end memo))) @@ -48,17 +48,17 @@ If prefix argument REVERSE is non-nil, sort them in reverse order." (stringascii boolean) - (if boolean (char->integer #\t) (char->integer #\f))) \ No newline at end of file + (if boolean (char->integer #\t) (char->integer #\f))) diff --git a/edwin/search.scm b/edwin/search.scm index 9d95c46..6e1a7c6 100644 --- a/edwin/search.scm +++ b/edwin/search.scm @@ -26,7 +26,7 @@ USA. ;;;; Search/Match Primitives -(declare (usual-integrations)) + (define-syntax define-next-char-search (sc-macro-transformer @@ -366,4 +366,4 @@ USA. (group-match-substring-backward group i end-index string 0 length)) i) - (make-mark group i))))) \ No newline at end of file + (make-mark group i))))) diff --git a/edwin/sendmail.scm b/edwin/sendmail.scm index 51e721e..3ac4368 100644 --- a/edwin/sendmail.scm +++ b/edwin/sendmail.scm @@ -26,7 +26,7 @@ USA. ;;;; Mail Sending -(declare (usual-integrations)) + (define-variable user-mail-address "Full mailing address of this user. @@ -1851,4 +1851,4 @@ This is a list, each element of which is a list of three items: (define mime-top-level-types (map (lambda (s) (cons (symbol->string s) s)) - '(TEXT IMAGE AUDIO VIDEO APPLICATION))) \ No newline at end of file + '(TEXT IMAGE AUDIO VIDEO APPLICATION))) diff --git a/edwin/sercom.scm b/edwin/sercom.scm index 11db52a..bf832ce 100644 --- a/edwin/sercom.scm +++ b/edwin/sercom.scm @@ -27,7 +27,7 @@ USA. ;;;; Search Commands ;;; package: (edwin) -(declare (usual-integrations)) + ;;;; Variables @@ -195,7 +195,7 @@ Set point to the end of the occurrence found." ((ref-command re-search-forward) toggle-case-fold? (string->wordified-regexp string (ref-variable syntax-table))))) - + (define-command word-search-backward "Search backward from point for STRING, ignoring differences in punctuation. Set point to the beginning of the occurrence found." @@ -342,4 +342,4 @@ Special characters: (group-start m))))))))) (if mark (set-current-point! mark) - (editor-failure))))))) \ No newline at end of file + (editor-failure))))))) diff --git a/edwin/shell.scm b/edwin/shell.scm index adab9c2..8733de1 100644 --- a/edwin/shell.scm +++ b/edwin/shell.scm @@ -27,7 +27,7 @@ USA. ;;;; Shell subprocess in a buffer ;;; Translated from "cmushell.el", by Olin Shivers. -(declare (usual-integrations)) + (define-variable shell-prompt-pattern "Regexp to match prompts in the inferior shell." @@ -41,7 +41,7 @@ USA. (define-major-mode shell comint "Shell" "Major mode for interacting with an inferior shell. -Return after the end of the process' output sends the text from the +Return after the end of the process' output sends the text from the end of process to the end of the current line. Return before end of process output copies rest of line to end (skipping the prompt) and sends it. @@ -455,4 +455,4 @@ those that effect file completion." (if (fix:< n (string-length prefix)) (string-head prefix n) prefix)) - (cdr strings))))) \ No newline at end of file + (cdr strings))))) diff --git a/edwin/simple.scm b/edwin/simple.scm index bfba8c7..c12b830 100644 --- a/edwin/simple.scm +++ b/edwin/simple.scm @@ -26,7 +26,7 @@ USA. ;;;; Simple Editing Procedures -(declare (usual-integrations)) + (define (insert-char char #!optional point) (let ((point (if (default-object? point) (current-point) point))) @@ -346,4 +346,4 @@ USA. (loop m) end)) mark) - end)))))))) \ No newline at end of file + end)))))))) diff --git a/edwin/snr.scm b/edwin/snr.scm index 7974644..c94df33 100644 --- a/edwin/snr.scm +++ b/edwin/snr.scm @@ -26,7 +26,7 @@ USA. ;;;; Scheme News Reader -(declare (usual-integrations)) + (load-option 'ORDERED-VECTOR) @@ -4762,4 +4762,4 @@ With prefix arg, replaces the file with the list information." (define (news-thread:clear-indices! thread) (news-thread:for-each-header thread (lambda (header) - (set-news-header:index! header #f)))) \ No newline at end of file + (set-news-header:index! header #f)))) diff --git a/edwin/sort.scm b/edwin/sort.scm index 77b3d06..431fb88 100644 --- a/edwin/sort.scm +++ b/edwin/sort.scm @@ -26,7 +26,7 @@ USA. ;;;; Sorting -(declare (usual-integrations)) + (define (sort-region region reverse? forward-record record-end @@ -195,4 +195,4 @@ the line. The last line is treated similarly." (lambda (mark) (line-end mark 0)) (lambda (mark end) end (move-to-column mark start-column)) (lambda (mark end) end (move-to-column mark end-column)) - sort-textual-comparison)))) \ No newline at end of file + sort-textual-comparison)))) diff --git a/edwin/string.scm b/edwin/string.scm index a7d6264..730c957 100644 --- a/edwin/string.scm +++ b/edwin/string.scm @@ -36,7 +36,7 @@ USA. ;;; version (prefixed with `%') that assumes all arguments have been ;;; checked. This avoids repeated argument checks. -(declare (usual-integrations)) + ;;;; Primitives @@ -1644,4 +1644,4 @@ USA. string2 start2 end2 procedure) (guarantee-substring string1 start1 end1 procedure) - (guarantee-substring string2 start2 end2 procedure)) \ No newline at end of file + (guarantee-substring string2 start2 end2 procedure)) diff --git a/edwin/strpad.scm b/edwin/strpad.scm index 5064d14..19330cc 100644 --- a/edwin/strpad.scm +++ b/edwin/strpad.scm @@ -26,7 +26,7 @@ USA. ;;;; String Padding Stuff -(declare (usual-integrations)) + (define (pad-on-right-to string n) (let ((l (string-length string))) @@ -65,4 +65,4 @@ USA. (loop strings i)) (begin (newline port) - (loop strings 0))))))))))) \ No newline at end of file + (loop strings 0))))))))))) diff --git a/edwin/strtab.scm b/edwin/strtab.scm index 9da6bf1..a5534dd 100644 --- a/edwin/strtab.scm +++ b/edwin/strtab.scm @@ -26,7 +26,7 @@ USA. ;;;; String Tables -(declare (usual-integrations)) + (define-structure (string-table (constructor %make-string-table)) vector @@ -208,4 +208,4 @@ USA. (lambda (index) (if (= index table-size) (if-not-found) - (perform-search index))))))) \ No newline at end of file + (perform-search index))))))) diff --git a/edwin/struct.scm b/edwin/struct.scm index 24fe24e..c72bc14 100644 --- a/edwin/struct.scm +++ b/edwin/struct.scm @@ -26,7 +26,7 @@ USA. ;;;; Text Data Structures -(declare (usual-integrations)) + ;;; This file describes the data structures used to represent and ;;; manipulate text within the editor. @@ -460,4 +460,4 @@ USA. (mark-index (region-start region))) (define-integrable (region-end-index region) - (mark-index (region-end region))) \ No newline at end of file + (mark-index (region-end region))) diff --git a/edwin/syntax.scm b/edwin/syntax.scm index 65e4594..5d098f8 100644 --- a/edwin/syntax.scm +++ b/edwin/syntax.scm @@ -26,7 +26,7 @@ USA. ;;;; Syntax Tables -(declare (usual-integrations)) + (define modify-syntax-entry! set-char-syntax!) @@ -291,11 +291,11 @@ a comment ending." state (make-mark group (parse-state-start-of-sexp state)))) (if (parse-state-last-sexp state) - (set-parse-state-last-sexp! - state + (set-parse-state-last-sexp! + state (make-mark group (parse-state-last-sexp state)))) (if (parse-state-containing-sexp state) - (set-parse-state-containing-sexp! + (set-parse-state-containing-sexp! state (make-mark group (parse-state-containing-sexp state)))) (set-parse-state-location! state @@ -431,4 +431,4 @@ a comment ending." (if (mark< end mark) end (let ((start (backward-one-definition-start start))) - (and start (forward-one-definition-end start))))))))) \ No newline at end of file + (and start (forward-one-definition-end start))))))))) diff --git a/edwin/tagutl.scm b/edwin/tagutl.scm index db2f291..b8869de 100644 --- a/edwin/tagutl.scm +++ b/edwin/tagutl.scm @@ -27,7 +27,7 @@ USA. ;;;; Tags Facility ;;; From GNU Emacs (thank you RMS) -(declare (usual-integrations)) + (define-variable tags-table-pathnames "List of pathnames of all of the active tags tables. @@ -97,7 +97,7 @@ See documentation of variable tags-table-pathnames." (append (list (car find-tag-pathnames-list)) (if included-pathnames included-pathnames - '()) + '()) (cdr find-tag-pathnames-list))))) (define (first-tags-table-buffer) @@ -114,7 +114,7 @@ See documentation of variable tags-table-pathnames." (if find-tag-pathnames-list (find-file-noselect (car find-tag-pathnames-list) #f) #f)) - + (define (next-tags-table-buffer) (if (and (pair? find-tag-pathnames-list) (pair? (cdr find-tag-pathnames-list))) @@ -384,7 +384,7 @@ killed if they are not modified." (pathnames->tags-table-buffers (ref-variable tags-table-pathnames))) (define (tags-table-pathnames buffers) - (append-map + (append-map (lambda (buffer) (or (buffer-get buffer 'TAGS-TABLE-PATHNAMES) (let ((directory @@ -435,4 +435,4 @@ killed if they are not modified." (append pathnames (get-all-pathnames (pathnames->tags-table-buffers includes))) - pathnames))) \ No newline at end of file + pathnames))) diff --git a/edwin/techinfo.scm b/edwin/techinfo.scm index ef36836..11b65d3 100644 --- a/edwin/techinfo.scm +++ b/edwin/techinfo.scm @@ -29,7 +29,7 @@ ;;; ;;; Author: Brian A. LaMacchia -- bal@zurich.ai.mit.edu -(declare (usual-integrations)) + (define-variable techinfo-web-buffer "Buffer which contains a copy of the TechInfo web file." @@ -433,4 +433,4 @@ no longer be valid." (cdr (ref-variable techinfo-history-list))) (techinfo-display-node new-node) (set-variable! techinfo-history-list - (cdr (ref-variable techinfo-history-list))))))) \ No newline at end of file + (cdr (ref-variable techinfo-history-list))))))) diff --git a/edwin/telnet.scm b/edwin/telnet.scm index 5254400..0589be0 100644 --- a/edwin/telnet.scm +++ b/edwin/telnet.scm @@ -26,15 +26,15 @@ USA. ;;;; Run Telnet in a buffer -(declare (usual-integrations)) + (define-variable telnet-prompt-pattern "#f or Regexp to match prompts in telnet buffers." - #f) + #f) (define-major-mode telnet comint "Telnet" "Major mode for interacting with the telnet program. -Return after the end of the process' output sends the text from the +Return after the end of the process' output sends the text from the end of process to the end of the current line. Return before end of process output copies rest of line to end (skipping the prompt) and sends it. @@ -116,4 +116,4 @@ With prefix arg, the character is repeated that many times." (cond ((= argument 1) (process-send-char process char)) ((> argument 1) - (process-send-string process (make-string argument char))))))) \ No newline at end of file + (process-send-string process (make-string argument char))))))) diff --git a/edwin/termcap.scm b/edwin/termcap.scm index e75038e..5c27f9f 100644 --- a/edwin/termcap.scm +++ b/edwin/termcap.scm @@ -26,7 +26,7 @@ USA. ;;;; Termcap(3) Interface -(declare (usual-integrations)) + (define-primitives (termcap-initialize 1) @@ -273,7 +273,7 @@ USA. ts-set-scroll-region-1 ts-set-window (termcap-get-string "vb") ;ts-visible-bell - + ; ts-keys (append-map (lambda (string.name) (let* ((string (car string.name)) @@ -330,5 +330,5 @@ USA. ("kP" . previous-page) ; previous-page key ("kF" . scroll-forward) ; scroll-forward / scroll-down ("kR" . scroll-backward) ; scroll-backward / scroll-up - ("kT" . set-tab) - )) \ No newline at end of file + ("kT" . set-tab) + )) diff --git a/edwin/texcom.scm b/edwin/texcom.scm index 5cf9863..e977300 100644 --- a/edwin/texcom.scm +++ b/edwin/texcom.scm @@ -26,7 +26,7 @@ USA. ;;;; Text Commands -(declare (usual-integrations)) + (define-major-mode text fundamental "Text" "Major mode for editing english text." @@ -264,4 +264,4 @@ See forward-paragraph for more information." (lambda () (let ((end (forward-paragraph (current-point) 1 'ERROR))) (set-current-region! - (make-region (backward-paragraph end 1 'ERROR) end))))) \ No newline at end of file + (make-region (backward-paragraph end 1 'ERROR) end))))) diff --git a/edwin/things.scm b/edwin/things.scm index 1a71ad5..c89ea29 100644 --- a/edwin/things.scm +++ b/edwin/things.scm @@ -26,7 +26,7 @@ USA. ;;;; Textual Entities -(declare (usual-integrations)) + ;;;; Motion Primitives @@ -315,4 +315,4 @@ USA. (cond ((positive? n) (%backward-line mark n limit?)) ((negative? n) (line-start mark (- n) limit?)) (else mark))))) - unspecific) \ No newline at end of file + unspecific) diff --git a/edwin/tparse.scm b/edwin/tparse.scm index 0b90d62..a609f39 100644 --- a/edwin/tparse.scm +++ b/edwin/tparse.scm @@ -26,7 +26,7 @@ USA. ;;;; Text Parsing -(declare (usual-integrations)) + ;;;; Pages @@ -336,4 +336,4 @@ All paragraph boundaries also end sentences, regardless." (lambda (f b) (set! forward-sentence f) (set! backward-sentence b) - unspecific)) \ No newline at end of file + unspecific)) diff --git a/edwin/tterm.scm b/edwin/tterm.scm index 666c935..ace8753 100644 --- a/edwin/tterm.scm +++ b/edwin/tterm.scm @@ -26,7 +26,7 @@ USA. ;;;; Termcap(3) Screen Implementation -(declare (usual-integrations)) + (define (make-console-screen) (let ((description (console-termcap-description))) @@ -1257,4 +1257,4 @@ Note that the multiply factors are in tenths of characters. |# (set-terminal-state/delete-line-cost! state delete-line-cost) (set-terminal-state/delete-line-next-cost! state delete-line-next-cost) (set-terminal-state/scroll-region-cost! state scroll-region-cost) - (set-screen-size! screen x-size y-size))))) \ No newline at end of file + (set-screen-size! screen x-size y-size))))) diff --git a/edwin/tximod.scm b/edwin/tximod.scm index 5c5b04d..e4b5b6c 100644 --- a/edwin/tximod.scm +++ b/edwin/tximod.scm @@ -26,7 +26,7 @@ USA. ;;;; Texinfo Mode -(declare (usual-integrations)) + (define-command texinfo-mode "Make the current mode be Texinfo mode." @@ -276,4 +276,4 @@ The default is not to surround any existing words with the braces." "tex" "titlepage" "vtable") - "\\>")) \ No newline at end of file + "\\>")) diff --git a/edwin/txtprp.scm b/edwin/txtprp.scm index cc3e495..adcd5ac 100644 --- a/edwin/txtprp.scm +++ b/edwin/txtprp.scm @@ -27,7 +27,7 @@ USA. ;;;; Text Properties ;;; An improved version of a mechanism from GNU Emacs 19 -(declare (usual-integrations)) + (define (add-text-property group start end key datum #!optional no-overwrite?) (validate-region-arguments group start end 'ADD-TEXT-PROPERTY) @@ -790,4 +790,4 @@ USA. (set-interval-total-length! y tlx))))) (define-integrable (rotate-! group x d) - (rotate+! group x (-d d))) \ No newline at end of file + (rotate+! group x (-d d))) diff --git a/edwin/undo.scm b/edwin/undo.scm index a434a02..a7250d8 100644 --- a/edwin/undo.scm +++ b/edwin/undo.scm @@ -26,7 +26,7 @@ USA. ;;;; Undo, translated from the GNU Emacs implementation in C/Emacs-Lisp. -(declare (usual-integrations)) + (define (enable-group-undo! group) (if (eq? #t (group-undo-data group)) diff --git a/edwin/unix.scm b/edwin/unix.scm index 4958aaa..c4e429b 100644 --- a/edwin/unix.scm +++ b/edwin/unix.scm @@ -26,7 +26,7 @@ USA. ;;;; Unix Customizations for Edwin -(declare (usual-integrations)) + (define-variable backup-by-copying-when-symlink "#T means use copying to create backups for a symbolic name. @@ -683,4 +683,4 @@ option, instead taking -P ." "/usr/local/lib/info" "/usr/local/info" "/usr/share/info" - "/usr/info")) \ No newline at end of file + "/usr/info")) diff --git a/edwin/utils.scm b/edwin/utils.scm index bc41153..eca6724 100644 --- a/edwin/utils.scm +++ b/edwin/utils.scm @@ -26,7 +26,7 @@ USA. ;;;; Editor Utilities -(declare (usual-integrations)) + ;; Allow gc and after-gc hooks. @@ -299,4 +299,4 @@ USA. condition-type:port-error) (lambda (condition) (continuation (if-error condition))) - thunk)))) \ No newline at end of file + thunk)))) diff --git a/edwin/utlwin.scm b/edwin/utlwin.scm index 7569c4a..33c43b0 100644 --- a/edwin/utlwin.scm +++ b/edwin/utlwin.scm @@ -26,7 +26,7 @@ USA. ;;;; Utility Windows -(declare (usual-integrations)) + ;;;; Blank Window @@ -124,4 +124,4 @@ USA. (define-method cursor-window (:disable! window) (set! enabled? false) - (set-car! redisplay-flags false)) \ No newline at end of file + (set-car! redisplay-flags false)) diff --git a/edwin/vc-bzr.scm b/edwin/vc-bzr.scm index 56dc6a7..2706011 100644 --- a/edwin/vc-bzr.scm +++ b/edwin/vc-bzr.scm @@ -26,7 +26,7 @@ USA. ;;;; Version Control: Bazaar -(declare (usual-integrations)) + (define vc-type:bzr (make-vc-type 'BZR "bzr" "\$Id\$")) @@ -343,4 +343,4 @@ USA. (case char ((#\space) #f) ((#\*) #t) - (else (error "Unknown status char 2:" char)))) \ No newline at end of file + (else (error "Unknown status char 2:" char)))) diff --git a/edwin/vc-cvs.scm b/edwin/vc-cvs.scm index 14f00d7..fc8c907 100644 --- a/edwin/vc-cvs.scm +++ b/edwin/vc-cvs.scm @@ -26,7 +26,7 @@ USA. ;;;; Version Control: CVS -(declare (usual-integrations)) + (define vc-type:cvs (make-vc-type 'CVS "CVS" "\$Id\$")) @@ -385,4 +385,4 @@ USA. #f) (else (pop-up-buffer buffer #f) - (error "Couldn't analyze cvs update result.")))))))) \ No newline at end of file + (error "Couldn't analyze cvs update result.")))))))) diff --git a/edwin/vc-git.scm b/edwin/vc-git.scm index 42df79c..7ca109e 100644 --- a/edwin/vc-git.scm +++ b/edwin/vc-git.scm @@ -26,7 +26,7 @@ USA. ;;;; Version Control: git -(declare (usual-integrations)) + (define vc-type:git (make-vc-type 'GIT "git" "\$Id\$")) @@ -253,4 +253,4 @@ USA. 'output port 'working-directory directory))) (and (eqv? status 0) - (get-output-string port)))))))) \ No newline at end of file + (get-output-string port)))))))) diff --git a/edwin/vc-rcs.scm b/edwin/vc-rcs.scm index d11960c..d918b7d 100644 --- a/edwin/vc-rcs.scm +++ b/edwin/vc-rcs.scm @@ -26,7 +26,7 @@ USA. ;;;; Version Control: RCS -(declare (usual-integrations)) + (define vc-type:rcs ;; Splitting up string constant prevents RCS from expanding this @@ -295,4 +295,4 @@ USA. (define-vc-type-operation 'CHECK-HEADERS vc-type:rcs (lambda (master buffer) master - (check-rcs-headers buffer))) \ No newline at end of file + (check-rcs-headers buffer))) diff --git a/edwin/vc-svn.scm b/edwin/vc-svn.scm index 6943a06..7ca9eaf 100644 --- a/edwin/vc-svn.scm +++ b/edwin/vc-svn.scm @@ -26,7 +26,7 @@ USA. ;;;; Version Control: Subversion -(declare (usual-integrations)) + (define vc-type:svn (make-vc-type 'SVN "SVN" "\$Id\$")) @@ -352,4 +352,4 @@ USA. (define (decode-svn-last-change-revision string) (if (string=? string "?") "0" - string)) \ No newline at end of file + string)) diff --git a/edwin/vc.scm b/edwin/vc.scm index 7aed72e..cb56b66 100644 --- a/edwin/vc.scm +++ b/edwin/vc.scm @@ -29,7 +29,7 @@ USA. ;;; Adapted from "vc.el" in Emacs 19.22. ;;; Updated March 2000 from "vc.el" in Emacs 20.6. -(declare (usual-integrations)) + ;;;; Editor Variables @@ -113,7 +113,7 @@ and that its contents match what the master file says." "Indicates what to do if you visit a symbolic link to a file that is under version control. Editing such a file through the link bypasses the version control system, which is dangerous and -probably not what you want. +probably not what you want. If this variable is #t, VC follows the link and visits the real file, telling you about it in the echo area. If it is `ask', VC asks for confirmation whether it should follow the link. If #f, the link is @@ -748,7 +748,7 @@ merge in the changes into your working copy." (define-command vc-diff "Display diffs between file versions. -Normally this compares the current file and buffer with the most recent +Normally this compares the current file and buffer with the most recent checked in version of that file. This uses no arguments. With a prefix argument, it reads the file name to use and two version designators specifying which versions to compare." @@ -988,12 +988,12 @@ Normally shows only locked files; prefix arg says to show all files." (define-major-mode vc-dired dired "VC-Dired" "The major mode used in VC directory buffers. It works like Dired, -but lists only files under version control, with the current VC state of -each file being indicated in the place of the file's link count, owner, -group and size. Subdirectories are also listed, and you may insert them +but lists only files under version control, with the current VC state of +each file being indicated in the place of the file's link count, owner, +group and size. Subdirectories are also listed, and you may insert them into the buffer as desired, as in Dired. All Dired commands operate normally, with the exception of `v', which -is redefined as the version control prefix, so that you can type +is redefined as the version control prefix, so that you can type `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on the file named in the current Dired buffer line. `vv' invokes `vc-next-action' on this file, or on all files currently marked. @@ -1499,7 +1499,7 @@ the value of vc-log-mode-hook." ;; Comparison runs till the end of the string is found, or a ;; non-numeric component shows up (5.6.7 is earlier than "5.6.7 beta", ;; which is probably not what you want in some cases). - ;; This code is suitable for existing RCS release numbers. + ;; This code is suitable for existing RCS release numbers. ;; CVS releases are handled reasonably, too (1.3 < 1.4* < 1.5). (let ((t1 (burst-string r1 #\space #t)) (t2 (burst-string r2 #\space #t))) @@ -1688,4 +1688,4 @@ the value of vc-log-mode-hook." (group-start-mark group)) ((mark> mark (group-end-mark group)) (group-end-mark group)) - (else mark)))))))) \ No newline at end of file + (else mark)))))))) diff --git a/edwin/verilog.scm b/edwin/verilog.scm index fb2933e..b66da5c 100644 --- a/edwin/verilog.scm +++ b/edwin/verilog.scm @@ -26,7 +26,7 @@ USA. ;;;; Major Mode for Verilog Programs -(declare (usual-integrations)) + (define-command verilog-mode "Enter Verilog mode." @@ -259,4 +259,4 @@ USA. parse-forward-past-semicolon) (define-standard-keyword "while" #f - forward-one-sexp) \ No newline at end of file + forward-one-sexp) diff --git a/edwin/vhdl.scm b/edwin/vhdl.scm index 2b1b220..c6914dc 100644 --- a/edwin/vhdl.scm +++ b/edwin/vhdl.scm @@ -26,7 +26,7 @@ USA. ;;;; Major Mode for VHDL Programs -(declare (usual-integrations)) + (define-command vhdl-mode "Enter VHDL mode." @@ -464,4 +464,4 @@ USA. (and (comatch-apply comatch:for-header:block mark) mark)) parse-forward-noop - end-frag) \ No newline at end of file + end-frag) diff --git a/edwin/webster.scm b/edwin/webster.scm index e6a6f84..ce3a909 100644 --- a/edwin/webster.scm +++ b/edwin/webster.scm @@ -29,7 +29,7 @@ USA. ;;; Translated from Noah Friedman's Emacs implementation: ;;; webster.el,v 1.2 1995/01/04 00:41:51 -(declare (usual-integrations)) + (define (webster-send request word) (guarantee-webster-server-port (selected-buffer)) @@ -187,4 +187,4 @@ Use webster-mode-hook for customization." "Close connection to webster server. Buffer is not deleted." () - (lambda () (close-webster-server-port))) \ No newline at end of file + (lambda () (close-webster-server-port))) diff --git a/edwin/win32.scm b/edwin/win32.scm index 3e24457..c675748 100644 --- a/edwin/win32.scm +++ b/edwin/win32.scm @@ -27,7 +27,7 @@ USA. ;;;; Win32 Terminal ;;; package: (edwin screen win32) -(declare (usual-integrations)) + (define-primitives (win32-read-event 0) @@ -682,4 +682,4 @@ USA. (and screen (make-input-event 'SELECT-SCREEN select-screen - screen)))))))) \ No newline at end of file + screen)))))))) diff --git a/edwin/win32com.scm b/edwin/win32com.scm index c9e86fd..8f0ed99 100644 --- a/edwin/win32com.scm +++ b/edwin/win32com.scm @@ -27,7 +27,7 @@ USA. ;;;; Win32 Commands ;;; package (edwin win-commands) -(declare (usual-integrations)) + (define-command set-icon "Set the current window's icon to ICON. @@ -145,4 +145,4 @@ desktop." (format-modeline-string window format length))))))) (update-name win32-screen/set-name! (ref-variable frame-name-format buffer) - (ref-variable frame-name-length buffer))))) \ No newline at end of file + (ref-variable frame-name-length buffer))))) diff --git a/edwin/wincom.scm b/edwin/wincom.scm index 1092b99..a258d4f 100644 --- a/edwin/wincom.scm +++ b/edwin/wincom.scm @@ -26,7 +26,7 @@ USA. ;;;; Window Commands -(declare (usual-integrations)) + (define-variable window-min-width "Delete any window less than this wide. @@ -701,4 +701,4 @@ moving over text in each one as far as they match." (set-window-point! w1 s1) (set-window-point! w2 s2) (if (mark= s1 p1) - (editor-beep))))))))) \ No newline at end of file + (editor-beep))))))))) diff --git a/edwin/window.scm b/edwin/window.scm index f395160..6ca1620 100644 --- a/edwin/window.scm +++ b/edwin/window.scm @@ -26,7 +26,7 @@ USA. ;;;; Window System -(declare (usual-integrations)) + ;;; Based on WINDOW-WIN, designed by RMS. ;;; See WINOPS.TXT for more information. @@ -510,4 +510,4 @@ USA. (fix:< y (inferior-y-size inferior))) (search (inferior-window inferior) x y) (loop (cdr inferiors)))) - (loop (cdr inferiors)))))))))) \ No newline at end of file + (loop (cdr inferiors)))))))))) diff --git a/edwin/winout.scm b/edwin/winout.scm index 344f3ac..b9eb491 100644 --- a/edwin/winout.scm +++ b/edwin/winout.scm @@ -27,7 +27,7 @@ USA. ;;;; Buffer I/O Ports ;;; package: (edwin window-output-port) -(declare (usual-integrations)) + (define (with-output-to-current-point thunk) (with-output-to-window-point (current-window) thunk)) @@ -109,4 +109,4 @@ USA. (WRITE-SELF ,operation/write-self) (WRITE-SUBSTRING ,operation/write-substring) (X-SIZE ,operation/x-size)) - #f)) \ No newline at end of file + #f)) diff --git a/edwin/world-monitor.scm b/edwin/world-monitor.scm index d3fc8a1..e5a9a8c 100644 --- a/edwin/world-monitor.scm +++ b/edwin/world-monitor.scm @@ -26,7 +26,7 @@ USA. ;;;; Create a *World* buffer containing the world report. -(declare (usual-integrations)) + (define-command monitor-world "Find or create a buffer named *World*, insert a world report into @@ -117,4 +117,4 @@ it, and spawn a thread to update it after every (set-window-point! window point) (set-window-start-mark! window start 0))) saved-windows) - (if saved-mark (set-buffer-mark! buffer saved-mark)))) \ No newline at end of file + (if saved-mark (set-buffer-mark! buffer saved-mark)))) diff --git a/edwin/xform.scm b/edwin/xform.scm index ea757c9..b3b8eed 100644 --- a/edwin/xform.scm +++ b/edwin/xform.scm @@ -26,7 +26,7 @@ USA. ;;;; Instance Variable Transformation -(declare (usual-integrations)) + (define (transform-instance-variables transforms name free expression) (fluid-let ((name-of-self name)) @@ -143,4 +143,4 @@ USA. (LAMBDA ,transform-lambda) (OPEN-BLOCK ,transform-open-block) (SEQUENCE ,transform-sequence) - (VARIABLE ,transform-variable)))) \ No newline at end of file + (VARIABLE ,transform-variable)))) diff --git a/edwin/xterm.scm b/edwin/xterm.scm index 6fc242e..187615d 100644 --- a/edwin/xterm.scm +++ b/edwin/xterm.scm @@ -27,7 +27,7 @@ USA. ;;;; X Terminal ;;; Package: (edwin screen x-screen) -(declare (usual-integrations)) + ;;;; An X display type that autoloads the x11-screen plugin. @@ -76,4 +76,4 @@ USA. (define (with-x-interrupts-disabled thunk) thunk - (error "Not yet autoloaded.")) \ No newline at end of file + (error "Not yet autoloaded."))