August 2006 - XEmacs-Patches - XEmacs Mailing List Archives

[21.5] Resurrect string-to-char-list for backwards compatibility 18 years, 4 months

Ville Skyttä

21.5 This patch reintroduces string-to-char-list as an obsolete alias for string-to-list. Just removing the function may cause issues eg. with using packages compiled with an earlier version of XEmacs, cf. https://bugzilla.redhat.com/201524#c2 I intend to commit soonish unless there are objections. 2006-08-07 Ville Skyttä <scop(a)xemacs.org> * subr.el (string-to-char-list): New backwards compatibility alias for `string-to-list'.

2 participants
2 comments

[PATCH 21.5] Keymap memory leak 18 years, 4 months

Jerry James

PATCH 21.5 This patch plugs a memory leak in keymap.c. src/ChangeLog addition: 2006-08-03 Jerry James <james(a)xemacs.org> * keymap.c (where_is_recursive_mapper): Use the freshly allocated storage instead of leaking it. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: src/keymap.c Index: src/keymap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v retrieving revision 1.61 diff -d -u -r1.61 keymap.c --- src/keymap.c 2005/11/26 13:20:23 1.61 +++ src/keymap.c 2006/08/03 16:27:12 ＠＠ -3754,6 +3754,8 ＠＠ Lisp_Key_Data *new_ = xnew_array (Lisp_Key_Data, size); memcpy ((void *)new_, (const void *)c->keys_so_far, c->keys_so_far_total_size * sizeof (Lisp_Key_Data)); + xfree (c->keys_so_far, Lisp_Key_Data); + c->keys_so_far = new_; } else XREALLOC_ARRAY (c->keys_so_far, Lisp_Key_Data, size); -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

1 participants
1 comments

[COMMIT] Add an informative assertion to snarf-documentation 18 years, 4 months

Aidan Kehoe

