September 2010 - XEmacs-Patches - XEmacs Mailing List Archives

[COMMIT] Correct #'define-key syntax, eliminate byte-compile warnings, quail.el 14 years, 3 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. mule-packages/leim/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * quail.el: * quail.el (quail-translation-keymap): * quail.el (quail-simple-translation-keymap): * quail.el (quail-set-keyboard-layout): * quail.el (quail-update-current-translations): * quail.el (frame-char-height): New. * quail.el (quail-completion-list-translations): * quail.el (quail-translation-help): * quail.el (quail-update-leim-list-file): Make the #'define-key syntax in this file conform to our documentation; eliminate byte-compiler warnings, in the process fixing at least two honest-to-goodness bugs. XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: mule-packages/leim/quail.el Index: mule-packages/leim/quail.el =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/mule-packages/leim/quail.el,v retrieving revision 1.11 diff -u -r1.11 quail.el --- mule-packages/leim/quail.el 18 Feb 2010 20:49:44 -0000 1.11 +++ mule-packages/leim/quail.el 3 Sep 2010 18:42:25 -0000 ＠＠ -304,7 +304,7 ＠＠ (define-key map "\C-h" 'quail-translation-help) ;;; This interferes with handling of escape sequences on non-X terminals. ;;; (define-key map "\e" '(keymap (t . quail-execute-non-quail-command))) - (define-key map [?\C-\ ] 'quail-select-current) + (define-key map [(control space)] 'quail-select-current) (define-key map [tab] 'quail-completion) (define-key map [delete] 'quail-backward-or-forward-delete-char) (define-key map [backspace] 'quail-delete-backward-char) ＠＠ -313,7 +313,7 ＠＠ (define-key map (char-to-string meta-prefix-char) meta-map)) (define-key map [escape] meta-map)) (when (characterp meta-prefix-char) - (define-key map (vector meta-prefix-char t) + (define-key map (string meta-prefix-char ?t) 'quail-execute-non-quail-command)) ;; At last, define default key binding. (set-keymap-default-binding map 'quail-execute-non-quail-command) ＠＠ -341,7 +341,7 ＠＠ (define-key map (char-to-string meta-prefix-char) meta-map)) (define-key map [escape] meta-map)) (when (characterp meta-prefix-char) - (define-key map (vector meta-prefix-char t) + (define-key map (string meta-prefix-char ?t) 'quail-execute-non-quail-command)) ;; At last, define default key binding. (set-keymap-default-binding map 'quail-execute-non-quail-command) ＠＠ -731,7 +731,7 ＠＠ function tells Quail system the layout of your keyboard so that what you type is correctly handled." (interactive - (let* ((completing-ignore-case t) + (let* ((completion-ignore-case t) (type (completing-read "Keyboard type: " quail-keyboard-layout-alist))) (list type))) ＠＠ -1219,7 +1219,7 ＠＠ (maxcol (- (window-width quail-guidance-win) quail-guidance-translations-starting-column)) (block (nth 3 indices)) - col idx width trans num-items blocks) + col idx width trans num-items) (if (< cur start) ;; We must calculate from the head. (setq start 0 block 0) ＠＠ -1459,6 +1459,12 ＠＠ ;; Guidance, Completion, and Help buffer handlers. +(defun-when-void frame-char-height (&optional frame) + "Return the height in pixels of a line of text on FRAME. + +If FRAME is on a TTY console, return the integer 1." + (face-height 'default (or frame (selected-frame)))) + ;; Make a new one-line frame for Quail guidance buffer. (defun quail-make-guidance-frame (buf) (let* ((fparam (frame-parameters)) ＠＠ -1724,8 +1730,7 ＠＠ (setq translations (cdr translations)) ;; Insert every 10 elements with indices in a line. (let ((len (length translations)) - (i 0) - num) + (i 0)) (while (< i len) (when (zerop (% i 10)) (when (>= i 10) ＠＠ -1842,7 +1847,7 ＠＠ (set-buffer standard-output) (let ((quail-current-package package)) (princ "You are translating the key sequence ") - (prin1 quail-current-key) + (prin1 current-key) (princ" in Quail mode.\n") (quail-help-insert-keymap-description (quail-translation-keymap) ＠＠ -2009,7 +2014,7 ＠＠ (interactive "FDirectory of LEIM: ") (setq dirname (expand-file-name dirname)) (let ((leim-list (expand-file-name leim-list-file-name dirname)) - quail-dirs list-buf pkg-list pkg-buf pos) + quail-dirs list-buf pkg-list pos) (if (not (file-writable-p leim-list)) (error "Can't write to file \"%s\"" leim-list)) (message "Updating %s ..." leim-list) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[PATCH] Make x-symbol-nomule.el compile with no mouse-yank-function 14 years, 3 months

