phemlock-cvs

Download

phemlock-cvs@common-lisp.net

October 2004

1 participants
2 discussions

[Phemlock-cvs] CVS update: phemlock/src/user/bindings.lisp
by Aleksandar Bakic 16 Oct '04

16 Oct '04

Update of /project/phemlock/cvsroot/phemlock/src/user In directory common-lisp.net:/tmp/cvs-serv16879/src/user Modified Files: bindings.lisp Log Message: Delayed key bindings for some keys until the corresponding commands are ported, using #+ read macros. Date: Sat Oct 16 21:28:23 2004 Author: abakic Index: phemlock/src/user/bindings.lisp diff -u phemlock/src/user/bindings.lisp:1.3 phemlock/src/user/bindings.lisp:1.4 --- phemlock/src/user/bindings.lisp:1.3 Tue Aug 10 08:34:42 2004 +++ phemlock/src/user/bindings.lisp Sat Oct 16 21:28:23 2004 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; #+CMU (ext:file-comment - "$Header: /project/phemlock/cvsroot/phemlock/src/user/bindings.lisp,v 1.3 2004/08/10 06:34:42 rstrandh Exp $") + "$Header: /project/phemlock/cvsroot/phemlock/src/user/bindings.lisp,v 1.4 2004/10/16 19:28:23 abakic Exp $") ;;; ;;; ********************************************************************** ;;; @@ -321,25 +321,30 @@ ;;;; Typescript. -;; (bind-key "Confirm Typescript Input" #k"return" :mode "Typescript") +#+port-user-ts-buf +(progn +(bind-key "Confirm Typescript Input" #k"return" :mode "Typescript") ;; (bind-key "Interactive Beginning of Line" #k"control-a" :mode "Typescript") ;; (bind-key "Kill Interactive Input" #k"meta-i" :mode "Typescript") ;; (bind-key "Previous Interactive Input" #k"meta-p" :mode "Typescript") ;; (bind-key "Search Previous Interactive Input" #k"meta-P" :mode "Typescript") ;; (bind-key "Next Interactive Input" #k"meta-n" :mode "Typescript") ;; (bind-key "Reenter Interactive Input" #k"control-return" :mode "Typescript") -;; (bind-key "Typescript Slave Break" #k"hyper-b" :mode "Typescript") -;; (bind-key "Typescript Slave to Top Level" #k"hyper-g" :mode "Typescript") -;; (bind-key "Typescript Slave Status" #k"hyper-s" :mode "Typescript") -;; (bind-key "Select Slave" #k"control-meta-\c") -;; (bind-key "Select Background" #k"control-meta-C") - -;; (bind-key "Abort Operations" #k"hyper-a") -;; (bind-key "List Operations" #k"hyper-l") - -;; (bind-key "Next Compiler Error" #k"hyper-n") -;; (bind-key "Previous Compiler Error" #k"hyper-p") - +(bind-key "Typescript Slave Break" #k"hyper-b" :mode "Typescript") +(bind-key "Typescript Slave to Top Level" #k"hyper-g" :mode "Typescript") +(bind-key "Typescript Slave Status" #k"hyper-s" :mode "Typescript") +(bind-key "Select Slave" #k"control-meta-\c") +(bind-key "Select Background" #k"control-meta-C") +) + +#+port-user-lispeval +(progn +(bind-key "Abort Operations" #k"hyper-a") +(bind-key "List Operations" #k"hyper-l") + +(bind-key "Next Compiler Error" #k"hyper-n") +(bind-key "Previous Compiler Error" #k"hyper-p") +) ;;;; Lisp (some). @@ -371,6 +376,8 @@ (bind-key "Delete Previous Character Expanding Tabs" #k"backspace" :mode "Lisp") (bind-key "Delete Previous Character Expanding Tabs" #k"delete" :mode "Lisp") +#+port-user-lispeval +(progn (bind-key "Evaluate Expression" #k"meta-escape") (bind-key "Evaluate Defun" #k"control-x control-e") (bind-key "Compile Defun" #k"control-x control-c") @@ -379,9 +386,11 @@ (bind-key "Describe Function Call" #k"control-meta-A") (bind-key "Describe Symbol" #k"control-meta-S") - +) (bind-key "Goto Definition" #k"control-meta-F") +#+port-user-debug +(progn (bind-key "Debug Up" #k"control-meta-hyper-u") (bind-key "Debug Down" #k"control-meta-hyper-d") (bind-key "Debug Top" #k"control-meta-hyper-t") @@ -400,7 +409,7 @@ (bind-key "Debug Source" #k"control-meta-hyper-s") (bind-key "Debug Edit Source" #k"control-meta-hyper-S") (bind-key "Debug Flush Errors" #k"control-meta-hyper-F") - +) ;;;; More Miscellaneous bindings. @@ -474,21 +483,23 @@ ;;;; Spell bindings. -;; (bind-key "Check Word Spelling" #k"meta-$") -;; (bind-key "Add Word to Spelling Dictionary" #k"control-x $") - -;; (dolist (info (command-bindings (getstring "Self Insert" *command-names*))) -;; (let* ((key (car info)) -;; (key-event (svref key 0)) -;; (character (key-event-char key-event))) -;; (unless (or (alpha-char-p character) (eq key-event #k"'")) -;; (bind-key "Auto Check Word Spelling" key :mode "Spell")))) -;; (bind-key "Auto Check Word Spelling" #k"return" :mode "Spell") -;; (bind-key "Auto Check Word Spelling" #k"tab" :mode "Spell") -;; (bind-key "Auto Check Word Spelling" #k"linefeed" :mode "Spell") -;; (bind-key "Correct Last Misspelled Word" #k"meta-:") -;; (bind-key "Undo Last Spelling Correction" #k"control-x a") - +#+port-user-spellcoms +(progn +(bind-key "Check Word Spelling" #k"meta-$") +(bind-key "Add Word to Spelling Dictionary" #k"control-x $") + +(dolist (info (command-bindings (getstring "Self Insert" *command-names*))) + (let* ((key (car info)) + (key-event (svref key 0)) + (character (key-event-char key-event))) + (unless (or (alpha-char-p character) (eq key-event #k"'")) + (bind-key "Auto Check Word Spelling" key :mode "Spell")))) +(bind-key "Auto Check Word Spelling" #k"return" :mode "Spell") +(bind-key "Auto Check Word Spelling" #k"tab" :mode "Spell") +(bind-key "Auto Check Word Spelling" #k"linefeed" :mode "Spell") +(bind-key "Correct Last Misspelled Word" #k"meta-:") +(bind-key "Undo Last Spelling Correction" #k"control-x a") +) ;;;; Overwrite Mode. @@ -540,7 +551,8 @@ (dolist (key (list #k"]" #k")" #k"}" #k"\>")) (bind-key "Scribe Insert Bracket" key :mode "Scribe")) -;;GB (bind-key "Scribe Buffer File" #k"control-x c" :mode "Scribe") +#+port-user-unixcoms +(bind-key "Scribe Buffer File" #k"control-x c" :mode "Scribe") (bind-key "Select Scribe Warnings" #k"control-meta-C" :mode "Scribe") (bind-key "Insert Scribe Directive" #k"hyper-i" :mode "Scribe") @@ -557,6 +569,8 @@ ;;; Clear everything user might hit to avoid getting the internal error ;;; message about modifying read-only buffers. ;;; +#+port-user-mh +(progn (hemlock-ext:do-alpha-key-events (key-event :both) (bind-key "Illegal" key-event :mode "Headers") (bind-key "Illegal" key-event :mode "Message")) @@ -640,7 +654,7 @@ (bind-key "Delete Draft and Buffer" #k"hyper-q" :mode "Draft") (bind-key "List Mail Buffers" #k"hyper-l" :mode "Draft") (bind-key "Draft Help" #k"hyper-?" :mode "Draft") - +) ;;;; Netnews. @@ -648,6 +662,8 @@ ;;; Clear everything user might hit to avoid getting the internal error ;;; message about modifying read-only buffers. ;;; +#+port-user-netnews +(progn (hemlock-ext:do-alpha-key-events (key-event :both) (bind-key "Illegal" key-event :mode "News-Headers") (bind-key "Illegal" key-event :mode "News-Message")) @@ -700,11 +716,14 @@ (bind-key "Netnews Previous Line" #k"Uparrow" :mode "News-Headers") (bind-key "Netnews Select Message Buffer" #k"hyper-m" :mode "News-Headers") (bind-key "Netnews Show Article" #k"space" :mode "News-Headers") - +) ;;; News-Message. ;;; +#+port-user-mh (bind-key "Insert Message Region" #k"Hyper-y" :mode "News-Message") +#+port-user-netnews +(progn (bind-key "Netnews Message File Message" #k"o" :mode "News-Message") (bind-key "Netnews Message Keep Buffer" #k"k" :mode "News-Message") (bind-key "Netnews Message Quit" #k"q" :mode "News-Message") @@ -721,20 +740,26 @@ (bind-key "Netnews Select Message Buffer" #k"hyper-m" :mode "Post") (bind-key "Netnews Deliver Post" #k"hyper-s" :mode "Post") (bind-key "Netnews Abort Post" #k"hyper-q" :mode "Post") +) +#+port-user-mh (bind-key "Insert Message Buffer" #k"Hyper-y" :mode "Post") ;;; News-Browse. +#+port-user-netnews +(progn (bind-key "Netnews Quit Browse" #k"q" :mode "News-Browse") (bind-key "Netnews Browse Add Group To File" #k"a" :mode "News-Browse") (bind-key "Netnews Browse Read Group" #k"space" :mode "News-Browse") (bind-key "Next Line" #k"n" :mode "News-Browse") (bind-key "Previous Line" #k"p" :mode "News-Browse") - +) ;;;; Process (Shell). +#+port-user-shell +(progn (bind-key "Shell" #k"control-meta-s") (bind-key "Confirm Process Input" #k"return" :mode "Process") (bind-key "Shell Complete Filename" #k"M-escape" :mode "Process") @@ -749,7 +774,7 @@ (bind-key "Kill Interactive Input" #k"meta-i" :mode "Process") (bind-key "Next Interactive Input" #k"meta-n" :mode "Process") (bind-key "Reenter Interactive Input" #k"control-return" :mode "Process") - +) ;;;; Bufed. @@ -772,6 +797,8 @@ ;;;; Dired. +#+port-user-diredcoms +(progn (bind-key "Dired" #k"control-x control-meta-d") (bind-key "Dired Delete File and Down Line" #k"d" :mode "Dired") @@ -811,17 +838,19 @@ (bind-key "View Help" #k"?" :mode "View") (bind-key "Beginning of Buffer" #k"\<" :mode "View") (bind-key "End of Buffer" #k"\>" :mode "View") - +) ;;;; Lisp Library. +#+port-user-lisp-lib +(progn (bind-key "Describe Pointer Library Entry" #k"leftdown" :mode "Lisp-Lib") (bind-key "Load Pointer Library Entry" #k"rightdown" :mode "Lisp-Lib") (bind-key "Describe Library Entry" #k"space" :mode "Lisp-Lib") (bind-key "Load Library Entry" #k"l" :mode "Lisp-Lib") (bind-key "Exit Lisp Library" #k"q" :mode "Lisp-Lib") (bind-key "Lisp Library Help" #k"?" :mode "Lisp-Lib") - +) ;;;; Completion mode.

