From: tomo Date: Tue, 14 Aug 2001 15:37:04 +0000 (+0000) Subject: XEmacs 21.2.40 "Persephone". X-Git-Tag: r21-2-40~2 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c5e615c17f89a5d09fedffc7a387162d12e1b8a6;p=chise%2Fxemacs-chise.git.1 XEmacs 21.2.40 "Persephone". --- diff --git a/info/texinfo.info b/info/texinfo.info index acf2780..88624fb 100644 --- a/info/texinfo.info +++ b/info/texinfo.info @@ -38,14 +38,14 @@ texinfo.info-1: 1484 texinfo.info-2: 48703 texinfo.info-3: 96677 texinfo.info-4: 146069 -texinfo.info-5: 196054 -texinfo.info-6: 245146 -texinfo.info-7: 293741 -texinfo.info-8: 343556 -texinfo.info-9: 392869 -texinfo.info-10: 435247 -texinfo.info-11: 481363 -texinfo.info-12: 519523 +texinfo.info-5: 196056 +texinfo.info-6: 245148 +texinfo.info-7: 293743 +texinfo.info-8: 343558 +texinfo.info-9: 392871 +texinfo.info-10: 435249 +texinfo.info-11: 481365 +texinfo.info-12: 519525  Tag Table: (Indirect) @@ -157,194 +157,194 @@ Node: Three Arguments183553 Node: Four and Five Arguments185944 Node: Top Node Naming188356 Node: ref189366 -Node: pxref190756 -Node: inforef193138 -Node: uref194431 -Node: Marking Text195430 -Node: Indicating196054 -Node: Useful Highlighting197959 -Node: code199348 -Node: kbd202386 -Node: key204256 -Node: samp205589 -Node: var207176 -Node: file208969 -Node: dfn209576 -Node: cite210486 -Node: url210940 -Node: email211504 -Node: Emphasis212316 -Node: emph & strong213216 -Node: Smallcaps214202 -Node: Fonts215529 -Node: Customized Highlighting216617 -Node: Customized Highlighting-Footnotes219432 -Ref: Customized Highlighting-Footnote-1219526 -Node: Quotations and Examples219652 -Node: Block Enclosing Commands221274 -Node: quotation223299 -Node: example224389 -Node: noindent226444 -Node: Lisp Example227908 -Node: Lisp Example-Footnotes228610 -Ref: Lisp Example-Footnote-1228682 -Node: smallexample & smalllisp228800 -Node: display230825 -Node: format231457 -Node: exdent231918 -Node: flushleft & flushright232998 -Node: cartouche234264 -Node: Lists and Tables235031 -Node: Introducing Lists235707 -Node: itemize237372 -Node: enumerate239519 -Node: Two-column Tables242024 -Node: table242713 -Node: ftable vtable245146 -Node: itemx246247 -Node: Multi-column Tables247258 -Node: Multitable Column Widths247929 -Node: Multitable Rows249383 -Node: Indices251160 -Node: Index Entries252310 -Node: Predefined Indices253443 -Node: Indexing Commands254440 -Node: Combining Indices258980 -Node: syncodeindex260343 -Node: synindex262005 -Node: New Indices262530 -Node: Insertions264355 -Node: Braces Atsigns265539 -Node: Inserting An Atsign266091 -Node: Inserting Braces266365 -Node: Inserting Space266728 -Node: Not Ending a Sentence267232 -Node: Ending a Sentence268586 -Node: Multiple Spaces269715 -Node: dmn270934 -Node: Inserting Accents272141 -Node: Dots Bullets273898 -Node: dots274720 -Node: bullet275244 -Node: TeX and copyright275641 -Node: tex276208 -Node: copyright symbol276624 -Node: pounds276884 -Node: minus277248 -Node: math278170 -Node: Glyphs278898 -Node: Glyphs Summary280011 -Node: result280639 -Node: expansion281124 -Node: Print Glyph282080 -Node: Error Glyph282957 -Node: Equivalence283790 -Node: Point Glyph284478 -Node: Images286035 -Node: Breaks287702 -Node: Break Commands289133 -Node: Line Breaks289974 -Node: - and hyphenation290992 -Node: w292242 -Node: sp292955 -Node: page293364 -Node: group293741 -Node: need295484 -Node: Definition Commands296214 -Node: Def Cmd Template297785 -Node: Optional Arguments300782 -Node: deffnx302370 -Node: Def Cmds in Detail303325 -Node: Functions Commands304435 -Node: Variables Commands307440 -Node: Typed Functions309526 -Node: Typed Variables313068 -Node: Abstract Objects315051 -Node: Data Types320276 -Node: Def Cmd Conventions321531 -Node: Sample Function Definition322094 -Node: Footnotes324978 -Node: Footnotes-Footnotes325366 -Ref: Footnotes-Footnote-1325432 -Node: Footnote Commands325712 -Node: Footnote Commands-Footnotes327209 -Ref: Footnote Commands-Footnote-1327291 -Node: Footnote Styles327327 -Node: Conditionals329913 -Node: Conditional Commands330724 -Node: Conditional Not Commands332217 -Node: Raw Formatter Commands332962 -Node: set clear value334792 -Node: ifset ifclear335593 -Node: value338772 -Node: value Example340184 -Node: Macros341762 -Node: Defining Macros342467 -Node: Invoking Macros343556 -Node: Format/Print Hardcopy344662 -Node: Use TeX346499 -Node: Format with tex/texindex347127 -Node: Format with texi2dvi350768 -Node: Print with lpr351359 -Node: Within Emacs352213 -Node: Texinfo Mode Printing353132 -Node: Compile-Command356542 -Node: Requirements Summary357430 -Node: Preparing for TeX358743 -Node: Overfull hboxes361530 -Node: smallbook363089 -Node: A4 Paper364607 -Node: Cropmarks and Magnification365832 -Node: Create an Info File367773 -Node: makeinfo advantages369076 -Node: Invoking makeinfo369992 -Node: makeinfo options370680 -Node: Pointer Validation376164 -Node: makeinfo in Emacs377508 -Node: texinfo-format commands380066 -Node: Batch Formatting381337 -Node: Tag and Split Files382553 -Node: Install an Info File385907 -Node: Directory file386725 -Node: New Info File388593 -Node: Other Info Directories389654 -Node: Installing Dir Entries392869 -Node: Invoking install-info394862 -Node: Command List397277 -Node: Tips435247 -Node: Sample Texinfo File446657 -Node: Sample Permissions448776 -Node: Inserting Permissions449819 -Node: ifinfo Permissions452125 -Node: Titlepage Permissions453746 -Node: Include Files455008 -Node: Using Include Files456095 -Node: texinfo-multiple-files-update458050 -Node: Include File Requirements460411 -Node: Sample Include File461656 -Node: Include Files Evolution463175 -Node: Headings465146 -Node: Headings Introduced465783 -Node: Heading Format467671 -Node: Heading Choice470123 -Node: Custom Headings471495 -Node: Catching Mistakes475823 -Node: makeinfo Preferred477112 -Node: Debugging with Info478017 -Node: Debugging with TeX481363 -Node: Using texinfo-show-structure485643 -Node: Using occur488742 -Node: Running Info-Validate490279 -Node: Using Info-validate491340 -Node: Unsplit493182 -Node: Tagifying494228 -Node: Splitting495080 -Node: Refilling Paragraphs496696 -Node: Refilling Paragraphs-Footnotes498350 -Ref: Refilling Paragraphs-Footnote-1498438 -Node: Command Syntax498601 -Node: Obtaining TeX501558 -Node: Command and Variable Index503671 -Node: Concept Index519523 +Node: pxref190758 +Node: inforef193140 +Node: uref194433 +Node: Marking Text195432 +Node: Indicating196056 +Node: Useful Highlighting197961 +Node: code199350 +Node: kbd202388 +Node: key204258 +Node: samp205591 +Node: var207178 +Node: file208971 +Node: dfn209578 +Node: cite210488 +Node: url210942 +Node: email211506 +Node: Emphasis212318 +Node: emph & strong213218 +Node: Smallcaps214204 +Node: Fonts215531 +Node: Customized Highlighting216619 +Node: Customized Highlighting-Footnotes219434 +Ref: Customized Highlighting-Footnote-1219528 +Node: Quotations and Examples219654 +Node: Block Enclosing Commands221276 +Node: quotation223301 +Node: example224391 +Node: noindent226446 +Node: Lisp Example227910 +Node: Lisp Example-Footnotes228612 +Ref: Lisp Example-Footnote-1228684 +Node: smallexample & smalllisp228802 +Node: display230827 +Node: format231459 +Node: exdent231920 +Node: flushleft & flushright233000 +Node: cartouche234266 +Node: Lists and Tables235033 +Node: Introducing Lists235709 +Node: itemize237374 +Node: enumerate239521 +Node: Two-column Tables242026 +Node: table242715 +Node: ftable vtable245148 +Node: itemx246249 +Node: Multi-column Tables247260 +Node: Multitable Column Widths247931 +Node: Multitable Rows249385 +Node: Indices251162 +Node: Index Entries252312 +Node: Predefined Indices253445 +Node: Indexing Commands254442 +Node: Combining Indices258982 +Node: syncodeindex260345 +Node: synindex262007 +Node: New Indices262532 +Node: Insertions264357 +Node: Braces Atsigns265541 +Node: Inserting An Atsign266093 +Node: Inserting Braces266367 +Node: Inserting Space266730 +Node: Not Ending a Sentence267234 +Node: Ending a Sentence268588 +Node: Multiple Spaces269717 +Node: dmn270936 +Node: Inserting Accents272143 +Node: Dots Bullets273900 +Node: dots274722 +Node: bullet275246 +Node: TeX and copyright275643 +Node: tex276210 +Node: copyright symbol276626 +Node: pounds276886 +Node: minus277250 +Node: math278172 +Node: Glyphs278900 +Node: Glyphs Summary280013 +Node: result280641 +Node: expansion281126 +Node: Print Glyph282082 +Node: Error Glyph282959 +Node: Equivalence283792 +Node: Point Glyph284480 +Node: Images286037 +Node: Breaks287704 +Node: Break Commands289135 +Node: Line Breaks289976 +Node: - and hyphenation290994 +Node: w292244 +Node: sp292957 +Node: page293366 +Node: group293743 +Node: need295486 +Node: Definition Commands296216 +Node: Def Cmd Template297787 +Node: Optional Arguments300784 +Node: deffnx302372 +Node: Def Cmds in Detail303327 +Node: Functions Commands304437 +Node: Variables Commands307442 +Node: Typed Functions309528 +Node: Typed Variables313070 +Node: Abstract Objects315053 +Node: Data Types320278 +Node: Def Cmd Conventions321533 +Node: Sample Function Definition322096 +Node: Footnotes324980 +Node: Footnotes-Footnotes325368 +Ref: Footnotes-Footnote-1325434 +Node: Footnote Commands325714 +Node: Footnote Commands-Footnotes327211 +Ref: Footnote Commands-Footnote-1327293 +Node: Footnote Styles327329 +Node: Conditionals329915 +Node: Conditional Commands330726 +Node: Conditional Not Commands332219 +Node: Raw Formatter Commands332964 +Node: set clear value334794 +Node: ifset ifclear335595 +Node: value338774 +Node: value Example340186 +Node: Macros341764 +Node: Defining Macros342469 +Node: Invoking Macros343558 +Node: Format/Print Hardcopy344664 +Node: Use TeX346501 +Node: Format with tex/texindex347129 +Node: Format with texi2dvi350770 +Node: Print with lpr351361 +Node: Within Emacs352215 +Node: Texinfo Mode Printing353134 +Node: Compile-Command356544 +Node: Requirements Summary357432 +Node: Preparing for TeX358745 +Node: Overfull hboxes361532 +Node: smallbook363091 +Node: A4 Paper364609 +Node: Cropmarks and Magnification365834 +Node: Create an Info File367775 +Node: makeinfo advantages369078 +Node: Invoking makeinfo369994 +Node: makeinfo options370682 +Node: Pointer Validation376166 +Node: makeinfo in Emacs377510 +Node: texinfo-format commands380068 +Node: Batch Formatting381339 +Node: Tag and Split Files382555 +Node: Install an Info File385909 +Node: Directory file386727 +Node: New Info File388595 +Node: Other Info Directories389656 +Node: Installing Dir Entries392871 +Node: Invoking install-info394864 +Node: Command List397279 +Node: Tips435249 +Node: Sample Texinfo File446659 +Node: Sample Permissions448778 +Node: Inserting Permissions449821 +Node: ifinfo Permissions452127 +Node: Titlepage Permissions453748 +Node: Include Files455010 +Node: Using Include Files456097 +Node: texinfo-multiple-files-update458052 +Node: Include File Requirements460413 +Node: Sample Include File461658 +Node: Include Files Evolution463177 +Node: Headings465148 +Node: Headings Introduced465785 +Node: Heading Format467673 +Node: Heading Choice470125 +Node: Custom Headings471497 +Node: Catching Mistakes475825 +Node: makeinfo Preferred477114 +Node: Debugging with Info478019 +Node: Debugging with TeX481365 +Node: Using texinfo-show-structure485645 +Node: Using occur488744 +Node: Running Info-Validate490281 +Node: Using Info-validate491342 +Node: Unsplit493184 +Node: Tagifying494230 +Node: Splitting495082 +Node: Refilling Paragraphs496698 +Node: Refilling Paragraphs-Footnotes498352 +Ref: Refilling Paragraphs-Footnote-1498440 +Node: Command Syntax498603 +Node: Obtaining TeX501560 +Node: Command and Variable Index503673 +Node: Concept Index519525  End Tag Table diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 4536485..792f924 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f3de07..26d5dcd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + +2001-01-06 Stephen J. Turnbull + + * mule/hebrew.el: Fix comments and typos. + mule/japanese.el: Fix comments, typos, and 8-bit character encoding. + +2001-01-06 Stephen J. Turnbull + + * ChangeLog.1: move ancient log from fill.el. + + * dump-paths.el: + paragraphs.el: + mule/mule-category.el: + Miscellaneous typo fixes and slight doc clarifications. + + * mule/mule-ccl.el: Correct file name in header. + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 3ad71dd..08d2a10 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -6580,6 +6580,11 @@ Sat Mar 15 15:14:06 1997 Steven L Baur Abrahamsen). (batch-update-autoloads): Use it. +Fri Mar 14 20:00:00 1997 Jareth Hein + + * prim/fill.el: added functions for kinsoku (Asian text line + break processing). + Fri Mar 14 19:59:36 1997 Bob Weiner * packages/jka-compr.el (jka-compr-installed-p): Simplify. diff --git a/lisp/dump-paths.el b/lisp/dump-paths.el index 780f3ad..9381a0c 100644 --- a/lisp/dump-paths.el +++ b/lisp/dump-paths.el @@ -28,6 +28,7 @@ ;; This sets up the various paths for continuing loading files for ;; dumping. +;; #### This code is duplicated in startup.el (startup-setup-paths). (let ((debug-paths (or debug-paths (and (getenv "EMACSDEBUGPATHS") diff --git a/lisp/mule/hebrew.el b/lisp/mule/hebrew.el index 9e89fa1..d396df2 100644 --- a/lisp/mule/hebrew.el +++ b/lisp/mule/hebrew.el @@ -24,7 +24,7 @@ ;;; Commentary: -;; For Hebrew, the character sets ISO8859-8 is supported. +;; ISO 8859-8 (Hebrew) support. ;;; Code: @@ -34,19 +34,9 @@ (modify-syntax-entry (make-char 'hebrew-iso8859-8 32) "w") ; no-break space -;; (make-coding-system -;; 'hebrew-iso-8bit 2 ?8 -;; "ISO 2022 based 8-bit encoding for Hebrew (MIME:ISO-8859-8)" -;; '(ascii hebrew-iso8859-8 nil nil -;; nil ascii-eol ascii-cntl nil nil nil nil nil t) -;; '((safe-charsets ascii hebrew-iso8859-8) -;; (mime-charset . iso-8859-8))) - -;; (define-coding-system-alias 'iso-8859-8 'hebrew-iso-8bit) - (make-coding-system 'iso-8859-8 'iso2022 - "MIME ISO-8859-8" + "ISO-8859-8 (ISO 2022 based 8-bit encoding for Hebrew)" '(charset-g0 ascii charset-g1 hebrew-iso8859-8 charset-g2 t @@ -57,7 +47,7 @@ (make-coding-system 'ctext-hebrew 'iso2022 - "Coding-system of Hebrew." + "Coding-system for Hebrew." '(charset-g0 ascii charset-g1 hebrew-iso8859-8 charset-g2 t @@ -67,7 +57,7 @@ (defun setup-hebrew-environment () "Setup multilingual environment (MULE) for Hebrew. -But, please note that right-to-left writing is not yet supported." +Note: right-to-left writing is not yet supported." (interactive) (set-language-environment "Hebrew")) diff --git a/lisp/mule/japanese.el b/lisp/mule/japanese.el index 0898366..42b2207 100644 --- a/lisp/mule/japanese.el +++ b/lisp/mule/japanese.el @@ -125,8 +125,11 @@ ;; (setq egg-default-startup-file "eggrc-wnn") (setq-default its:*current-map* (its:get-mode-map "roma-kana")))) -;; stuff for providing gramatic processing of Japanese text +;; stuff for providing grammatic processing of Japanese text ;; something like this should probably be created for all environments... +;; #### Arrgh. This stuff should defvar'd in either fill.el or kinsoku.el. +;; Then the language environment should set these things, probably buffer- +;; locally. (defvar aletter (concat "\\(" ascii-char "\\|" kanji-char "\\)")) (defvar kanji-space-insertable (concat @@ -137,6 +140,7 @@ ascii-alphanumeric kanji-kanji-char "\\|" kanji-kanji-char ascii-alphanumeric )) +;; #### will be moved to fill.el (defvar space-insertable (concat " " aletter "\\|" kanji-space-insertable) "Regexp for finding points that can have spaces inserted into them for justification") @@ -258,7 +262,7 @@ shift_jis iso-2022-jp-2) ;; (input-method . "japanese") (features japan-util) - (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, )IºÝÆÁÊ")-A + (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B") (documentation . t))) ;;; japanese.el ends here diff --git a/lisp/mule/mule-category.el b/lisp/mule/mule-category.el index 254b541..3757302 100644 --- a/lisp/mule/mule-category.el +++ b/lisp/mule/mule-category.el @@ -279,6 +279,11 @@ Each element is a list of a charset, a designator, and maybe a doc string.") ;;; At the present, I know Japanese and Chinese text can ;;; break line at any point under a restriction of 'kinsoku'. +;;; #### SJT this needs to be set by language environments and probably should +;;; be buffer-local---strategy for dealing with this: check all $language.el +;;; files and also mule-base/$language-utils.el files for variables set; +;;; these should be made buffer local and some kind of a- or p-list of vars +;;; to be set for a language environment created. (defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)" "Regular expression of such characters which can be a word across newline.") diff --git a/lisp/mule/mule-ccl.el b/lisp/mule/mule-ccl.el index 72880fe..e6f72c4 100644 --- a/lisp/mule/mule-ccl.el +++ b/lisp/mule/mule-ccl.el @@ -1,4 +1,4 @@ -;;; ccl.el --- CCL (Code Conversion Language) compiler +;;; mule-ccl.el --- CCL (Code Conversion Language) compiler ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. diff --git a/lisp/paragraphs.el b/lisp/paragraphs.el index f26eb42..68b7a55 100644 --- a/lisp/paragraphs.el +++ b/lisp/paragraphs.el @@ -124,7 +124,9 @@ hard newline are considered to match.") (defconst paragraph-separate "[ \t\f]*$" "\ *Regexp for beginning of a line that separates paragraphs. -If you change this, you may have to change paragraph-start also. +If you change this, you may have to change `paragraph-start' also. + +A line matching this is not part of any paragraph. This is matched against the text at the left margin, which is not necessarily the beginning of the line, so it should not use \"^\" as an anchor. This @@ -347,7 +349,7 @@ negative arg -N means kill forward to Nth end of paragraph." With negative argument, move backward repeatedly to `sentence-beginning'. The variable `sentence-end' is a regular expression that matches ends of -sentences. Also, every paragraph boundary terminates sentences as well." +sentences. A paragraph boundary also terminates a sentence." (interactive "_p") ; XEmacs (or arg (setq arg 1)) (while (< arg 0) diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 71cbd9d..9c8c6e8 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,28 @@ +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + +2001-01-06 Martin Buchholz + + * lwlib-Xaw.c (xaw_creation_table): Make const. + * lwlib-Xaw.h (xaw_creation_table): Make const. + * lwlib-Xlw.c (xlw_creation_table): Make const. + * lwlib-Xlw.h (xlw_creation_table): Make const. + * lwlib-Xm.c (xm_creation_table): Make const. + * lwlib-Xm.h (xm_creation_table): Make const. + * lwlib.c (find_in_table): Use const. + +2001-01-02 Andy Piper + + * lwlib.h (_widget_args): add args_changed. Necessary because we + reference count args. + + * lwlib.c (lw_add_widget_value_arg): set args_changed flag. + (merge_widget_value_args): mark as changed if args_changed is + true. + (update_all_widget_values): reset args_changed. + (initialize_widget_instance): ditto. + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 5544c24..1bdafcd 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -880,7 +880,7 @@ xaw_create_text_field (widget_instance *instance) #endif /* LWLIB_WIDGETS_ATHENA */ -widget_creation_entry +const widget_creation_entry xaw_creation_table [] = { #ifdef LWLIB_SCROLLBARS_ATHENA diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h index 4562448..ce4bc10 100644 --- a/lwlib/lwlib-Xaw.h +++ b/lwlib/lwlib-Xaw.h @@ -3,7 +3,7 @@ #include "lwlib-internal.h" -extern widget_creation_entry xaw_creation_table []; +extern const widget_creation_entry xaw_creation_table []; Widget xaw_create_dialog (widget_instance* instance); diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index bfb2dfa..92437d5 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -482,7 +482,7 @@ xlw_create_clip_window (widget_instance *instance) } #endif -widget_creation_entry +const widget_creation_entry xlw_creation_table [] = { #ifdef LWLIB_MENUBARS_LUCID diff --git a/lwlib/lwlib-Xlw.h b/lwlib/lwlib-Xlw.h index f4fd0ed..f1611d7 100644 --- a/lwlib/lwlib-Xlw.h +++ b/lwlib/lwlib-Xlw.h @@ -3,7 +3,7 @@ #include "lwlib-internal.h" -extern widget_creation_entry xlw_creation_table []; +extern const widget_creation_entry xlw_creation_table []; extern widget_creation_function xlw_create_dialog; Boolean diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 28dc5f8..2903ede 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -1786,7 +1786,7 @@ xm_create_combo_box (widget_instance *instance) /* Table of functions to create widgets */ -widget_creation_entry +const widget_creation_entry xm_creation_table [] = { #ifdef LWLIB_MENUBARS_MOTIF diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h index 13e48b0..b8973f6 100644 --- a/lwlib/lwlib-Xm.h +++ b/lwlib/lwlib-Xm.h @@ -3,7 +3,7 @@ #include "lwlib-internal.h" -extern widget_creation_entry xm_creation_table []; +extern const widget_creation_entry xm_creation_table []; Widget xm_create_dialog (widget_instance* instance); diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index bd6e900..44e5ebd 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -264,6 +264,10 @@ merge_widget_value_args (widget_value *old, widget_value *new) lw_copy_widget_value_args (new, old); changed = True; } + else if (new->args && new->args == old->args && new->args->args_changed == True) + { + changed = True; + } return changed; } @@ -756,7 +760,11 @@ update_all_widget_values (widget_info *info, Boolean deep_p) update_one_widget_instance (instance, deep_p); for (val = info->val; val; val = val->next) - val->change = NO_CHANGE; + { + val->change = NO_CHANGE; + if (val->args) + val->args->args_changed = False; + } } void @@ -821,7 +829,11 @@ initialize_widget_instance (widget_instance *instance) update_one_widget_instance (instance, True); for (val = instance->info->val; val; val = val->next) - val->change = NO_CHANGE; + { + val->change = NO_CHANGE; + if (val->args) + val->args->args_changed = False; + } } /* strcasecmp() is not sufficiently portable or standard, @@ -841,9 +853,9 @@ ascii_strcasecmp (const char *s1, const char *s2) } static widget_creation_function -find_in_table (const char *type, widget_creation_entry *table) +find_in_table (const char *type, const widget_creation_entry table[]) { - widget_creation_entry *cur; + const widget_creation_entry *cur; for (cur = table; cur->type; cur++) if (!ascii_strcasecmp (type, cur->type)) return cur->function; @@ -1393,6 +1405,8 @@ void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value) if (wv->args->nargs > 10) return; + /* Register the change. */ + wv->args->args_changed = True; /* If the arg is already there then we must replace it. */ for (i = 0; i < wv->args->nargs; i++) { diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index 9ee62e8..d2f0c54 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -106,6 +106,9 @@ typedef struct _widget_args /* Copying args is impossible so we make the caller give us heap allocated args and free them when no one wants them any more. */ int ref_count; + /* Since we are reference counting we need to be able to determine + when something has changed. */ + Boolean args_changed; } widget_args; typedef struct _widget_value diff --git a/man/ChangeLog b/man/ChangeLog index cb32e69..1816c40 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,14 @@ +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + +2001-01-06 Stephen J. Turnbull + + * emodules.texi (Required Functions): Xref coding rules for dual-use + modules (module and statically linked). Typo fix. + + * texinfo.texi (ref): Typo fix. + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. diff --git a/man/emodules.texi b/man/emodules.texi index 415caee..b1b250a 100644 --- a/man/emodules.texi +++ b/man/emodules.texi @@ -350,7 +350,14 @@ This required function contains calls to macros such as @code{DEFVAR_LISP()}, @code{DEFVAR_BOOL()} etc, and its purpose is to declare and initialize all and any variables that your module defines. They syntax for declaring variables is identical to the syntax used for -all internal @value{emacs} source code. +all internal @value{emacs} source code. If the module is intended to be +usable statically linked into XEmacs, the actions of this function are +severely restricted. @xref{General Coding Rules,,,internals, +@value{emacs} Internals Manual}. Also see the comments in +@file{src/emacs.c} (@code{main_1}). Modules which perform +initializations not permitted by these rules will probably work, but +dual-use (dynamic loading and static linking) modules will require very +careful, and possibly fragile, coding. @item modules_of_module @findex modules_of_module @@ -665,7 +672,7 @@ although @file{.ell} is the preferred extension. Once all of your source code files have been compiled (including the generated init file) you need to link them all together to create the loadable module. To do this, you invoke @code{ellcc} in link mode, by -passing the @code{--mode-link} option. You need to specify the final +passing the @code{--mode=link} option. You need to specify the final output file using the @code{--mod-output=NAME} option, but other than that all other arguments are passed on directly to the system compiler or linker, along with any other required arguments to create the diff --git a/man/texinfo.texi b/man/texinfo.texi index 321f488..121589e 100644 --- a/man/texinfo.texi +++ b/man/texinfo.texi @@ -1,5 +1,5 @@ \input texinfo.tex @c -*-texinfo-*- -@c $Id: texinfo.texi,v 1.8.2.5 2000/11/14 23:29:15 adrian Exp $ +@c $Id: texinfo.texi,v 1.8.2.6 2001/01/06 07:51:28 stephent Exp $ @c %**start of header @c All text is ignored before the setfilename. @@ -5882,7 +5882,7 @@ For more information, see @@ref@{Hurricanes@}. produces @example -For more information, see *Note Hurricanes. +For more information, see *Note Hurricanes::. @end example @noindent