The XEmacs Package Smoketest

Hi, This patch makes x-symbol-nomule.el compile when mouse-yank-function isn't defined, as is the case for XEmacs built with no windows system. I have, contrary to my normal routines, applied this locally to the package smoketest, and 21.5-nomule build succeeds with this patch. Please review for commit to package tree. ---------------------------------------------------------------------- Index: ChangeLog =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/xemacs-packages/x-symbol/ChangeLog,v retrieving revision 1.26 diff -r1.26 ChangeLog 0a1,6 > 2010-08-03 Mats Lidell <matsl(a)xemacs.org> > > * lisp/x-symbol-nomule.el (x-symbol-nomule-mouse-yank-function): > XEmacs build with no window system has not got > mouse-yank-function. > Index: lisp/x-symbol-nomule.el =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/xemacs-packages/x-symbol/lisp/x-symbol-nomule.el,v retrieving revision 1.4 diff -r1.4 x-symbol-nomule.el 70c70,72 < (defvar x-symbol-nomule-mouse-yank-function mouse-yank-function --- > (defvar x-symbol-nomule-mouse-yank-function > (and (boundp 'mouse-yank-function) > mouse-yank-function) ---------------------------------------------------------------------- Yours -- %% Mats _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

2 participants
2 comments

[COMMIT] Add fixnum as an accepted destination type, #'coerce 14 years, 3 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1283530450 -3600 # Node ID 30bf66dd3ca0d987bf2ad8a05ea8843bf92d437d # Parent 6c8f5574d4a16620ba5f97eac7e377d8fc0f79ae Add fixnum as an accepted destination type, #'coerce 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * cl-extra.el (coerce): Add fixnum as an accepted destination type. diff -r 6c8f5574d4a1 -r 30bf66dd3ca0 lisp/ChangeLog --- a/lisp/ChangeLog Fri Sep 03 15:35:53 2010 +0100 +++ b/lisp/ChangeLog Fri Sep 03 17:14:10 2010 +0100 ＠＠ -1,3 +1,8 ＠＠ +2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-extra.el (coerce): + Add fixnum as an accepted destination type. + 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * obsolete.el (process-get): diff -r 6c8f5574d4a1 -r 30bf66dd3ca0 lisp/cl-extra.el --- a/lisp/cl-extra.el Fri Sep 03 15:35:53 2010 +0100 +++ b/lisp/cl-extra.el Fri Sep 03 17:14:10 2010 +0100 ＠＠ -64,11 +64,11 ＠＠ ((and (eq type 'character) (symbolp x)) (coerce (symbol-name x) type)) ;; XEmacs addition character <-> integer coercions ((and (eq type 'character) (char-int-p x)) (int-char x)) - ((and (eq type 'integer) (characterp x)) (char-int x)) + ((and (memq type '(integer fixnum)) (characterp x)) (char-int x)) ((eq type 'float) (float x)) ;; XEmacs addition: enhanced numeric type coercions ((and-fboundp 'coerce-number - (memq type '(integer ratio bigfloat)) + (memq type '(integer ratio bigfloat fixnum)) (coerce-number x type))) ;; XEmacs addition: bit-vector coercion ((or (eq type 'bit-vector) -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: Add fixnum as an accepted destination type, #'coerce 14 years, 3 months