1 0

[Phemlock-cvs] CVS update: phemlock/hemlock.asd phemlock/hemlock.system
by Aleksandar Bakic 16 Oct '04

16 Oct '04

Update of /project/phemlock/cvsroot/phemlock In directory common-lisp.net:/tmp/cvs-serv16879 Modified Files: hemlock.asd hemlock.system Log Message: Delayed key bindings for some keys until the corresponding commands are ported, using #+ read macros. Date: Sat Oct 16 21:28:20 2004 Author: abakic Index: phemlock/hemlock.asd diff -u phemlock/hemlock.asd:1.2 phemlock/hemlock.asd:1.3 --- phemlock/hemlock.asd:1.2 Sat Sep 4 01:06:43 2004 +++ phemlock/hemlock.asd Sat Oct 16 21:28:19 2004 @@ -79,7 +79,7 @@ (:file "decls") ; early declarations of functions and stuff (:file "struct") - ;; "struct-ed" + #+port-core-struct-ed (:file "struct-ed") (:file "charmacs") (:file "key-event"))) (:module bitmap-1 @@ -121,13 +121,14 @@ (:file "linimage") (:file "cursor") (:file "display"))) -;;; (:module tty-1 -;;; :source-pathname "tty" -;;; :components -;;; ("termcap" -;;; ;; "tty-disp-rt" -;;; ;; "tty-display" -;;; )) + (:module tty-1 + :pathname #.(merge-pathnames + (make-pathname + :directory '(:relative "tty"))) + :components + (#+port-tty-termcap (:file "termcap") + #+port-tty-tty-disp-rt (:file "tty-disp-rt") + #+port-tty-tty-display (:file "tty-display"))) (:module root-1 :pathname #.(merge-pathnames (make-pathname @@ -135,10 +136,12 @@ :depends-on (core-2) :components ((:file "pop-up-stream"))) -;;; (:module tty-2 -;;; :source-pathname "tty" -;;; :components -;;; ("tty-screen")) + (:module tty-2 + :pathname #.(merge-pathnames + (make-pathname + :directory '(:relative "tty"))) + :components + (#+port-tty-tty-screen (:file "tty-screen"))) (:module root-2 :pathname #.(merge-pathnames (make-pathname @@ -147,7 +150,7 @@ :components ((:file "font") (:file "streams") - ;; "hacks" + #+port-root-hacks (:file "hacks") (:file "main") (:file "echo"))) (:module user-1 @@ -173,15 +176,15 @@ (:file "text") (:file "lispmode") - ;; "ts-buf" - ;; "ts-stream" - ;; "eval-server" + #+port-user-ts-buf (:file "ts-buf") + #+port-user-ts-stream (:file "ts-stream") + #+port-user-eval-server (:file "eval-server") (:file "lispbuf") - ;; "lispeval" - ;; "spell-rt" - ;; "spell-corr" - ;; "spell-aug" - ;; "spellcoms" + #+port-user-lispeval (:file "lispeval") + #+port-user-spell-rt (:file "spell-rt") + #+port-user-spell-corr (:file "spell-corr") + #+port-user-spell-aug (:file "spell-aug") + #+port-user-spellcoms (:file "spellcoms") (:file "comments") (:file "overwrite") @@ -196,18 +199,18 @@ (:file "auto-save") (:file "register") (:file "xcoms") - ;; "unixcoms" - ;; "mh" + #+port-user-unixcoms (:file "unixcoms") + #+port-user-mh (:file "mh") (:file "highlight") - ;; "dired" - ;; "diredcoms" + #+port-user-dired (:file "dired") + #+port-user-diredcoms (:file "diredcoms") (:file "bufed") - ;;"lisp-lib" + #+port-user-lisp-lib (:file "lisp-lib") (:file "completion") - ;; "shell" - ;; "debug" - ;; "netnews" - ;; "rcs" + #+port-user-shell (:file "shell") + #+port-user-debug (:file "debug") + #+port-user-netnews (:file "netnews") + #+port-user-rcs (:file "rcs") (:file "dabbrev") (:file "bindings") (:file "bindings-gb"))) @@ -230,4 +233,4 @@ :components ((:file "patch") (:file "foo") - #+nilamb(:file "exp-syntax"))))) \ No newline at end of file + #+port-clim-exp-syntax (:file "exp-syntax"))))) \ No newline at end of file Index: phemlock/hemlock.system diff -u phemlock/hemlock.system:1.3 phemlock/hemlock.system:1.4 --- phemlock/hemlock.system:1.3 Sat Sep 4 01:06:43 2004 +++ phemlock/hemlock.system Sat Oct 16 21:28:19 2004 @@ -114,29 +114,28 @@ (:file "linimage") (:file "cursor") (:file "display"))) -;;; (:module tty-1 -;;; :source-pathname "tty" -;;; :components -;;; ("termcap" -;;; ;; "tty-disp-rt" -;;; ;; "tty-display" -;;; )) + (:module tty-1 + :source-pathname "tty" + :components + (#+port-tty-termcap (:file "termcap") + #+port-tty-tty-disp-rt (:file "tty-disp-rt") + #+port-tty-tty-display (:file "tty-display"))) (:module root-1 :source-pathname "" :depends-on (core-2) :components ((:file "pop-up-stream"))) -;;; (:module tty-2 -;;; :source-pathname "tty" -;;; :components -;;; ("tty-screen")) + (:module tty-2 + :source-pathname "tty" + :components + (#+port-tty-tty-screen (:file "tty-screen"))) (:module root-2 :source-pathname "" :depends-on (root-1) :components ((:file "font") (:file "streams") - ;; "hacks" + #+port-root-hacks (:file "hacks") (:file "main") (:file "echo"))) (:module user-1 @@ -160,15 +159,15 @@ (:file "text") (:file "lispmode") - ;; "ts-buf" - ;; "ts-stream" - ;; "eval-server" + #+port-user-ts-buf (:file "ts-buf") + #+port-user-ts-stream (:file "ts-stream") + #+port-user-eval-server (:file "eval-server") (:file "lispbuf") - ;; "lispeval" - ;; "spell-rt" - ;; "spell-corr" - ;; "spell-aug" - ;; "spellcoms" + #+port-user-lispeval (:file "lispeval") + #+port-user-spell-rt (:file "spell-rt") + #+port-user-spell-corr (:file "spell-corr") + #+port-user-spell-aug (:file "spell-aug") + #+port-user-spellcoms (:file "spellcoms") (:file "comments") (:file "overwrite") @@ -183,18 +182,18 @@ (:file "auto-save") (:file "register") (:file "xcoms") - ;; "unixcoms" - ;; "mh" + #+port-user-unixcoms (:file "unixcoms") + #+port-user-mh (:file "mh") (:file "highlight") - ;; "dired" - ;; "diredcoms" + #+port-user-dired (:file "dired") + #+port-user-diredcoms (:file "diredcoms") (:file "bufed") - ;;"lisp-lib" + #+port-user-lisp-lib (:file "lisp-lib") (:file "completion") - ;; "shell" - ;; "debug" - ;; "netnews" - ;; "rcs" + #+port-user-shell (:file "shell") + #+port-user-debug (:file "debug") + #+port-user-netnews (:file "netnews") + #+port-user-rcs (:file "rcs") (:file "dabbrev") (:file "bindings") (:file "bindings-gb")))

1 0