- climacs-cvs@common-lisp.net - mailman3.common-lisp.net

[climacs-cvs] CVS update: climacs/climacs.asd
by abakic＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv14958 Modified Files: climacs.asd Log Message: asdf::input-files is not external (in my version). Date: Tue Jan 4 00:55:17 2005 Author: abakic Index: climacs/climacs.asd diff -u climacs/climacs.asd:1.8 climacs/climacs.asd:1.9 --- climacs/climacs.asd:1.8 Mon Jan 3 11:25:42 2005 +++ climacs/climacs.asd Tue Jan 4 00:55:16 2005 @@ -63,7 +63,7 @@ (defmethod asdf:perform :around ((o asdf:compile-op) (c (eql (asdf:find-component (asdf:find-system :climacs) "skiplist-package")))) (cond - ((null (probe-file (first (asdf:input-files o c)))) + ((null (probe-file (first (asdf::input-files o c)))) (cerror "Retry loading climacs." "~@<You need to download & install Flexichain ~ separately! See the file INSTALL in the Climacs distribution ~

1 0

[climacs-cvs] CVS update: climacs/buffer.lisp
by abakic＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv29335 Modified Files: buffer.lisp Log Message: Very minor, cosmetic changes. Date: Mon Jan 3 19:15:41 2005 Author: abakic Index: climacs/buffer.lisp diff -u climacs/buffer.lisp:1.13 climacs/buffer.lisp:1.14 --- climacs/buffer.lisp:1.13 Wed Dec 29 07:58:53 2004 +++ climacs/buffer.lisp Mon Jan 3 19:15:41 2005 @@ -339,7 +339,7 @@ (defmethod insert-object ((mark mark-mixin) object) (insert-buffer-object (buffer mark) (offset mark) object)) -(defgeneric insert-sequence (mark string) +(defgeneric insert-sequence (mark sequence) (:documentation "Insert the objects in the sequence at the mark. This function simply calls insert-buffer-sequence with the buffer and the position of the mark.")) @@ -482,7 +482,7 @@ (min (offset (low-mark buffer)) offset)) (setf (offset (high-mark buffer)) (max (offset (high-mark buffer)) (+ offset n))) -(setf (slot-value buffer 'modified) t)) + (setf (slot-value buffer 'modified) t)) (defgeneric clear-modify (buffer))

1 0

[climacs-cvs] CVS update: climacs/syntax.lisp
by rstrandh＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv19246 Modified Files: syntax.lisp Log Message: Redisplay is much faster. Date: Mon Jan 3 16:07:09 2005 Author: rstrandh Index: climacs/syntax.lisp diff -u climacs/syntax.lisp:1.18 climacs/syntax.lisp:1.19 --- climacs/syntax.lisp:1.18 Mon Jan 3 13:21:20 2005 +++ climacs/syntax.lisp Mon Jan 3 16:07:09 2005 @@ -265,10 +265,19 @@ (with-slots (top bot scan cache cursor-x cursor-y) syntax (position-window pane syntax) (compute-cache pane syntax) - (setf scan (offset top)) - (loop for id from 0 below (nb-elements cache) - do (updating-output (pane :unique-id id) - (display-line pane syntax (element* cache id)))) + (loop with start-offset = (offset top) + for id from 0 below (nb-elements cache) + do (setf scan start-offset) + (updating-output + (pane :unique-id id + :cache-value (if (<= start-offset + (offset (point pane)) + (+ start-offset (length (element* cache id)))) + (cons nil nil) + (element* cache id)) + :cache-test #'eq) + (display-line pane syntax (element* cache id))) + (incf start-offset (1+ (length (element* cache id))))) (when (mark= scan (point pane)) (multiple-value-bind (x y) (stream-cursor-position pane) (setf cursor-x x

1 0

[climacs-cvs] CVS update: climacs/gui.lisp
by ejohnson＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv14784 Modified Files: gui.lisp Log Message: a very small fix. Fixnum was a bad choice here. Integer works much nicer Date: Mon Jan 3 14:36:34 2005 Author: ejohnson Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.45 climacs/gui.lisp:1.46 --- climacs/gui.lisp:1.45 Mon Jan 3 13:21:19 2005 +++ climacs/gui.lisp Mon Jan 3 14:36:34 2005 @@ -553,7 +553,7 @@ ;; Not bound to a key yet (define-named-command com-kr-resize () - (let ((size (accept 'fixnum :prompt "New kill ring size: "))) + (let ((size (accept 'integer :prompt "New kill ring size"))) (kr-resize *kill-ring* size))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

1 0

[climacs-cvs] CVS update: climacs/gui.lisp climacs/syntax.lisp
by rstrandh＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv10659 Modified Files: gui.lisp syntax.lisp Log Message: 2005-01-02 Lawrence Mitchell <wence(a)gmx.li> * gui.lisp ((define-application-frame climacs)): Add a without-interactor clause to the frame :layout. This is a layout without a minibuffer pane. (com-toggle-layout): Toggle layout between 'default and 'without-interactor. Note the without-interactor layout no longer allows you to enter extended commands (there's nowhere for *standard-input* to go) so I'm not sure how useful it is. (com-set-mark): Fix indentation. (com-exchange-point-and-mark): New command, exchange the positions of point and mark, bound to C-x C-x. (com-transpose-lines): New command, bound to C-x C-t. * syntax.lisp (present-contents): Fix typo in argument list. Date: Mon Jan 3 13:21:20 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.44 climacs/gui.lisp:1.45 --- climacs/gui.lisp:1.44 Mon Jan 3 11:25:43 2005 +++ climacs/gui.lisp Mon Jan 3 13:21:19 2005 @@ -77,7 +77,11 @@ (vertically (:scroll-bars nil) (scrolling (:width 900 :height 400) win) info - int))) + int)) + (without-interactor + (vertically (:scroll-bars nil) + (scrolling (:width 900 :height 400) win) + info))) (:top-level (climacs-top-level))) (defmethod redisplay-frame-panes :after ((frame climacs) &rest args) @@ -275,6 +279,29 @@ (insert-sequence point w2) (forward-word point))))) +(define-named-command com-transpose-lines () + (let ((point (point (win *application-frame*)))) + (beginning-of-line point) + (unless (beginning-of-buffer-p point) + (previous-line point)) + (let* ((bol (offset point)) + (eol (progn (end-of-line point) + (offset point))) + (line (buffer-sequence (buffer point) bol eol))) + (delete-region bol point) + ;; Remove newline at end of line as well. + (unless (end-of-buffer-p point) + (delete-range point)) + ;; If the current line is at the end of the buffer, we want to + ;; be able to insert past it, so we need to get an extra line + ;; at the end. + (when (progn (end-of-line point) + (end-of-buffer-p point)) + (insert-object point #\Newline)) + (next-line point) + (insert-sequence point line) + (insert-object point #\Newline)))) + (define-named-command com-previous-line () (previous-line (point (win *application-frame*)))) @@ -302,7 +329,7 @@ (define-named-command com-toggle-layout () (setf (frame-current-layout *application-frame*) (if (eq (frame-current-layout *application-frame*) 'default) - 'with-interactor + 'without-interactor 'default))) (define-command com-extended-command () @@ -474,7 +501,12 @@ (define-named-command com-set-mark () (with-slots (point mark) (win *application-frame*) - (setf mark (clone-mark point)))) + (setf mark (clone-mark point)))) + +(define-named-command com-exchange-point-and-mark () + (with-slots (point mark) (win *application-frame*) + (psetf (offset mark) (offset point) + (offset point) (offset mark)))) (define-named-command com-set-syntax () (setf (syntax (win *application-frame*)) @@ -597,7 +629,9 @@ (c-x-set-key '(#\c :control) 'com-quit) (c-x-set-key '(#\f :control) 'com-find-file) (c-x-set-key '(#\s :control) 'com-save-buffer) +(c-x-set-key '(#\t :control) 'com-transpose-lines) (c-x-set-key '(#\w :control) 'com-write-buffer) +(c-x-set-key '(#\x :control) 'com-exchange-point-and-mark) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; @@ -634,8 +668,6 @@ (dead-acute-set-key '(#\y) '(com-insert-charcode 253)) (dead-acute-set-key '(#\C) '(com-insert-charcode 199)) (dead-acute-set-key '(#\c) '(com-insert-charcode 231)) -(dead-acute-set-key '(#\B) '(com-insert-charcode 197)) ; not great -(dead-acute-set-key '(#\b) '(com-insert-charcode 229)) ; not great (dead-acute-set-key '(#\x) '(com-insert-charcode 215)) (dead-acute-set-key '(#\-) '(com-insert-charcode 247)) (dead-acute-set-key '(#\T) '(com-insert-charcode 222)) @@ -643,6 +675,18 @@ (dead-acute-set-key '(#\s) '(com-insert-charcode 223)) (dead-acute-set-key '(#\Space) '(com-insert-charcode 39)) +(make-command-table 'dead-acute-dead-accute-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'dead-acute-climacs-table "dead-acute-dead-accute" + :menu 'dead-acute-dead-accute-climacs-table + :keystroke '(:dead--acute)) + +(defun dead-acute-dead-accute-set-key (gesture command) + (add-command-to-command-table command 'dead-acute-dead-accute-climacs-table + :keystroke gesture :errorp nil)) + +(dead-acute-dead-accute-set-key '(#\A) '(com-insert-charcode 197)) +(dead-acute-dead-accute-set-key '(#\a) '(com-insert-charcode 229)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Dead-grave command table Index: climacs/syntax.lisp diff -u climacs/syntax.lisp:1.17 climacs/syntax.lisp:1.18 --- climacs/syntax.lisp:1.17 Sat Jan 1 11:49:26 2005 +++ climacs/syntax.lisp Mon Jan 3 13:21:20 2005 @@ -88,7 +88,7 @@ (define-presentation-type url () :inherit-from 'string) -(defgeneric present-contents (contenst pane syntax)) +(defgeneric present-contents (contents pane syntax)) (defmethod present-contents (contents pane (syntax basic-syntax)) (unless (null contents)

1 0

[climacs-cvs] CVS update: climacs/translate.lisp
by rstrandh＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv5301 Added Files: translate.lisp Log Message: replacement for CLX' and McCLIM's translate functions. Date: Mon Jan 3 11:45:47 2005 Author: rstrandh

1 0

[climacs-cvs] CVS update: climacs/climacs.asd climacs/gui.lisp
by rstrandh＠common-lisp.net 03 Jan '05

03 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv4300 Modified Files: climacs.asd gui.lisp Log Message: Added support for input of latin-1 characters for those who have a keyboard configured as us-international, where the following keys are dead: ' ` " ~ ^ Date: Mon Jan 3 11:25:54 2005 Author: rstrandh Index: climacs/climacs.asd diff -u climacs/climacs.asd:1.7 climacs/climacs.asd:1.8 --- climacs/climacs.asd:1.7 Sat Jan 1 15:39:55 2005 +++ climacs/climacs.asd Mon Jan 3 11:25:42 2005 @@ -49,6 +49,7 @@ "Flexichain/utilities" "Flexichain/flexichain" "Flexichain/flexicursor" + "translate" "packages" "buffer" "base" Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.43 climacs/gui.lisp:1.44 --- climacs/gui.lisp:1.43 Sat Jan 1 20:58:40 2005 +++ climacs/gui.lisp Mon Jan 3 11:25:43 2005 @@ -598,3 +598,152 @@ (c-x-set-key '(#\f :control) 'com-find-file) (c-x-set-key '(#\s :control) 'com-save-buffer) (c-x-set-key '(#\w :control) 'com-write-buffer) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Some Unicode stuff + +(define-named-command com-insert-charcode ((code 'integer :prompt "Code point")) + (insert-object (point (win *application-frame*)) (code-char code))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Dead-acute command table + +(make-command-table 'dead-acute-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'global-climacs-table "dead-acute" + :menu 'dead-acute-climacs-table + :keystroke '(:dead--acute)) + +(defun dead-acute-set-key (gesture command) + (add-command-to-command-table command 'dead-acute-climacs-table + :keystroke gesture :errorp nil)) + +(dead-acute-set-key '(#\A) '(com-insert-charcode 193)) +(dead-acute-set-key '(#\E) '(com-insert-charcode 201)) +(dead-acute-set-key '(#\I) '(com-insert-charcode 205)) +(dead-acute-set-key '(#\O) '(com-insert-charcode 211)) +(dead-acute-set-key '(#\U) '(com-insert-charcode 218)) +(dead-acute-set-key '(#\Y) '(com-insert-charcode 221)) +(dead-acute-set-key '(#\a) '(com-insert-charcode 225)) +(dead-acute-set-key '(#\e) '(com-insert-charcode 233)) +(dead-acute-set-key '(#\i) '(com-insert-charcode 237)) +(dead-acute-set-key '(#\o) '(com-insert-charcode 243)) +(dead-acute-set-key '(#\u) '(com-insert-charcode 250)) +(dead-acute-set-key '(#\y) '(com-insert-charcode 253)) +(dead-acute-set-key '(#\C) '(com-insert-charcode 199)) +(dead-acute-set-key '(#\c) '(com-insert-charcode 231)) +(dead-acute-set-key '(#\B) '(com-insert-charcode 197)) ; not great +(dead-acute-set-key '(#\b) '(com-insert-charcode 229)) ; not great +(dead-acute-set-key '(#\x) '(com-insert-charcode 215)) +(dead-acute-set-key '(#\-) '(com-insert-charcode 247)) +(dead-acute-set-key '(#\T) '(com-insert-charcode 222)) +(dead-acute-set-key '(#\t) '(com-insert-charcode 254)) +(dead-acute-set-key '(#\s) '(com-insert-charcode 223)) +(dead-acute-set-key '(#\Space) '(com-insert-charcode 39)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Dead-grave command table + +(make-command-table 'dead-grave-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'global-climacs-table "dead-grave" + :menu 'dead-grave-climacs-table + :keystroke '(:dead--grave)) + +(defun dead-grave-set-key (gesture command) + (add-command-to-command-table command 'dead-grave-climacs-table + :keystroke gesture :errorp nil)) + +(dead-grave-set-key '(#\A) '(com-insert-charcode 192)) +(dead-grave-set-key '(#\E) '(com-insert-charcode 200)) +(dead-grave-set-key '(#\I) '(com-insert-charcode 204)) +(dead-grave-set-key '(#\O) '(com-insert-charcode 210)) +(dead-grave-set-key '(#\U) '(com-insert-charcode 217)) +(dead-grave-set-key '(#\a) '(com-insert-charcode 224)) +(dead-grave-set-key '(#\e) '(com-insert-charcode 232)) +(dead-grave-set-key '(#\i) '(com-insert-charcode 236)) +(dead-grave-set-key '(#\o) '(com-insert-charcode 242)) +(dead-grave-set-key '(#\u) '(com-insert-charcode 249)) +(dead-grave-set-key '(#\Space) '(com-insert-charcode 96)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Dead-diaeresis command table + +(make-command-table 'dead-diaeresis-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'global-climacs-table "dead-diaeresis" + :menu 'dead-diaeresis-climacs-table + :keystroke '(:dead--diaeresis :shift)) + +(defun dead-diaeresis-set-key (gesture command) + (add-command-to-command-table command 'dead-diaeresis-climacs-table + :keystroke gesture :errorp nil)) + +(dead-diaeresis-set-key '(#\A) '(com-insert-charcode 196)) +(dead-diaeresis-set-key '(#\E) '(com-insert-charcode 203)) +(dead-diaeresis-set-key '(#\I) '(com-insert-charcode 207)) +(dead-diaeresis-set-key '(#\O) '(com-insert-charcode 214)) +(dead-diaeresis-set-key '(#\U) '(com-insert-charcode 220)) +(dead-diaeresis-set-key '(#\a) '(com-insert-charcode 228)) +(dead-diaeresis-set-key '(#\e) '(com-insert-charcode 235)) +(dead-diaeresis-set-key '(#\i) '(com-insert-charcode 239)) +(dead-diaeresis-set-key '(#\o) '(com-insert-charcode 246)) +(dead-diaeresis-set-key '(#\u) '(com-insert-charcode 252)) +(dead-diaeresis-set-key '(#\y) '(com-insert-charcode 255)) +(dead-diaeresis-set-key '(#\Space) '(com-insert-charcode 34)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Dead-tilde command table + +(make-command-table 'dead-tilde-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'global-climacs-table "dead-tilde" + :menu 'dead-tilde-climacs-table + :keystroke '(:dead--tilde :shift)) + +(defun dead-tilde-set-key (gesture command) + (add-command-to-command-table command 'dead-tilde-climacs-table + :keystroke gesture :errorp nil)) + +(dead-tilde-set-key '(#\A) '(com-insert-charcode 195)) +(dead-tilde-set-key '(#\N) '(com-insert-charcode 209)) +(dead-tilde-set-key '(#\a) '(com-insert-charcode 227)) +(dead-tilde-set-key '(#\n) '(com-insert-charcode 241)) +(dead-tilde-set-key '(#\E) '(com-insert-charcode 198)) +(dead-tilde-set-key '(#\e) '(com-insert-charcode 230)) +(dead-tilde-set-key '(#\D) '(com-insert-charcode 208)) +(dead-tilde-set-key '(#\d) '(com-insert-charcode 240)) +(dead-tilde-set-key '(#\O) '(com-insert-charcode 216)) +(dead-tilde-set-key '(#\o) '(com-insert-charcode 248)) +(dead-tilde-set-key '(#\Space) '(com-insert-charcode 126)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Dead-circumflex command table + +(make-command-table 'dead-circumflex-climacs-table :errorp nil) + +(add-menu-item-to-command-table 'global-climacs-table "dead-circumflex" + :menu 'dead-circumflex-climacs-table + :keystroke '(:dead--circumflex :shift)) + +(defun dead-circumflex-set-key (gesture command) + (add-command-to-command-table command 'dead-circumflex-climacs-table + :keystroke gesture :errorp nil)) + +(dead-circumflex-set-key '(#\A) '(com-insert-charcode 194)) +(dead-circumflex-set-key '(#\E) '(com-insert-charcode 202)) +(dead-circumflex-set-key '(#\I) '(com-insert-charcode 206)) +(dead-circumflex-set-key '(#\O) '(com-insert-charcode 212)) +(dead-circumflex-set-key '(#\U) '(com-insert-charcode 219)) +(dead-circumflex-set-key '(#\a) '(com-insert-charcode 226)) +(dead-circumflex-set-key '(#\e) '(com-insert-charcode 234)) +(dead-circumflex-set-key '(#\i) '(com-insert-charcode 238)) +(dead-circumflex-set-key '(#\o) '(com-insert-charcode 244)) +(dead-circumflex-set-key '(#\u) '(com-insert-charcode 251)) +(dead-circumflex-set-key '(#\Space) '(com-insert-charcode 94))

1 0

[climacs-cvs] CVS update: climacs/gui.lisp
by rstrandh＠common-lisp.net 01 Jan '05

01 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv17974 Modified Files: gui.lisp Log Message: Patch from Christophe Rhodes implementing transpose-objects and transpose-words. Thank you. Date: Sat Jan 1 20:58:40 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.42 climacs/gui.lisp:1.43 --- climacs/gui.lisp:1.42 Sat Jan 1 14:25:19 2005 +++ climacs/gui.lisp Sat Jan 1 20:58:40 2005 @@ -212,12 +212,6 @@ (possibly-expand-abbrev (point (win *application-frame*)))) (insert-object (point (win *application-frame*)) *current-gesture*)) -(define-named-command com-backward-object () - (decf (offset (point (win *application-frame*))))) - -(define-named-command com-forward-object () - (incf (offset (point (win *application-frame*))))) - (define-named-command com-beginning-of-line () (beginning-of-line (point (win *application-frame*)))) @@ -234,12 +228,52 @@ (let* ((point (point (win *application-frame*)))) (unless (beginning-of-buffer-p point) (when (end-of-line-p point) - (decf (offset point))) - (let ((object (object-after point))) - (delete-range point) - (decf (offset point)) - (insert-object point object) - (incf (offset point)))))) + (backward-object point)) + (let ((object (object-after point))) + (delete-range point) + (backward-object point) + (insert-object point object) + (forward-object point))))) + +(defgeneric backward-object (mark &optional count)) +(defmethod backward-object ((mark climacs-buffer::mark-mixin) + &optional (count 1)) + (decf (offset mark) count)) + +(defgeneric forward-object (mark &optional count)) +(defmethod forward-object ((mark climacs-buffer::mark-mixin) + &optional (count 1)) + (incf (offset mark) count)) + +(define-named-command com-backward-object () + (backward-object (point (win *application-frame*)))) + +(define-named-command com-forward-object () + (forward-object (point (win *application-frame*)))) + +(define-named-command com-transpose-words () + (let* ((point (point (win *application-frame*)))) + (let (bw1 bw2 ew1 ew2) + (backward-word point) + (setf bw1 (offset point)) + (forward-word point) + (setf ew1 (offset point)) + (forward-word point) + (when (= (offset point) ew1) + ;; this is emacs' message in the minibuffer + (error "Don't have two things to transpose")) + (setf ew2 (offset point)) + (backward-word point) + (setf bw2 (offset point)) + (let ((w2 (buffer-sequence (buffer point) bw2 ew2)) + (w1 (buffer-sequence (buffer point) bw1 ew1))) + (delete-word point) + (insert-sequence point w1) + (backward-word point) + (backward-word point) + (delete-word point) + (insert-sequence point w2) + (forward-word point))))) (define-named-command com-previous-line () (previous-line (point (win *application-frame*)))) @@ -520,6 +554,7 @@ (global-set-key '(#\w :control) 'com-cut-out) (global-set-key '(#\f :meta) 'com-forward-word) (global-set-key '(#\b :meta) 'com-backward-word) +(global-set-key '(#\t :meta) 'com-transpose-words) (global-set-key '(#\x :meta) 'com-extended-command) (global-set-key '(#\y :meta) 'com-kr-rotate) ;currently rotates only (global-set-key '(#\w :meta) 'com-copy-out)

1 0

[climacs-cvs] CVS update: climacs/climacs.asd
by rstrandh＠common-lisp.net 01 Jan '05

01 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv1923 Modified Files: climacs.asd Log Message: Added improvement to asdf compilation procedure. Thanks to Andreas Fuchs. Date: Sat Jan 1 15:39:56 2005 Author: rstrandh Index: climacs/climacs.asd diff -u climacs/climacs.asd:1.6 climacs/climacs.asd:1.7 --- climacs/climacs.asd:1.6 Wed Dec 29 06:45:37 2004 +++ climacs/climacs.asd Sat Jan 1 15:39:55 2005 @@ -57,3 +57,15 @@ "syntax" "kill-ring" "gui") + +#+asdf +(defmethod asdf:perform :around ((o asdf:compile-op) + (c (eql (asdf:find-component (asdf:find-system :climacs) "skiplist-package")))) + (cond + ((null (probe-file (first (asdf:input-files o c)))) + (cerror "Retry loading climacs." + "~@<You need to download & install Flexichain ~ + separately! See the file INSTALL in the Climacs distribution ~ + for instructions.~@:>" nil) + (asdf:perform o c)) + (t (call-next-method o c))))

1 0

[climacs-cvs] CVS update: climacs/gui.lisp
by rstrandh＠common-lisp.net 01 Jan '05

01 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv30026 Modified Files: gui.lisp Log Message: implemented transpose-objects (C-t) according to a suggestion by Christophe Rhodes. Applied some code factoring to his initial suggestion. Date: Sat Jan 1 14:25:19 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.41 climacs/gui.lisp:1.42 --- climacs/gui.lisp:1.41 Sat Jan 1 13:55:01 2005 +++ climacs/gui.lisp Sat Jan 1 14:25:19 2005 @@ -230,6 +230,17 @@ (define-named-command com-backward-delete-object () (delete-range (point (win *application-frame*)) -1)) +(define-named-command com-transpose-objects () + (let* ((point (point (win *application-frame*)))) + (unless (beginning-of-buffer-p point) + (when (end-of-line-p point) + (decf (offset point))) + (let ((object (object-after point))) + (delete-range point) + (decf (offset point)) + (insert-object point object) + (incf (offset point)))))) + (define-named-command com-previous-line () (previous-line (point (win *application-frame*)))) @@ -503,6 +514,7 @@ (global-set-key '(#\n :control) 'com-next-line) (global-set-key '(#\o :control) 'com-open-line) (global-set-key '(#\k :control) 'com-kill-line) +(global-set-key '(#\t :control) 'com-transpose-objects) (global-set-key '(#\Space :control) 'com-set-mark) (global-set-key '(#\y :control) 'com-copy-in) (global-set-key '(#\w :control) 'com-cut-out)

1 0