Aidan Kehoe

changeset: 5257:30bf66dd3ca0 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net> date: Fri Sep 03 17:14:10 2010 +0100 files: lisp/ChangeLog lisp/cl-extra.el description: Add fixnum as an accepted destination type, #'coerce 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * cl-extra.el (coerce): Add fixnum as an accepted destination type. diff -r 6c8f5574d4a1 -r 30bf66dd3ca0 lisp/ChangeLog --- a/lisp/ChangeLog Fri Sep 03 15:35:53 2010 +0100 +++ b/lisp/ChangeLog Fri Sep 03 17:14:10 2010 +0100 ＠＠ -1,3 +1,8 ＠＠ +2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-extra.el (coerce): + Add fixnum as an accepted destination type. + 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * obsolete.el (process-get): diff -r 6c8f5574d4a1 -r 30bf66dd3ca0 lisp/cl-extra.el --- a/lisp/cl-extra.el Fri Sep 03 15:35:53 2010 +0100 +++ b/lisp/cl-extra.el Fri Sep 03 17:14:10 2010 +0100 ＠＠ -64,11 +64,11 ＠＠ ((and (eq type 'character) (symbolp x)) (coerce (symbol-name x) type)) ;; XEmacs addition character <-> integer coercions ((and (eq type 'character) (char-int-p x)) (int-char x)) - ((and (eq type 'integer) (characterp x)) (char-int x)) + ((and (memq type '(integer fixnum)) (characterp x)) (char-int x)) ((eq type 'float) (float x)) ;; XEmacs addition: enhanced numeric type coercions ((and-fboundp 'coerce-number - (memq type '(integer ratio bigfloat)) + (memq type '(integer ratio bigfloat fixnum)) (coerce-number x type))) ;; XEmacs addition: bit-vector coercion ((or (eq type 'bit-vector) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Fix the C++, Visual Studio 2005 builds. 14 years, 3 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1283524553 -3600 # Node ID 6c8f5574d4a16620ba5f97eac7e377d8fc0f79ae # Parent b5611afbcc76ccadea91257e34d9c609632c1750 Fix the C++, Visual Studio 2005 builds. src/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * symsinit.h: Declare reinit_process_early() here, fixing the C++ build; thank you for pointing this out, Adam Sjogren! * fontcolor-msw.c (mswindows_string_to_color): Cast the result of bsearch() to a colormap_t pointer, fixing the Visual Studio 2005 build. diff -r b5611afbcc76 -r 6c8f5574d4a1 src/ChangeLog --- a/src/ChangeLog Thu Sep 02 12:23:11 2010 +0100 +++ b/src/ChangeLog Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1,3 +1,11 ＠＠ +2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> + + * symsinit.h: Declare reinit_process_early() here, fixing the C++ + build; thank you for pointing this out, Adam Sjøgren! + * fontcolor-msw.c (mswindows_string_to_color): + Cast the result of bsearch() to a colormap_t pointer, fixing the + Visual Studio 2005 build. + 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * strftime.c (roman_upper, roman_lower, strftime): diff -r b5611afbcc76 -r 6c8f5574d4a1 src/fontcolor-msw.c --- a/src/fontcolor-msw.c Thu Sep 02 12:23:11 2010 +0100 +++ b/src/fontcolor-msw.c Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1022,10 +1022,10 ＠＠ } *c = '\0'; - if ((res = bsearch (&key, mswindows_X_color_map, - countof (mswindows_X_color_map), - sizeof (mswindows_X_color_map[0]), - colormap_t_compare)) != NULL) + if ((res = (colormap_t *) bsearch (&key, mswindows_X_color_map, + countof (mswindows_X_color_map), + sizeof (mswindows_X_color_map[0]), + colormap_t_compare)) != NULL) { return res->colorref; } diff -r b5611afbcc76 -r 6c8f5574d4a1 src/symsinit.h --- a/src/symsinit.h Thu Sep 02 12:23:11 2010 +0100 +++ b/src/symsinit.h Fri Sep 03 15:35:53 2010 +0100 ＠＠ -54,6 +54,7 ＠＠ void init_errors_once_early (void); void reinit_opaque_early (void); void init_opaque_once_early (void); +void reinit_process_early (void); void reinit_symbols_early (void); void init_symbols_once_early (void); -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: Fix the C++, Visual Studio 2005 builds. 14 years, 3 months

