diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-12-05 15:21:34 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-12-05 15:21:34 +0000 |
| commit | 0f49f0ce5faacecee97407b01a197ed427d76671 (patch) | |
| tree | f38bd322c6558495c4b9aff36fdb8316ccda6ced | |
| parent | 0b55ab972c6a20ae32884d532b8a9603b2e0303b (diff) | |
| download | open-axiom-0f49f0ce5faacecee97407b01a197ed427d76671.tar.gz | |
* macros.lisp (|$highlightAllowed|): Remove.
(|$lightlightFontOn|): Likewise.
(|$highlightFontOff|): Likewise.
* patches.lisp (|$highlightAllowed|): Move to sys-globals.boot.
(|$lightlightFontOn|): Move to sys-constants.boot
(|$lightlightFontOff|): Likewise.
* setvart.boot ($setOptions): Make highlighting default.
| -rw-r--r-- | src/interp/ChangeLog | 10 | ||||
| -rw-r--r-- | src/interp/macros.lisp | 5 | ||||
| -rw-r--r-- | src/interp/patches.lisp | 2 | ||||
| -rw-r--r-- | src/interp/setq.lisp | 2 | ||||
| -rw-r--r-- | src/interp/setvart.boot | 6 | ||||
| -rw-r--r-- | src/interp/sys-constants.boot | 9 | ||||
| -rw-r--r-- | src/interp/sys-globals.boot | 3 |
7 files changed, 24 insertions, 13 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index d5b7235a..af564d56 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,13 @@ +2007-12-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * macros.lisp (|$highlightAllowed|): Remove. + (|$lightlightFontOn|): Likewise. + (|$highlightFontOff|): Likewise. + * patches.lisp (|$highlightAllowed|): Move to sys-globals.boot. + (|$lightlightFontOn|): Move to sys-constants.boot + (|$lightlightFontOff|): Likewise. + * setvart.boot ($setOptions): Make highlighting default. + 2007-12-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * patches.lisp (|cd|): Make sure *default-pathname-defaults* diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp index 76cbb3c6..775f76cc 100644 --- a/src/interp/macros.lisp +++ b/src/interp/macros.lisp @@ -571,11 +571,6 @@ (defun |sayFORMULA| (X) "Prints on formula output stream." (if (NULL X) NIL (sayBrightly1 X |$formulaOutputStream|))) -(defvar |$highlightAllowed| nil "Used in BRIGHTPRINT and is a )set variable.") - -(defvar |$highlightFontOn| |$boldString| "switch to highlight font") -(defvar |$highlightFontOff| |$normalString| "return to normal font") - ;; the following are redefined in MSGDB BOOT (DEFUN BLANKS (N &optional (stream *standard-output*)) "Print N blanks." diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp index a28df227..5f68687b 100644 --- a/src/interp/patches.lisp +++ b/src/interp/patches.lisp @@ -198,8 +198,6 @@ (setq |$localVars| ()) ;checked by isType -(setq |$highlightFontOn| (concat " " |$boldString|)) -(setq |$highlightFontOff| (concat |$normalString| " ")) (define-function 'SUBSTQ #'SUBSTEQ) ;; needed for substNames (always copy) #+(and :lucid (not :ibm/370)) (define-function 'RUN-AIX-PROGRAM #'SYS:RUN-AIX-PROGRAM) diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp index 9067cab7..8bf5520c 100644 --- a/src/interp/setq.lisp +++ b/src/interp/setq.lisp @@ -275,8 +275,6 @@ CAPSULE |Union| |Record| |SubDomain| |Mapping| |Enumeration| |Domain| |Mode|)) (SETQ |$tracedMapSignatures| ()) -(SETQ |$highlightAllowed| 'T) - ;" used in BRIGHTPRINT and is a )set variable" (SETQ |$printStorageIfTrue| NIL) ;; storage info disabled in common lisp diff --git a/src/interp/setvart.boot b/src/interp/setvart.boot index 43e1089e..2ddc7bcf 100644 --- a/src/interp/setvart.boot +++ b/src/interp/setvart.boot @@ -866,8 +866,8 @@ $setOptions := '( -- The highlighting option may be followed by any one of the -- following: -- --- on --- -> off +-- -> on +-- off -- -- The current setting is indicated within the list. (highlighting @@ -876,7 +876,7 @@ $setOptions := '( LITERALS $highlightAllowed (on off) - off) + on) -- --------------------- The instant Option ---------------------- -- diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index 75896661..59e32e48 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -71,7 +71,7 @@ $escapeString == ++ Marker to swicth to bold font $boldString == - CONCATENATE('STRING, $escapeString, '"[12m") + CONCATENATE('STRING, $escapeString, '"[1m") ++ Marker to switch to normal font $normalString == @@ -85,6 +85,13 @@ $reverseVideoString == $underlineString == CONCATENATE('STRING, $escapeString, '"[4m") +++ +$highlightFontOn == + CONCATENATE("STRING", '" ", $boldString) + +++ +$highlightFontOff == + CONCATENATE("STRING", $normalString, '" ") -- -- User Interface diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index 4fcc113c..5d5ed751 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -422,3 +422,6 @@ _*YEARWEEK_* := nil ++ _/TRACENAMES := nil + +++ +$highlightAllowed := true |