I spent too much time hunting this down myself, I think it’s worth sparing other people that. APPROVE COMMIT NOTE: This patch has been committed. src/ChangeLog addition: 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * doc.c (Fsnarf_documentation): Add an assertion and a comment, rather than crashing in the 76584th call of hash_string when someone's using a DOC file that doesn't match the format. XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: src/doc.c Index: src/doc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doc.c,v retrieving revision 1.38 diff -u -u -r1.38 doc.c --- src/doc.c 2006/05/21 18:35:31 1.38 +++ src/doc.c 2006/08/06 16:34:28 ＠＠ -742,6 +742,10 ＠＠ if (p != end) { end = qxestrchr (p, '\n'); + /* If you trigger a failure with of this assertion, you probably + configured with --quick-build and need to to rebuild your DOC + file. */ + assert((end - p - 2) > -1); sym = oblookup (Vobarray, p + 2, end - p - 2); if (SYMBOLP (sym)) { -- Santa Maradona, priez pour moi!

3 participants
3 comments

[PATCH] with-timeout does not return the result of TIMEOUT-FORMS 18 years, 4 months

Daiki Ueno

The docstring of with-timeout says that If we give up, we run the TIMEOUT-FORMS and return the value of the last one. The call should look like: (with-timeout (SECONDS TIMEOUT-FORMS...) BODY...) However, it just throws away the result of TIMEOUT-FORMS (with-timeout (0.1 t) (sleep-for 10) nil) => nil Here is a patch to fix this. 2006-07-25 Daiki Ueno <ueno(a)unixuser.org> * timer-funcs.el (with-timeout): Return the result of TIMEOUT-FORMS if the timeout expires. xemacs-packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/xemacs-base/timer-funcs.el Index: xemacs-packages/xemacs-base/timer-funcs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/timer-funcs.el,v retrieving revision 1.2 diff -u -r1.2 timer-funcs.el --- xemacs-packages/xemacs-base/timer-funcs.el 11 Oct 2005 11:21:41 -0000 1.2 +++ xemacs-packages/xemacs-base/timer-funcs.el 25 Jul 2006 08:45:26 -0000 ＠＠ -182,14 +182,14 ＠＠ `(let ((with-timeout-tag (cons nil nil)) with-timeout-value with-timeout-timer) (unwind-protect - (when (catch with-timeout-tag + (if (catch with-timeout-tag (progn (setq with-timeout-timer (start-itimer "with-timeout" #'with-timeout-handler ,seconds nil nil t with-timeout-tag)) (setq with-timeout-value (progn ,＠body)) nil)) - ,＠timeout-forms + ,＠timeout-forms with-timeout-value) (delete-itimer with-timeout-timer))))) -- Daiki Ueno

2 participants
2 comments

[COMMIT] gnuclient bug on Ben's part 18 years, 4 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. I’ve noticed this for a few years; it was a comp.emacs.xemacs posting that prompted me to look into it more closely. Unfortunately, when resuming a gnuclient TTY frame, you still need to press C-c to get it to redisplay. lisp/ChangeLog addition: 2006-08-07 Aidan Kehoe <kehoea(a)parhasard.net> * frame.el (suspend-or-iconify-emacs): * frame.el (suspend-emacs-or-iconify-frame): Elaborate on what the functions do, hopefully preventing misunderstandings in the future. * keydefs.el (global-tty-map): "\C-z" is suspend-or-iconify-emacs on the TTY, not suspend-emacs. Fixes problems that arose where pressing C-z in a gnuclient fram suspended the whole process. XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: lisp/keydefs.el =================================================================== RCS lisp/frame.el =================================================================== RCS Index: lisp/frame.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v retrieving revision 1.25 diff -u -u -r1.25 frame.el --- lisp/frame.el 2005/11/13 07:39:28 1.25 +++ lisp/frame.el 2006/08/06 22:09:24 ＠＠ -1548,7 +1548,12 ＠＠ (setq iconification-data (cdr iconification-data)))) (defun suspend-or-iconify-emacs () - "Call iconify-emacs if using a window system, otherwise suspend Emacs." + "Call iconify-emacs if using a window system, otherwise suspend. + +`suspend' here can mean different things; if the current TTY console was +created by gnuclient, that console is suspended, and the related devices and +frames are removed from the display. Otherwise the Emacs process as a whole +is suspended--that is, the traditional Unix suspend takes place. " (interactive) (cond ((device-on-window-system-p) (iconify-emacs)) ＠＠ -1564,7 +1569,12 ＠＠ ;; different things depending on window-system. We can't do the same, ;; because we allow simultaneous X and TTY consoles. (defun suspend-emacs-or-iconify-frame () - "Iconify the selected frame if using a window system, otherwise suspend Emacs." + "Iconify the selected frame if using a window system, otherwise suspend. + +`suspend' here can mean different things; if the current TTY console was +created by gnuclient, the console is suspended, and the related devices and +frames are removed from the display. Otherwise the Emacs process as a whole +is suspended--that is, the traditional Unix suspend takes place. " (interactive) (cond ((device-on-window-system-p) (iconify-frame)) Index: lisp/keydefs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/keydefs.el,v retrieving revision 1.18 diff -u -u -r1.18 keydefs.el --- lisp/keydefs.el 2003/04/28 16:18:23 1.18 +++ lisp/keydefs.el 2006/08/06 22:09:24 ＠＠ -183,7 +183,7 ＠＠ ;; FSFmacs keyboard.c -(define-key global-tty-map "\C-z" 'suspend-emacs) +(define-key global-tty-map "\C-z" 'suspend-or-iconify-emacs) (define-key global-window-system-map "\C-z" 'zap-up-to-char) (define-key global-window-system-map '(control Z) 'iconify-frame) (define-key global-map "\C-x\C-z" 'suspend-or-iconify-emacs) -- Santa Maradona, priez pour moi!

1 participants
0 comments

[PATCH] Vary treatment of Han characters on a per-console basis. 18 years, 4 months

Aidan Kehoe

Whether East Asian double-width characters are treated as such is just as much a relevant console attribute as its coding-system, IMO. It should also be part of the user’s language environment, somehow, but that needs code a long hard look generally before it’s updated to deal with this. src/ChangeLog addition: 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * console-tty-impl.h (struct tty_console): New flag; multiple_width, specifying whether East Asian characters take up two columns on this terminal. The macro to access it expands to a constant under non-Mule, so anything conditionalising on it will be optimised away. * console-tty.c: * console-tty.c (tty_init_console): Initialise tty_con->multiple_width; zero on non-Mule, one on Mule. * console-tty.c (Fconsole_tty_multiple_width): New. * console-tty.c (Fset_console_tty_multiple_width): New. * console-tty.c (syms_of_console_tty): Make them available outside console-tty.c. * redisplay-tty.c (tty_text_width): * redisplay-tty.c (tty_output_ibyte_string): Check that the relevant console has multiple-width characters before using something other than the number of characters in a string for the text width of that string. * text.c: * text.c (ibyte_string_displayed_columns): * text.c (ichar_string_displayed_columns): Remove some Mule conditionals; add some sanity-checking. XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: src/text.c src/redisplay-tty.c src/console-tty.c src/console-tty-impl.h Index: src/console-tty-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-tty-impl.h,v retrieving revision 1.2 diff -u -u -r1.2 console-tty-impl.h --- src/console-tty-impl.h 2005/11/25 01:41:57 1.2 +++ src/console-tty-impl.h 2006/08/06 19:58:43 ＠＠ -200,6 +200,8 ＠＠ /* Is this TTY our controlling terminal? */ unsigned int controlling_terminal :1; unsigned int is_stdio :1; + /* Do East Asian chars take up two columns? */ + unsigned int multiple_width :1; }; #ifdef NEW_GC ＠＠ -220,6 +222,12 ＠＠ #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) + +#ifdef MULE +#define CONSOLE_TTY_MULTIPLE_WIDTH(c) (CONSOLE_TTY_DATA (c)->multiple_width) +#else /* MULE */ +#define CONSOLE_TTY_MULTIPLE_WIDTH(c) (0) +#endif /* MULE */ #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) Index: src/console-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-tty.c,v retrieving revision 1.34 diff -u -u -r1.34 console-tty.c --- src/console-tty.c 2005/11/25 01:41:58 1.34 +++ src/console-tty.c 2006/08/06 19:58:43 ＠＠ -158,6 +158,11 ＠＠ tty_con->terminal_type = terminal_type; tty_con->controlling_process = controlling_process; + /* multiple_width is not actually read or changed if Mule support isn't + available--the macro to access it expands to a constant--so this is + mainly for consistency. */ + tty_con->multiple_width = !(Vcharset_ascii == ichar_charset(0xFF)); + if (NILP (CONSOLE_NAME (con))) CONSOLE_NAME (con) = Ffile_name_nondirectory (tty); { ＠＠ -319,6 +324,46 ＠＠ return Qnil; } +DEFUN ("console-tty-multiple-width", Fconsole_tty_multiple_width, + 0, 1, 0, /* +Return whether CONSOLE treats East Asian double-width chars as such. + +CONSOLE defaults to the selected console. Without Mule support, +this always gives nil. +*/ + (console)) +{ + return CONSOLE_TTY_MULTIPLE_WIDTH (decode_tty_console(console)) + ? Qt : Qnil; +} + +DEFUN ("set-console-tty-multiple-width", Fset_console_tty_multiple_width, + 0, 2, 0, /* +Set whether CONSOLE treats East Asian double-width characters as such. + +CONSOLE defaults to the selected console, and VALUE defaults to nil. +Without Mule support, this throws an error if VALUE is non-nil. +*/ + (console, value)) +{ + if (!CONSOLE_TTY_MULTIPLE_WIDTH (decode_tty_console (console)) + && NILP(value)) + + { + return Qnil; + } + +#ifndef MULE + invalid_change + ("Non-nil change to console-tty-multiple-width' needs Mule.", value); +#endif + + CONSOLE_TTY_MULTIPLE_WIDTH (decode_tty_console (console)) + = NILP(value) ? 0 : 1; + + return Qnil; +} + /* #### Move this function to lisp */ DEFUN ("set-console-tty-coding-system", Fset_console_tty_coding_system, 0, 2, 0, /* ＠＠ -431,6 +476,8 ＠＠ DEFSUBR (Fconsole_tty_input_coding_system); DEFSUBR (Fset_console_tty_input_coding_system); DEFSUBR (Fset_console_tty_coding_system); + DEFSUBR (Fconsole_tty_multiple_width); + DEFSUBR (Fset_console_tty_multiple_width); } void Index: src/redisplay-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-tty.c,v retrieving revision 1.26 diff -u -u -r1.26 redisplay-tty.c --- src/redisplay-tty.c 2006/06/27 22:59:40 1.26 +++ src/redisplay-tty.c 2006/08/06 19:58:43 ＠＠ -100,16 +100,23 ＠＠ /***************************************************************************** tty_text_width - Non-Mule tty's don't have fonts (that we use at least), so everything + Non-Mule TTYs don't have fonts (that we use at least), so everything is considered to be fixed width -- in other words, we return LEN. Under Mule, however, a character can still cover more than one column, so we use ichar_string_displayed_columns(). ****************************************************************************/ static int -tty_text_width (struct frame *UNUSED (f), struct face_cachel *UNUSED (cachel), +tty_text_width (struct frame *f, struct face_cachel *UNUSED (cachel), const Ichar *str, Charcount len) { - return ichar_string_displayed_columns (str, len); + struct console *c = XCONSOLE(FRAME_CONSOLE (f)); + + if (CONSOLE_TTY_MULTIPLE_WIDTH (c)) + { + return ichar_string_displayed_columns (str, len); + } + + return len; } /***************************************************************************** ＠＠ -533,6 +540,8 ＠＠ { struct frame *f = XFRAME (w->frame); struct console *c = XCONSOLE (FRAME_CONSOLE (f)); + int incing = CONSOLE_TTY_MULTIPLE_WIDTH (c) ? + ibyte_string_displayed_columns (str, len) : len; /* First position the cursor. */ cmgoto (f, dl->ypos - 1, xpos); ＠＠ -541,7 +550,7 ＠＠ tty_turn_on_face (w, findex); send_string_to_tty_console (c, str, len); - TTY_INC_CURSOR_X (c, ibyte_string_displayed_columns (str, len)); + TTY_INC_CURSOR_X (c, incing); /* Turn the face properties back off. */ tty_turn_off_face (w, findex); Index: src/text.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.c,v retrieving revision 1.28 diff -u -u -r1.28 text.c --- src/text.c 2006/07/08 16:15:57 1.28 +++ src/text.c 2006/08/06 19:58:45 ＠＠ -1998,20 +1998,25 ＠＠ #endif } +/* A couple of these functions should only be called on a non-Mule build. */ +#ifdef MULE +#define ASSERT_BUILT_WITH_MULE() assert(1) +#else /* MULE */ +#define ASSERT_BUILT_WITH_MULE() assert(0) +#endif /* MULE */ + int ibyte_string_displayed_columns (const Ibyte *str, Bytecount len) { int cols = 0; const Ibyte *end = str + len; + ASSERT_BUILT_WITH_MULE(); + while (str < end) { -#ifdef MULE Ichar ch = itext_ichar (str); cols += XCHARSET_COLUMNS (ichar_charset (ch)); -#else - cols++; -#endif INC_IBYTEPTR (str); } ＠＠ -2019,19 +2024,17 ＠＠ } int -ichar_string_displayed_columns (const Ichar *USED_IF_MULE (str), Charcount len) +ichar_string_displayed_columns (const Ichar * str, Charcount len) { -#ifdef MULE int cols = 0; int i; + ASSERT_BUILT_WITH_MULE(); + for (i = 0; i < len; i++) cols += XCHARSET_COLUMNS (ichar_charset (str[i])); return cols; -#else /* not MULE */ - return len; -#endif } Charcount -- Santa Maradona, priez pour moi!

1 participants
1 comments

[COMMIT] Handle DEFUN_NORETURN, etc in find-function-C-source 18 years, 4 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. xemacs-packages/xemacs-devel/ChangeLog addition: 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * find-func.el (find-function-C-source): Change the regexp for a subr definition to also accept DEFUN_NORETURN, DEFUN_MANY and the other alternatives available in lisp.h. XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: xemacs-packages/xemacs-devel/find-func.el Index: xemacs-packages/xemacs-devel/find-func.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v retrieving revision 1.10 diff -u -u -r1.10 find-func.el --- xemacs-packages/xemacs-devel/find-func.el 2006/07/10 21:00:17 1.10 +++ xemacs-packages/xemacs-devel/find-func.el 2006/08/06 09:48:23 ＠＠ -199,7 +199,8 ＠＠ (concat "DEFVAR[A-Z_]*[ \t\n]*([ \t\n]*\"" (regexp-quote (symbol-name fun-or-var)) "\"") - (concat "DEFUN[ \t\n]*([ \t\n]*\"" + (concat "DEFUN\$_NORETURN\\|_MANY\\|_UNEVALLED" + "\\|_COMMAND_LOOP\\|\$[ \t\n]*([ \t\n]*\"" (regexp-quote (subr-name fun-or-var)) "\"")) nil t) -- Santa Maradona, priez pour moi!

1 participants
0 comments

[AC (pkgs)] Update calendar entry in MAINTAINERS 18 years, 4 months

Ville Skyttä

APPROVE COMMIT packages 2006-08-03 Ville Skyttä <scop(a)xemacs.org> * MAINTAINERS: Jeff Miller takes care of the calendar package.

1 participants
0 comments

[PATCH] Handle Latin-1 in syntax.c; make guillemets string delimiters 18 years, 4 months

Aidan Kehoe

The FSF are coming gently to the conclusion, again, that the guillemets are not parentheses. I implemented that insight in the various non-Latin-1 charsets a while ago, but never got around to doing it in the editor. lisp/ChangeLog addition: 2006-07-29 Aidan Kehoe <kehoea(a)parhasard.net> * iso8859-1.el: Move the symbol table modification to three lines at the end of syntax.c. src/ChangeLog addition: 2006-07-29 Aidan Kehoe <kehoea(a)parhasard.net> * syntax.c (Fsyntax_table_p): Make the docstring better reflect the code. * syntax.c (define_standard_syntax): Take a const UExtbyte * as the first argument, not a const char * * syntax.c (complex_vars_of_syntax): Use a macro instead of repeating code; don't redundantly set set the syntax of the alphanumeric characters to ?w; define syntax for Latin 1 characters here instead of in Lisp; guillemets are string delimiters, not parentheses. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/syntax.c lisp/iso8859-1.el Index: lisp/iso8859-1.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/iso8859-1.el,v retrieving revision 1.3 diff -u -u -r1.3 iso8859-1.el --- lisp/iso8859-1.el 2001/04/12 18:21:28 1.3 +++ lisp/iso8859-1.el 2006/07/29 11:29:54 ＠＠ -1,6 +1,6 ＠＠ -;;; iso8859-1.el --- Set case and syntax tables for Latin 1 +;;; iso8859-1.el --- Set syntax table for Latin 1 -;; Copyright (C) 1992, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1997, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz(a)jwz.org> ;; Created: 19-aug-92 ＠＠ -24,124 +24,16 ＠＠ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Not synched +;;; Synched up with: Not in FSF. ;;; Commentary: ;; created by jwz, 19-aug-92. -;; Sets the case and syntax tables for the ISO-8859/1 character set. +;; Sets the case table for the ISO-8859/1 character set. +;; Used to set the syntax table. ;;; Code: -(let ((table (standard-syntax-table))) - ;; - ;; The symbol characters - ;; - (modify-syntax-entry ?\240 "_" table) ; nobreakspace - (modify-syntax-entry ?\241 "." table) ; exclamdown - (modify-syntax-entry ?\242 "_" table) ; cent - (modify-syntax-entry ?\243 "_" table) ; sterling - (modify-syntax-entry ?\244 "_" table) ; currency - (modify-syntax-entry ?\245 "_" table) ; yen - (modify-syntax-entry ?\246 "_" table) ; brokenbar - (modify-syntax-entry ?\247 "_" table) ; section - (modify-syntax-entry ?\250 "_" table) ; diaeresis - (modify-syntax-entry ?\251 "_" table) ; copyright - (modify-syntax-entry ?\252 "_" table) ; ordfeminine - (modify-syntax-entry ?\253 "(\273" table) ; guillemotleft - (modify-syntax-entry ?\254 "_" table) ; notsign - (modify-syntax-entry ?\255 "_" table) ; hyphen - (modify-syntax-entry ?\256 "_" table) ; registered - (modify-syntax-entry ?\257 "_" table) ; macron - (modify-syntax-entry ?\260 "_" table) ; degree - (modify-syntax-entry ?\261 "_" table) ; plusminus - (modify-syntax-entry ?\262 "_" table) ; twosuperior - (modify-syntax-entry ?\263 "_" table) ; threesuperior - (modify-syntax-entry ?\264 "_" table) ; acute - (modify-syntax-entry ?\265 "_" table) ; mu - (modify-syntax-entry ?\266 "_" table) ; paragraph - (modify-syntax-entry ?\267 "_" table) ; periodcentered - (modify-syntax-entry ?\270 "_" table) ; cedilla - (modify-syntax-entry ?\271 "_" table) ; onesuperior - (modify-syntax-entry ?\272 "_" table) ; masculine - (modify-syntax-entry ?\273 ")\253" table) ; guillemotright - (modify-syntax-entry ?\274 "_" table) ; onequarter - (modify-syntax-entry ?\275 "_" table) ; onehalf - (modify-syntax-entry ?\276 "_" table) ; threequarters - (modify-syntax-entry ?\277 "_" table) ; questiondown - ;; - ;; the upper-case characters (plus "multiply" and "ssharp") - ;; - (modify-syntax-entry ?\300 "w" table) ; Agrave - (modify-syntax-entry ?\301 "w" table) ; Aacute - (modify-syntax-entry ?\302 "w" table) ; Acircumflex - (modify-syntax-entry ?\303 "w" table) ; Atilde - (modify-syntax-entry ?\304 "w" table) ; Adiaeresis - (modify-syntax-entry ?\305 "w" table) ; Aring - (modify-syntax-entry ?\306 "w" table) ; AE - (modify-syntax-entry ?\307 "w" table) ; Ccedilla - (modify-syntax-entry ?\310 "w" table) ; Egrave - (modify-syntax-entry ?\311 "w" table) ; Eacute - (modify-syntax-entry ?\312 "w" table) ; Ecircumflex - (modify-syntax-entry ?\313 "w" table) ; Ediaeresis - (modify-syntax-entry ?\314 "w" table) ; Igrave - (modify-syntax-entry ?\315 "w" table) ; Iacute - (modify-syntax-entry ?\316 "w" table) ; Icircumflex - (modify-syntax-entry ?\317 "w" table) ; Idiaeresis - (modify-syntax-entry ?\320 "w" table) ; ETH - (modify-syntax-entry ?\321 "w" table) ; Ntilde - (modify-syntax-entry ?\322 "w" table) ; Ograve - (modify-syntax-entry ?\323 "w" table) ; Oacute - (modify-syntax-entry ?\324 "w" table) ; Ocircumflex - (modify-syntax-entry ?\325 "w" table) ; Otilde - (modify-syntax-entry ?\326 "w" table) ; Odiaeresis - (modify-syntax-entry ?\327 "_" table) ; multiply - (modify-syntax-entry ?\330 "w" table) ; Ooblique - (modify-syntax-entry ?\331 "w" table) ; Ugrave - (modify-syntax-entry ?\332 "w" table) ; Uacute - (modify-syntax-entry ?\333 "w" table) ; Ucircumflex - (modify-syntax-entry ?\334 "w" table) ; Udiaeresis - (modify-syntax-entry ?\335 "w" table) ; Yacute - (modify-syntax-entry ?\336 "w" table) ; THORN - (modify-syntax-entry ?\337 "w" table) ; ssharp - ;; - ;; the lower-case characters (plus "division" and "ydiaeresis") - ;; - (modify-syntax-entry ?\340 "w" table) ; agrave - (modify-syntax-entry ?\341 "w" table) ; aacute - (modify-syntax-entry ?\342 "w" table) ; acircumflex - (modify-syntax-entry ?\343 "w" table) ; atilde - (modify-syntax-entry ?\344 "w" table) ; adiaeresis - (modify-syntax-entry ?\345 "w" table) ; aring - (modify-syntax-entry ?\346 "w" table) ; ae - (modify-syntax-entry ?\347 "w" table) ; ccedilla - (modify-syntax-entry ?\350 "w" table) ; egrave - (modify-syntax-entry ?\351 "w" table) ; eacute - (modify-syntax-entry ?\352 "w" table) ; ecircumflex - (modify-syntax-entry ?\353 "w" table) ; ediaeresis - (modify-syntax-entry ?\354 "w" table) ; igrave - (modify-syntax-entry ?\355 "w" table) ; iacute - (modify-syntax-entry ?\356 "w" table) ; icircumflex - (modify-syntax-entry ?\357 "w" table) ; idiaeresis - (modify-syntax-entry ?\360 "w" table) ; eth - (modify-syntax-entry ?\361 "w" table) ; ntilde - (modify-syntax-entry ?\362 "w" table) ; ograve - (modify-syntax-entry ?\363 "w" table) ; oacute - (modify-syntax-entry ?\364 "w" table) ; ocircumflex - (modify-syntax-entry ?\365 "w" table) ; otilde - (modify-syntax-entry ?\366 "w" table) ; odiaeresis - (modify-syntax-entry ?\367 "_" table) ; division - (modify-syntax-entry ?\370 "w" table) ; ooblique - (modify-syntax-entry ?\371 "w" table) ; ugrave - (modify-syntax-entry ?\372 "w" table) ; uacute - (modify-syntax-entry ?\373 "w" table) ; ucircumflex - (modify-syntax-entry ?\374 "w" table) ; udiaeresis - (modify-syntax-entry ?\375 "w" table) ; yacute - (modify-syntax-entry ?\376 "w" table) ; thorn - (modify-syntax-entry ?\377 "w" table) ; ydiaeresis - ) - - (defconst iso8859/1-case-table nil "The case table for ISO-8859/1 characters.") Index: src/syntax.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v retrieving revision 1.28 diff -u -u -r1.28 syntax.c --- src/syntax.c 2006/02/22 03:30:08 1.28 +++ src/syntax.c 2006/07/29 11:29:58 ＠＠ -146,7 +146,6 ＠＠ DEFUN ("syntax-table-p", Fsyntax_table_p, 1, 1, 0, /* Return t if OBJECT is a syntax table. -Any vector of 256 elements will do. */ (object)) { ＠＠ -2451,7 +2450,7 ＠＠ } static void -define_standard_syntax (const char *p, enum syntaxcode syn) +define_standard_syntax (const UExtbyte *p, enum syntaxcode syn) { for (; *p; p++) Fput_char_table (make_char (*p), make_int (syn), Vstandard_syntax_table); ＠＠ -2461,10 +2460,19 ＠＠ complex_vars_of_syntax (void) { Ichar i; - const char *p; - /* Set this now, so first buffer creation can refer to it. */ - /* Make it nil before calling copy-syntax-table - so that copy-syntax-table will know not to try to copy from garbage */ + const UExtbyte *p; /* Latin-1, not internal format. */ + +#define SET_RANGE_SYNTAX(start, end, syntax) \ + do { \ + for (i = start; i <= end; i++) \ + Fput_char_table(make_char(i), make_int(syntax), \ + Vstandard_syntax_table); \ + } while (0) + + /* Set this now, so first buffer creation can refer to it. + + Make it nil before calling copy-syntax-table so that copy-syntax-table + will know not to try to copy from garbage */ Vstandard_syntax_table = Qnil; Vstandard_syntax_table = Fcopy_syntax_table (Qnil); staticpro (&Vstandard_syntax_table); ＠＠ -2476,19 +2484,18 ＠＠ Smax); staticpro (&Vsyntax_designator_chars_string); + /* Default character syntax is word. */ set_char_table_default (Vstandard_syntax_table, make_int (Sword)); + + /* Control 0; treat as punctuation */ + SET_RANGE_SYNTAX(0, 32, Spunct); - for (i = 0; i <= 32; i++) /* Control 0 plus SPACE */ - Fput_char_table (make_char (i), make_int (Swhitespace), - Vstandard_syntax_table); - for (i = 127; i <= 159; i++) /* DEL plus Control 1 */ - Fput_char_table (make_char (i), make_int (Swhitespace), - Vstandard_syntax_table); - - define_standard_syntax ("abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789" - "$%", Sword); + /* The whitespace--overwriting some of the above changes. */ + define_standard_syntax(" \t\015\014", Swhitespace); + + /* DEL plus Control 1 */ + SET_RANGE_SYNTAX(127, 159, Spunct); + define_standard_syntax ("\"", Sstring); define_standard_syntax ("\\", Sescape); define_standard_syntax ("_-+*/&|<>=", Ssymbol); ＠＠ -2503,4 +2510,18 ＠＠ Fcons (make_int (Sclose), make_char (p[0])), Vstandard_syntax_table); } + + /* Latin 1 "symbols." This contrasts with the FSF, where they're word + constituents. */ + SET_RANGE_SYNTAX(0240, 0277, Ssymbol); + + /* The guillemets. These are not parentheses, in contrast to what the old + code did. */ + define_standard_syntax("\253\273", Sstring); + + /* The inverted exclamation mark, and the multiplication and division + signs. */ + define_standard_syntax("\241\327\367", Spunct); + +#undef SET_RANGE_SYNTAX } -- Santa Maradona, priez pour moi!

2 participants
4 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 August 2006