Aidan Kehoe

changeset: 5256:6c8f5574d4a1 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net> date: Fri Sep 03 15:35:53 2010 +0100 files: src/ChangeLog src/fontcolor-msw.c src/symsinit.h description: Fix the C++, Visual Studio 2005 builds. src/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * symsinit.h: Declare reinit_process_early() here, fixing the C++ build; thank you for pointing this out, Adam Sjogren! * fontcolor-msw.c (mswindows_string_to_color): Cast the result of bsearch() to a colormap_t pointer, fixing the Visual Studio 2005 build. diff -r b5611afbcc76 -r 6c8f5574d4a1 src/ChangeLog --- a/src/ChangeLog Thu Sep 02 12:23:11 2010 +0100 +++ b/src/ChangeLog Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1,3 +1,11 ＠＠ +2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> + + * symsinit.h: Declare reinit_process_early() here, fixing the C++ + build; thank you for pointing this out, Adam Sjøgren! + * fontcolor-msw.c (mswindows_string_to_color): + Cast the result of bsearch() to a colormap_t pointer, fixing the + Visual Studio 2005 build. + 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * strftime.c (roman_upper, roman_lower, strftime): diff -r b5611afbcc76 -r 6c8f5574d4a1 src/fontcolor-msw.c --- a/src/fontcolor-msw.c Thu Sep 02 12:23:11 2010 +0100 +++ b/src/fontcolor-msw.c Fri Sep 03 15:35:53 2010 +0100 ＠＠ -1022,10 +1022,10 ＠＠ } *c = '\0'; - if ((res = bsearch (&key, mswindows_X_color_map, - countof (mswindows_X_color_map), - sizeof (mswindows_X_color_map[0]), - colormap_t_compare)) != NULL) + if ((res = (colormap_t *) bsearch (&key, mswindows_X_color_map, + countof (mswindows_X_color_map), + sizeof (mswindows_X_color_map[0]), + colormap_t_compare)) != NULL) { return res->colorref; } diff -r b5611afbcc76 -r 6c8f5574d4a1 src/symsinit.h --- a/src/symsinit.h Thu Sep 02 12:23:11 2010 +0100 +++ b/src/symsinit.h Fri Sep 03 15:35:53 2010 +0100 ＠＠ -54,6 +54,7 ＠＠ void init_errors_once_early (void); void reinit_opaque_early (void); void init_opaque_once_early (void); +void reinit_process_early (void); void reinit_symbols_early (void); void init_symbols_once_early (void); _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

Re: [COMMIT] Be better about key sequence syntax, po-mode.el 14 years, 3 months

Aidan Kehoe

Ar an triú lá de mí Méan Fómhair, scríobh Mats Lidell: > >>>>> Norbert Koch <viteno(a)xemacs.org> writes: > > Norbert> if I read the smoketest results correctly, this code does not compile > Norbert> (21.5 MULE output). > > Yes and just evaulating this > > (define-key po-mode-map [(control c) (control #)] > 'po-edit-comment-and-ediff) > > Give "Invalid read syntax". Should it be > > (define-key po-mode-map [(control c) (control ?#)] > 'po-edit-comment-and-ediff) The canonical way of representing a key is as a symbol, so (control \#). Your syntax is fine too. > Related: I guess there is some place in the manual where one can read > about such beasts as the #-char. It has some special maeaning for a > non lisper like me trying to learn, is there a pointer to some docs > here? See the expression prefix syntax class in the Lispref, (Info-goto-node "(lispref.info)Syntax Class Table") Basically, because # starts the read syntax for structures, quoted functions, and compiled functions, it needs to be quoted to be treated as a symbol constituent. -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Correct my key syntax, po-mode.el 14 years, 3 months

Aidan Kehoe

Ar an triú lá de mí Méan Fómhair, scríobh Norbert Koch: > * Aidan Kehoe <kehoea(a)parhasard.net>: > > Aidan, > > > --- xemacs-packages/text-modes/po-mode.el 2 Jan 2004 19:59:05 -0000 1.4 > > +++ xemacs-packages/text-modes/po-mode.el 2 Sep 2010 20:32:41 -0000 > > ＠＠ -1002,7 +1002,8 ＠＠ > > (define-key po-mode-map "\177" 'po-fade-out-entry) > > (define-key po-mode-map "\C-c\C-a" 'po-select-auxiliary) > > (define-key po-mode-map "\C-c\C-e" 'po-edit-msgstr-and-ediff) > > - (define-key po-mode-map [?\C-c?\C-#] 'po-edit-comment-and-ediff) > > + (define-key po-mode-map [(control c) (control #)] > > + 'po-edit-comment-and-ediff) > > if I read the smoketest results correctly, this code does not compile > (21.5 MULE output). Yes, my mistake, bah. APPROVE COMMIT NOTE: This patch has been committed. xemacs-packages/text-modes/ChangeLog addition: 2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net> * po-mode.el (po-mode-map): Oops, the Lisp reader doesn't like (control #) as syntax; thanks for the reports, Norbert Koch and Mats Lidell! XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: xemacs-packages/text-modes/po-mode.el Index: xemacs-packages/text-modes/po-mode.el =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/xemacs-packages/text-modes/po-mode.el,v retrieving revision 1.5 diff -u -r1.5 po-mode.el --- xemacs-packages/text-modes/po-mode.el 2 Sep 2010 20:35:47 -0000 1.5 +++ xemacs-packages/text-modes/po-mode.el 3 Sep 2010 13:38:26 -0000 ＠＠ -1002,7 +1002,7 ＠＠ (define-key po-mode-map "\177" 'po-fade-out-entry) (define-key po-mode-map "\C-c\C-a" 'po-select-auxiliary) (define-key po-mode-map "\C-c\C-e" 'po-edit-msgstr-and-ediff) - (define-key po-mode-map [(control c) (control #)] + (define-key po-mode-map [(control c) (control \#)] 'po-edit-comment-and-ediff) (define-key po-mode-map "\C-c\C-C" 'po-edit-comment-and-ediff) (define-key po-mode-map "\M-," 'po-mark-translatable) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Be better about key sequence syntax, po-mode.el 14 years, 3 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. xemacs-packages/text-modes/ChangeLog addition: 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * po-mode.el (po-mode-map): Stop abusing the undocumented XEmacs key syntax for control characters, use the documented vector-of-lists approach instead. XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: xemacs-packages/text-modes/po-mode.el Index: xemacs-packages/text-modes/po-mode.el =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/xemacs-packages/text-modes/po-mode.el,v retrieving revision 1.4 diff -u -r1.4 po-mode.el --- xemacs-packages/text-modes/po-mode.el 2 Jan 2004 19:59:05 -0000 1.4 +++ xemacs-packages/text-modes/po-mode.el 2 Sep 2010 20:32:41 -0000 ＠＠ -1002,7 +1002,8 ＠＠ (define-key po-mode-map "\177" 'po-fade-out-entry) (define-key po-mode-map "\C-c\C-a" 'po-select-auxiliary) (define-key po-mode-map "\C-c\C-e" 'po-edit-msgstr-and-ediff) - (define-key po-mode-map [?\C-c?\C-#] 'po-edit-comment-and-ediff) + (define-key po-mode-map [(control c) (control #)] + 'po-edit-comment-and-ediff) (define-key po-mode-map "\C-c\C-C" 'po-edit-comment-and-ediff) (define-key po-mode-map "\M-," 'po-mark-translatable) (define-key po-mode-map "\M-." 'po-select-mark-and-mark) -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Extend my last change to more than one argument to #'kbd 14 years, 3 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. xemacs-packages/xemacs-base/ChangeLog addition: 2010-09-02 Aidan Kehoe <kehoea(a)parhasard.net> * edmacro.el (edmacro-parse-word): My last change worked on individual characters, not strings. Extend it to work on multiple characters, supplied as strings. XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: xemacs-packages/xemacs-base/edmacro.el Index: xemacs-packages/xemacs-base/edmacro.el =================================================================== RCS file: /cvsroot/xemacs/XEmacs/packages/xemacs-packages/xemacs-base/edmacro.el,v retrieving revision 1.4 diff -u -r1.4 edmacro.el --- xemacs-packages/xemacs-base/edmacro.el 2 Sep 2010 14:26:06 -0000 1.4 +++ xemacs-packages/xemacs-base/edmacro.el 2 Sep 2010 20:19:06 -0000 ＠＠ -474,7 +474,7 ＠＠ (when (string-match "^<\$[^<>]+\$>$" word) (setq word (match-string 1 word)) (setq force-sym t)) - (let* ((word-to-sym '(("NUL" . ?\0) + (let* ((word-to-sym '(("NUL" . (control ＠)) ("RET" . return) ("LFD" . linefeed) ("TAB" . tab) ＠＠ -493,10 +493,28 ＠＠ (cdr match) (intern arg)))))) (conv-chars (lambda (arg) - (let ((match (assoc arg edmacro-char-to-word))) - (if match - (cdr (assoc (cdr match) word-to-sym)) - arg)))) + (cond + ((cdr (assoc (cdr (assoc arg edmacro-char-to-word)) + word-to-sym))) + ((<= ?\x00 arg ?\x1f) + ;; Bug; we can't do this for \C-m, \C-j, \C-i, + ;; because edmacro-parse-keys, above, treats + ;; this as whitespace. + `(control + ,(intern (downcase (concat (list (+ arg ?＠)) + nil))))) + ((<= ?\x80 arg ?\x9f) + `(meta control + ,(intern (downcase (concat (list (- arg ?＠)) + nil))))) + ((<= ?\xa0 arg ?\xff) + `(meta + ,(intern (downcase (concat (list (- arg ?\x80)) + nil))))) + ;; The symbol is the canonical form. To be even + ;; more canonical, we should return a list of + ;; length one comprised of the symbol. + (t (intern (string arg)))))) (add (cond ((prog1 nil ＠＠ -548,20 +566,6 ＠＠ ;; because of the way `edmacro-format-keys' works. (mapcar 'identity word) (list (nconc (nreverse r1) (list (funcall conv follow))))))) - ((string-match "^[\x00-\x1f]$" word) - ;; Bug; we can't do this for \C-m, \C-j, \C-i, because - ;; edmacro-parse-keys, above, treats this as whitespace. - `((control - ,(intern (downcase (concat (list (+ (aref word 0) ?＠)) - nil)))))) - ((string-match "^[\x80-\xff]$" word) - `((meta ,＠(if (< (aref word 0) #xa0) - `(control ,(intern (downcase - (concat (list (- (aref word 0) - ?＠)) nil)))) - `(,(intern (downcase (concat - (list (- (aref word 0) #x80)) - nil)))))))) (force-sym ;; This must be a symbol (list (intern word))) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches September 2010