February 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[C] xemacsweb: Update of links to au.xemacs.org on maintainer's request 19 years, 10 months

Adrian Aichner

COMMIT As requested by mirror maintainer. Adrian xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Releases/ChangeLog Install/ChangeLog Download/ChangeLog Index: Releases/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v retrieving revision 1.108 diff -u -U0 -r1.108 ChangeLog --- Releases/ChangeLog 18 Feb 2005 09:52:28 -0000 1.108 +++ Releases/ChangeLog 21 Feb 2005 22:10:04 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-02-21 Adrian Aichner <adrian(a)xemacs.org> + + * index.content: Update of links to au.xemacs.org on maintainer's + request. + Index: Install/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Install/ChangeLog,v retrieving revision 1.33 diff -u -U0 -r1.33 ChangeLog --- Install/ChangeLog 17 Feb 2005 21:40:59 -0000 1.33 +++ Install/ChangeLog 21 Feb 2005 22:10:04 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-02-21 Adrian Aichner <adrian(a)xemacs.org> + + * index.content: Update of links to au.xemacs.org on maintainer's + request. + Index: Download/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/ChangeLog,v retrieving revision 1.156 diff -u -U0 -r1.156 ChangeLog --- Download/ChangeLog 31 Jan 2005 20:52:55 -0000 1.156 +++ Download/ChangeLog 21 Feb 2005 22:10:04 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-02-21 Adrian Aichner <adrian(a)xemacs.org> + + * index.content: Update of links to au.xemacs.org on maintainer's + request. + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Releases/index.content Install/index.content Download/index.content Index: Download/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/index.content,v retrieving revision 1.63 diff -u -w -r1.63 index.content --- Download/index.content 10 Dec 2004 00:25:30 -0000 1.63 +++ Download/index.content 21 Feb 2005 21:54:23 -0000 ＠＠ -285,8 +285,8 ＠＠ <ul> <li><a href="ftp://ftp.au.xemacs.org/pub/xemacs/" ><b>ftp.au.xemacs.org (FTP)</b></a></li> - <li><a href="http://ftp.au.xemacs.org/pub/xemacs/" - ><b>ftp.au.xemacs.org (HTTP)</b></a></li> + <li><a href="http://www.au.xemacs.org/pub/xemacs/" + ><b>www.au.xemacs.org (HTTP)</b></a></li> <li> <p></p> <h5>Secondary Mirrors</h5> Index: Install/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Install/index.content,v retrieving revision 1.33 diff -u -w -r1.33 index.content --- Install/index.content 17 Feb 2005 21:40:59 -0000 1.33 +++ Install/index.content 21 Feb 2005 21:54:23 -0000 ＠＠ -167,7 +167,7 ＠＠ or a mirror in your country: <a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/packages/">ar</a> <a href="http://ftp.at.xemacs.org/editors/xemacs/packages/">at</a> - <a href="http://ftp.au.xemacs.org/pub/xemacs/packages/">au</a> + <a href="http://www.au.xemacs.org/pub/xemacs/packages/">au</a> <a href="http://ftp.be.xemacs.org/ftp/xemacs/packages/">be</a> <a href="http://ftp.br.xemacs.org/pub/xemacs/packages/">br</a> <a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/packages/">ca</a> Index: Releases/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v retrieving revision 1.97 diff -u -w -r1.97 index.content --- Releases/index.content 18 Feb 2005 09:52:28 -0000 1.97 +++ Releases/index.content 21 Feb 2005 21:54:23 -0000 ＠＠ -29,7 +29,7 ＠＠ or a mirror in your country: <a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/stable/">ar</a> <a href="http://ftp.at.xemacs.org/editors/xemacs/stable/">at</a> - <a href="http://ftp.au.xemacs.org/pub/xemacs/stable/">au</a> + <a href="http://www.au.xemacs.org/pub/xemacs/stable/">au</a> <a href="http://ftp.be.xemacs.org/ftp/xemacs/stable/">be</a> <a href="http://ftp.br.xemacs.org/pub/xemacs/stable/">br</a> <a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/stable/">ca</a> ＠＠ -183,7 +183,7 ＠＠ or a mirror in your country: <a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/beta/">ar</a> <a href="http://ftp.at.xemacs.org/editors/xemacs/beta/">at</a> - <a href="http://ftp.au.xemacs.org/pub/xemacs/beta/">au</a> + <a href="http://www.au.xemacs.org/pub/xemacs/beta/">au</a> <a href="http://ftp.be.xemacs.org/ftp/xemacs/beta/">be</a> <a href="http://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5/">br</a> <a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta/">ca</a> ＠＠ -337,7 +337,7 ＠＠ or from a mirror in your country: <a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/packages/">ar</a> <a href="http://ftp.at.xemacs.org/editors/xemacs/packages/">at</a> - <a href="http://ftp.au.xemacs.org/pub/xemacs/packages/">au</a> + <a href="http://www.au.xemacs.org/pub/xemacs/packages/">au</a> <a href="http://ftp.be.xemacs.org/ftp/xemacs/packages/">be</a> <a href="http://ftp.br.xemacs.org/pub/xemacs/packages/">br</a> <a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/packages/">ca</a> -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

1 participants
0 comments

[AC sjt-xft] 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft Tweak a debug message. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.9 diff -u -U0 -r1.758.2.9 ChangeLog --- src/ChangeLog 20 Feb 2005 14:46:46 -0000 1.758.2.9 +++ src/ChangeLog 21 Feb 2005 08:40:30 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_finalize_font_instance): Improve debug message. + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.7 diff -u -r1.26.2.7 objects-x.c --- src/objects-x.c 20 Feb 2005 14:46:49 -0000 1.26.2.7 +++ src/objects-x.c 21 Feb 2005 08:40:43 -0000 ＠＠ -401,7 +401,7 ＠＠ if (debug_xft > 0) stderr_out ("finalizing %s", (STRINGP (f->name) ? (char *) XSTRING_DATA (f->name) - : "no font name")); + : "(unnamed font)")); #endif if (f->data) -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[PATCH] Fix for (was: Is flush-lines a performance boar in 21.5-b17) 19 years, 10 months

Adrian Aichner

Skip Montanaro <skip(a)pobox.com> writes: > Adrian> Hi all, I wondered if someone else could try a M-x flush-lines > Adrian> RET ^some-common-pattern RET on a file with a few thousand > Adrian> lines. > > I'm not sure how you got that table, but my experience is that flush-lines > is a real dog (I'm using 21.5b16 at the moment). I occasionally have to > flush a few thousand lines matching "^ *#". These days I just get up and do > something else for a few minutes. It used to take a couple seconds with > 21.4.x. Hi Skip, All! I identified the performance issue today. It's present in both (defun operate-on-non-matching-lines (regexp delete kill &optional beg end) and (defun operate-on-matching-lines (regexp delete kill &optional beg end) due to the way they the count lines (a feature the GNU Emacs version does not have) by first concating each match to a string. This causes enormuous consing and the resulting GC activity makes performance unbearable at the default gc-cons-threshold value. Already using (setq gc-cons-threshold 5000000) I got 89s for my test case. Function Name Ticks/Total %Usage Calls GC-Usage/ Total =========================================/===== ====== ===== ========/======= concat 55865/55871 62.448 2719 443787379/443787379 (in garbage collection) 31887/31902 35.644 87 delete-region 556/ 1083 0.622 2718 458724/ 687428 (profile overhead) 259/ 259 0.290 (in map-extents-internal) 234/ 255 0.262 24513 304796/ 304796 lazy-lock-after-change 118/ 250 0.132 2718 12/ 392 while 95/89313 0.106 1 448/444616854 re-search-forward 69/ 87 0.077 2719 (in char-byte conversion) 63/ 64 0.070 189410 if 42/ 1130 0.047 2723 280/ 687752 setq 29/56040 0.032 8154 0/443928698 (in redisplay) 28/ 38 0.031 23 448/ 448 get-text-property 25/ 32 0.028 2719 buffer-substring 21/ 49 0.023 2719 391456/ 467560 vertical-motion 21/ 43 0.023 5 64/ 64 save-excursion 19/89370 0.021 2719 0/444944595 lazy-lock-put-text-property 17/ 31 0.019 2718 0/ 380 and 17/ 116 0.019 2722 0/ 96 point-at-bol 16/ 29 0.018 2718 insert 14/ 14 0.016 1 forward-line 9/ 21 0.010 2718 window-end 9/ 21 0.010 4 (in internal-external conversion) 8/ 8 0.009 1267 beginning-of-line 8/ 17 0.009 2720 match-beginning 4/ 4 0.004 2718 progn 2/ 28 0.002 2718 next_event_internal() 2/ 2 0.002 23 112/ 112 count-lines 2/ 2 0.002 1 truncate-command-history-for-gc 2/ 2 0.002 87 not 2/ 2 0.002 2719 eobp 2/ 2 0.002 2719 goto-char 2/ 6 0.002 2718 make-saved-window 1/ 1 0.001 12 4032/ 5088 next-event 1/ 108 0.001 23 0/ 560 set-frame-pixel-size 1/ 1 0.001 1 mark-marker 1/ 1 0.001 17 event-buffer 1/ 1 0.001 8 point 1/ 1 0.001 5446 erase-buffer 1/ 1 0.001 8 lazy-lock-fontify-window 1/ 66 0.001 8 kill-buffer 1/ 1 0.001 1 24/ 96 reset-buffer 1/ 1 0.001 1 0/ 48 redisplay-echo-area 1/ 2 0.001 1 #<compiled-function nil "...(52)" [compilation-old-error-list compilation-parsing-end compilation-mouse-motion-initiate-parsing e compilation-error-list p nil t ((compile-reinitialize-errors nil p)) found (byte-code «¤Ä＠＠!© W«¥Aª± X«§ÅÆÇ"¨ª¥ÅÆÈ"¨)ªYÈ§ [e p x l marker-position throw found t nil] 4) l] 2> 1/ 1 0.001 2 device-live-p 0/ 0 0.000 9 with-current-buffer 0/ 56 0.000 1 0/ 326249 mode-motion-highlight-internal 0/ 2 0.000 2 0/ 5328 dispatch-event 0/ 4 0.000 23 280/ 13280 itimer-restart 0/ 0 0.000 4 vector 0/ 0 0.000 19 1388/ 1388 window-dedicated-p 0/ 0 0.000 12 gethash 0/ 0 0.000 47 puthash 0/ 0 0.000 8 itimer-timer-driver 0/ 0 0.000 9 108/ 4832 add-spec-list-to-specifier 0/ 0 0.000 5 120/ 120 execute_internal_event() 0/ 3 0.000 21 0/ 11320 call-interactively 0/89487 0.000 3 36/444962623 image-instance-p 0/ 0 0.000 4 root-window->saved-window 0/ 1 0.000 12 0/ 6528 set-mark 0/ 0 0.000 1 remove 0/ 0 0.000 1 0/ 24 copy-sequence 0/ 0 0.000 9 324/ 324 paren-highlight 0/ 0 0.000 1 mapc 0/ 0 0.000 3 0/ 1200 pending-delete-pre-hook 0/ 0 0.000 2 event-frame 0/ 0 0.000 2 restore-saved-window 0/ 0 0.000 1 format 0/ 0 0.000 1 40/ 40 clearcase-ct-kill-buffer-hook 0/ 0 0.000 1 itimer-function 0/ 0 0.000 2 window-point 0/ 0 0.000 14 toolbar-button-p 0/ 0 0.000 2 event-over-modeline-p 0/ 0 0.000 2 key-press-event-p 0/ 0 0.000 3 set-itimer-value-internal 0/ 0 0.000 11 get-selection-internal 0/ 0 0.000 1 0/ 36 walk-windows 0/ 67 0.000 4 itimer-time-difference 0/ 0 0.000 36 2304/ 2304 valid-specifier-locale-p 0/ 0 0.000 5 event-point 0/ 0 0.000 4 blink-cursor-post-command-hook 0/ 0 0.000 1 0/ 236 point-max 0/ 0 0.000 1 profile-command 0/89487 0.000 0/444962623 lazy-lock-pre-idle-fontify-windows 0/ 67 0.000 23 extent-live-p 0/ 0 0.000 2 minibuffer-depth 0/ 0 0.000 4 lazy-lock-fontify-region 0/ 0 0.000 1 compilation-mode-motion-hook 0/ 2 0.000 2 0/ 5328 equal 0/ 0 0.000 2 current-window-configuration 0/ 1 0.000 6 0/ 7992 set-window-point 0/ 0 0.000 9 eq 0/ 0 0.000 1 byte-code 0/ 114 0.000 47 32/ 15564 event-type 0/ 0 0.000 3 buffer-string 0/ 0 0.000 1 0/ 64 apply 0/ 0 0.000 4 0/ 40 set-buffer-dedicated-frame 0/ 0 0.000 1 24/ 24 start-profiling 0/ 0 0.000 -12/ -12 frame-modified-tick 0/ 0 0.000 23 make-marker 0/ 0 0.000 24 576/ 576 next-window 0/ 0 0.000 8 itimer-is-idle 0/ 0 0.000 81 glyphp 0/ 0 0.000 2 unwind-protect 0/ 57 0.000 1 0/ 326345 buffer-name 0/ 0 0.000 1 specifier-type 0/ 0 0.000 10 pending-delete-active-region 0/ 0 0.000 1 read-from-minibuffer 0/ 115 0.000 1 12/ 17688 funcall 0/ 1 0.000 4 handle-post-motion-command 0/ 0 0.000 1 0/ 540 execute-extended-command 0/89487 0.000 0/444962623 set-modeline-hscroll 0/ 0 0.000 1 default-boundp 0/ 0 0.000 1 recursion-depth 0/ 0 0.000 1 buffer-live-p 0/ 0 0.000 2 select-frame 0/ 0 0.000 8 #<compiled-function nil "...(102)" [minibuffer-completion-predicate minibuffer-confirm-incomplete completion minibuffer-completion-table event buffer-string throw exit nil exact-minibuffer-completion-p t try-completion temp-minibuffer-message [incomplete; confirm] [no completions; confirm] next-command-event quit-char event-to-character dispatch-event inhibit-quit quit-flag last-command-event] 5 (c:\progra~1\xemacs\XEmacs-21.5-b19\lisp\minibuf.elc . 17959) nil> 0/ 0 0.000 1 0/ -24 call-with-condition-handler 0/ 0 0.000 23 yank 0/ 1 0.000 1 72/ 156 pointer-image-instance-p 0/ 0 0.000 4 select-buffer-killed-text 0/ 0 0.000 1 console-type 0/ 0 0.000 18 save-current-buffer 0/ 56 0.000 1 0/ 326177 set-window-configuration 0/ 2 0.000 3 0/ 3996 frame-root-window 0/ 0 0.000 32 throw 0/ 0 0.000 29 -24/ -24 event-modifiers 0/ 0 0.000 3 24/ 24 window-first-hchild 0/ 0 0.000 13 hash-table-count 0/ 0 0.000 23 nuke-selective-display 0/ 0 0.000 1 operate-on-matching-lines 0/89370 0.000 1 0/444944823 itimer-value 0/ 0 0.000 101 canonicalize-spec-list 0/ 0 0.000 5 60/ 1000 auto-show-should-take-action-p 0/ 0 0.000 1 clear-message 0/ 0 0.000 6 marker-position 0/ 0 0.000 4 run-hook-with-args 0/ 2 0.000 3 0/ 5328 fboundp 0/ 0 0.000 3 buffer-disable-undo 0/ 0 0.000 1 erc-kill-buffer-function 0/ 0 0.000 1 0/ 72 make-window-configuration 0/ 0 0.000 6 1152/ 1464 extentp 0/ 0 0.000 3 frame-properties 0/ 0 0.000 1 216/ 216 fw-frame 0/ 0 0.000 2 kill-new 0/ 0 0.000 1 12/ 12 bufferp 0/ 0 0.000 2 let 0/89370 0.000 3 0/444944639 use-local-map 0/ 0 0.000 1 device-type 0/ 0 0.000 9 get-buffer 0/ 0 0.000 9 itimer-function-arguments 0/ 0 0.000 2 copy-marker 0/ 0 0.000 13 312/ 312 window-frame 0/ 0 0.000 26 browse-url-delete-temp-file 0/ 0 0.000 1 resize-minibuffer-window 0/ 0 0.000 2 0/ 64 valid-specifier-tag-p 0/ 0 0.000 5 window-buffer 0/ 0 0.000 34 raw-append-message 0/ 2 0.000 1 read-minibuffer-internal 0/ 112 0.000 1 104/ 14232 framep 0/ 0 0.000 6 cperl-lazy-hook 0/ 0 0.000 1 24/ 24 window-truncated-p 0/ 0 0.000 1 blink-cursor-callback 0/ 0 0.000 8 0/ 1160 current-time 0/ 0 0.000 26 936/ 936 point-min 0/ 0 0.000 1 handle-pre-motion-command 0/ 0 0.000 2 0/ 684 message 0/ 2 0.000 2 12/ 76 auto-show-make-point-visible 0/ 0 0.000 1 event-over-toolbar-p 0/ 0 0.000 2 symbol-value-in-buffer 0/ 0 0.000 10 font-lock-pre-idle-hook 0/ 0 0.000 23 markerp 0/ 0 0.000 1 selected-window 0/ 0 0.000 46 get-clipboard 0/ 0 0.000 1 0/ 36 command-execute 0/89487 0.000 0/444962623 iso-acc-minibuf-setup 0/ 0 0.000 1 24/ 24 delay-uniquify-rationalize-file-buffer-names 0/ 0 0.000 1 #<compiled-function (&rest forms) "...(27)" [forms temp-buffer make-symbol temp-buffer let ((get-buffer-create (generate-new-buffer-name *temp*))) unwind-protect with-current-buffer and buffer-name kill-buffer] 8 699183> 0/ 0 0.000 1 228/ 252 enlarge-window-pixels 0/ 0 0.000 1 remove-message 0/ 0 0.000 6 frame-reduce-to-one-window 0/ 0 0.000 1 frame-type 0/ 0 0.000 9 quote 0/ 0 0.000 2 #<compiled-function nil "...(10)" [font-lock-pending-buffer-table hash-table-count 0 font-lock-fontify-pending-extents] 2> 0/ 0 0.000 23 window-start 0/ 0 0.000 16 itimer-recorded-run-time 0/ 0 0.000 18 vectorp 0/ 0 0.000 9 itimer-run-expired-timers 0/ 0 0.000 9 1296/ 3824 local-variable-p 0/ 0 0.000 2 with-temp-buffer 0/ 57 0.000 1 0/ 327669 canonicalize-inst-list 0/ 0 0.000 10 60/ 880 boundp 0/ 0 0.000 14 display-message 0/ 2 0.000 1 0/ 24 specifierp 0/ 0 0.000 2 buffer-modified-tick 0/ 0 0.000 4 copy-keymap 0/ 0 0.000 1 528/ 528 #<compiled-function (string regexp-flag &rest body) "...(18)" [body regexp-flag string let case-fold-search if (and case-fold-search search-caps-disable-folding) no-upper-case-p (case-fold-search)] 7 942133> 0/ 0 0.000 1 184/ 184 get-selection 0/ 0 0.000 1 0/ 36 fmakunbound 0/ 0 0.000 3 glyph-property-instance 0/ 0 0.000 2 event-modeline-position 0/ 0 0.000 2 paren-nuke-extent 0/ 0 0.000 2 select-buffer-killed-default 0/ 0 0.000 1 select-coerce 0/ 0 0.000 1 36/ 36 set-window-dedicated-p 0/ 0 0.000 1 local-variable-if-set-p 0/ 0 0.000 1 set-window-buffer 0/ 0 0.000 2 event-window 0/ 0 0.000 10 current-kill 0/ 0 0.000 1 0/ 48 handle-pre-motion-command-current-command-is-motion 0/ 0 0.000 3 0/ 1224 device-console 0/ 0 0.000 9 set-buffer 0/ 0 0.000 1 really-set-window-configuration 0/ 1 0.000 1 glyph-image-instance 0/ 0 0.000 2 event-key 0/ 0 0.000 3 window-first-vchild 0/ 0 0.000 13 featurep 0/ 0 0.000 4 make-symbol 0/ 0 0.000 1 24/ 24 insert-string 0/ 0 0.000 1 event-channel 0/ 0 0.000 2 get-buffer-create 0/ 0 0.000 1 1072/ 1072 #<compiled-function (keysym) "...(31)" [mods key keysym butlast keysyms-equal last throw handle-pre-motion-command-current-command-is-motion t] 4> 0/ 0 0.000 72 0/ 1200 select-coerce-to-text 0/ 0 0.000 1 set-frame-pointer 0/ 0 0.000 2 set-specifier 0/ 0 0.000 5 60/ 1180 input-pending-p 0/ 0 0.000 1 marker-buffer 0/ 0 0.000 1 lazy-lock-fontify-after-defer 0/ 0 0.000 2 push-mark 0/ 1 0.000 1 12/ 36 noninteractive 0/ 0 0.000 1 lazy-lock-vertical-motion-value 0/ 43 0.000 4 frame-pixel-height 0/ 0 0.000 6 frame-minibuffer-only-p 0/ 0 0.000 23 keysyms-equal 0/ 0 0.000 48 0/ 768 next-single-property-change 0/ 0 0.000 1 saved-window-equal 0/ 0 0.000 4 set-buffer-modified-p 0/ 0 0.000 1 character-to-event 0/ 0 0.000 1 set-itimer-recorded-run-time 0/ 0 0.000 2 window-hscroll 0/ 0 0.000 12 char-to-string 0/ 0 0.000 32 768/ 768 window-height 0/ 0 0.000 2 disable-timeout 0/ 0 0.000 9 -108/ -108 valid-specifier-tag-set-p 0/ 0 0.000 5 #<subr when> 0/ 0 0.000 3 144/ 144 buffer-size 0/ 0 0.000 3 decode-buffer 0/ 0 0.000 4 intern 0/ 0 0.000 32 window-pixel-height 0/ 0 0.000 7 minibuffer-window 0/ 0 0.000 45 stop-profiling 0/ 0 0.000 1 buffer-enable-undo 0/ 0 0.000 1 text-property-any 0/ 0 0.000 1 with-search-caps-disable-folding 0/89370 0.000 1 0/444944823 run-finalizers 0/ 0 0.000 87 cleanup-simple-finalizers 0/ 0 0.000 87 add-hook 0/ 0 0.000 1 12/ 12 select-window 0/ 0 0.000 3 window-configuration-equal 0/ 0 0.000 3 characterp 0/ 0 0.000 97 frame-live-p 0/ 0 0.000 12 itimer-uses-arguments 0/ 0 0.000 2 event-toolbar-button 0/ 0 0.000 2 gutter-pixel-width 0/ 0 0.000 6 window-pixel-edges 0/ 0 0.000 12 576/ 576 enlarge-window 0/ 0 0.000 1 store-match-data 0/ 0 0.000 2 resize-minibuffer-setup 0/ 0 0.000 1 0/ 264 itimer-disable-timeout 0/ 0 0.000 9 0/ -108 canonicalize-inst-pair 0/ 0 0.000 15 60/ 820 select-convert-to-text 0/ 0 0.000 1 append-message 0/ 2 0.000 1 24/ 24 help-keymap-with-help-key 0/ 0 0.000 1 0/ 548 #<compiled-function (buffer &rest body) "...(8)" [body buffer save-current-buffer set-buffer] 3 698228> 0/ 0 0.000 1 72/ 72 event-over-vertical-divider-p 0/ 0 0.000 2 mark 0/ 1 0.000 1 string-match 0/ 0 0.000 1 44/ 44 #<compiled-function (regexp) "...(39)" [regexp beg end count nil region-active-p zmacs-region-buffer region-beginning region-end operate-on-matching-lines t message %i lines deleted] 6 726484 (list (read-from-minibuffer Flush lines (containing match for regexp): nil nil nil (quote regexp-history)))> 0/89372 0.000 1 0/444944899 event-glyph-extent 0/ 0 0.000 2 crypt-forget-encryption-key 0/ 0 0.000 1 make-local-hook 0/ 0 0.000 1 12/ 36 set-window-start 0/ 0 0.000 1 when 0/ 0 0.000 3 0/ 144 frame-visible-p 0/ 0 0.000 23 no-upper-case-p 0/ 0 0.000 1 0/ 44 windowp 0/ 0 0.000 10 next-frame 0/ 0 0.000 23 event-live-p 0/ 0 0.000 3 set-window-configuration-frame-size 0/ 1 0.000 1 frame-device 0/ 0 0.000 9 mapc-internal 0/ 0 0.000 3 0/ 1200 resize-minibuffer-count-window-lines 0/ 0 0.000 2 0/ 64 mode-motion-ensure-extent-ok 0/ 0 0.000 2 kill-all-local-variables 0/ 0 0.000 1 remove* 0/ 0 0.000 1 24/ 24 list 0/ 0 0.000 1 12/ 12 selected-frame 0/ 0 0.000 38 window-next-child 0/ 0 0.000 18 window-minibuffer-p 0/ 0 0.000 4 extent-at 0/ 0 0.000 8 specifier-instance 0/ 0 0.000 10 delq 0/ 0 0.000 3 match-data 0/ 0 0.000 2 48/ 48 image-instance-type 0/ 0 0.000 2 current-message-label 0/ 0 0.000 4 add-timeout 0/ 0 0.000 9 108/ 108 canonicalize-spec 0/ 0 0.000 5 60/ 940 modeline-hscroll 0/ 0 0.000 12 region-active-p 0/ 0 0.000 2 last 0/ 0 0.000 12 make-local-variable 0/ 0 0.000 6 144/ 144 generate-new-buffer-name 0/ 0 0.000 1 valid-instantiator-p 0/ 0 0.000 20 760/ 760 itimerp 0/ 0 0.000 223 lazy-lock-maybe-fontify-frame 0/ 67 0.000 23 default-mouse-motion-handler 0/ 3 0.000 2 0/ 5328 highlight-extent 0/ 0 0.000 2 detach-extent 0/ 0 0.000 2 frame-pixel-width 0/ 0 0.000 6 set-window-hscroll 0/ 0 0.000 2 butlast 0/ 0 0.000 36 432/ 432 maybe-saved-window-equal 0/ 0 0.000 12 extent-object 0/ 0 0.000 2 restore-saved-window-parameters 0/ 0 0.000 1 natnump 0/ 0 0.000 2 plist-get 0/ 0 0.000 1 ----------------------------------------------------------------------------- Total 89459 100.000 280583 444962623 Ticks/Total = Ticks this function/this function and descendants Calls = Number of calls to this function GC-Usage/Total = Lisp allocation this function/this function and descendants One tick = 1 ms Here is my reimplementation which executes in 1.9s (at same gc-cons-threshold, which I will try to lower again now). Function Name Ticks/Total %Usage Calls GC-Usage/ Total =========================================/===== ====== ===== ========/======= delete-region 483/ 967 25.354 6544 622040/1172116 (profile overhead) 454/ 454 23.832 (in map-extents-internal) 206/ 236 10.814 59007 733308/ 733308 append-to-buffer 172/ 379 9.029 6544 0/ 648148 re-search-forward 100/ 134 5.249 6545 68/ 68 insert-buffer-substring 90/ 166 4.724 6544 464916/ 648148 lazy-lock-after-change 65/ 218 3.412 6544 0/ 380 (in redisplay) 60/ 85 3.150 22 1216/ 1216 (in char-byte conversion) 55/ 59 2.887 509210 start-profiling 27/ 27 1.417 -12/ -12 vertical-motion 22/ 45 1.155 17 128/ 128 while 20/ 1722 1.050 1 0/1820332 save-excursion 20/ 1731 1.050 6545 0/2143763 lazy-lock-put-text-property 17/ 41 0.892 6544 0/ 380 (in internal-external conversion) 15/ 15 0.787 1931 window-end 13/ 27 0.682 15 and 8/ 151 0.420 6547 0/ 68 beginning-of-line 7/ 23 0.367 6546 point-at-bol 7/ 21 0.367 6544 forward-line 6/ 22 0.315 6544 setq 6/ 181 0.315 13090 0/ 322183 get-text-property 5/ 21 0.262 6545 buffer-substring 5/ 5 0.262 3 322215/ 322215 if 5/ 978 0.262 6549 0/1172160 progn 4/ 37 0.210 6544 next_event_internal() 4/ 4 0.210 22 112/ 112 match-beginning 4/ 4 0.210 6544 goto-char 4/ 10 0.210 6544 count-lines 3/ 3 0.157 1 get-buffer-create 2/ 2 0.105 6545 1080/ 1080 paren-nuke-extent 1/ 1 0.052 3 make-saved-window 1/ 1 0.052 12 4032/ 5088 set-frame-pixel-size 1/ 1 0.052 1 read-from-minibuffer 1/ 174 0.052 1 12/ 16852 point 1/ 1 0.052 13109 eobp 1/ 1 0.052 6545 copy-keymap 1/ 1 0.052 1 528/ 528 erase-buffer 1/ 1 0.052 12 112/ 112 kill-buffer 1/ 1 0.052 1 24/ 96 execute_internal_event() 1/ 3 0.052 19 0/ 8520 redisplay-echo-area 1/ 1 0.052 1 lazy-lock-vertical-motion-value 1/ 45 0.052 15 byte-code 1/ 171 0.052 56 0/ 14604 event-window 1/ 1 0.052 10 device-type 1/ 2 0.052 11 valid-instantiator-p 1/ 1 0.052 56 2128/ 2128 device-live-p 0/ 0 0.000 11 with-current-buffer 0/ 3 0.000 1 0/ 60 mode-motion-highlight-internal 0/ 1 0.000 2 0/ 5328 reset-buffer 0/ 0 0.000 1 0/ 48 dispatch-event 0/ 6 0.000 22 280/ 11552 vector 0/ 0 0.000 19 1388/ 1388 window-dedicated-p 0/ 0 0.000 12 gethash 0/ 0 0.000 112 not 0/ 0 0.000 6545 puthash 0/ 0 0.000 19 add-spec-list-to-specifier 0/ 0 0.000 14 336/ 336 mark-marker 0/ 0 0.000 14 call-interactively 0/ 1935 0.000 4 36/2160915 image-instance-p 0/ 0 0.000 4 root-window->saved-window 0/ 2 0.000 12 0/ 6528 remove 0/ 0 0.000 1 0/ 144 copy-sequence 0/ 0 0.000 1 12/ 12 paren-highlight 0/ 0 0.000 2 mapc 0/ 0 0.000 5 0/ 1872 pending-delete-pre-hook 0/ 0 0.000 3 event-frame 0/ 0 0.000 2 restore-saved-window 0/ 0 0.000 1 format 0/ 0 0.000 1 40/ 40 ldiff 0/ 0 0.000 1 12/ 12 clearcase-ct-kill-buffer-hook 0/ 0 0.000 1 window-point 0/ 0 0.000 36 toolbar-button-p 0/ 0 0.000 2 generate-new-buffer 0/ 0 0.000 1 0/ 1080 event-over-modeline-p 0/ 0 0.000 2 key-press-event-p 0/ 0 0.000 5 walk-windows 0/ 72 0.000 15 valid-specifier-locale-p 0/ 0 0.000 14 event-point 0/ 0 0.000 4 blink-cursor-post-command-hook 0/ 1 0.000 2 0/ 472 point-max 0/ 0 0.000 1 profile-command 0/ 1935 0.000 0/2160915 lazy-lock-pre-idle-fontify-windows 0/ 74 0.000 22 extent-live-p 0/ 0 0.000 2 minibuffer-depth 0/ 0 0.000 3 lazy-lock-fontify-region 0/ 0 0.000 1 compilation-mode-motion-hook 0/ 1 0.000 2 0/ 5328 equal 0/ 0 0.000 3 current-window-configuration 0/ 2 0.000 6 0/ 7992 set-window-point 0/ 0 0.000 31 eq 0/ 0 0.000 1 event-type 0/ 0 0.000 5 buffer-string 0/ 5 0.000 3 0/ 322215 apply 0/ 0 0.000 2 0/ 136 set-buffer-dedicated-frame 0/ 0 0.000 1 24/ 24 frame-modified-tick 0/ 0 0.000 22 make-marker 0/ 0 0.000 24 576/ 576 next-window 0/ 0 0.000 30 glyphp 0/ 0 0.000 2 specifier-type 0/ 0 0.000 28 next-event 0/ 164 0.000 22 0/ 1328 lazy-lock-fontify-window 0/ 72 0.000 30 funcall 0/ 0 0.000 4 handle-post-motion-command 0/ 0 0.000 2 0/ 888 execute-extended-command 0/ 1935 0.000 0/2160915 set-modeline-hscroll 0/ 0 0.000 1 default-boundp 0/ 0 0.000 1 recursion-depth 0/ 0 0.000 1 buffer-live-p 0/ 0 0.000 2 select-frame 0/ 0 0.000 30 #<compiled-function nil "...(102)" [minibuffer-completion-predicate minibuffer-confirm-incomplete completion minibuffer-completion-table event buffer-string throw exit nil exact-minibuffer-completion-p t try-completion temp-minibuffer-message [incomplete; confirm] [no completions; confirm] next-command-event quit-char event-to-character dispatch-event inhibit-quit quit-flag last-command-event] 5 (c:\progra~1\xemacs\XEmacs-21.5-b19\lisp\minibuf.elc . 17959) nil> 0/ 0 0.000 1 0/ -24 event-buffer 0/ 0 0.000 8 call-with-condition-handler 0/ 0 0.000 22 pointer-image-instance-p 0/ 0 0.000 4 select-buffer-killed-text 0/ 0 0.000 1 console-type 0/ 0 0.000 27 save-current-buffer 0/ 3 0.000 1 set-window-configuration 0/ 2 0.000 3 0/ 3996 frame-root-window 0/ 0 0.000 31 throw 0/ 0 0.000 37 -24/ -24 event-modifiers 0/ 0 0.000 5 48/ 48 window-first-hchild 0/ 0 0.000 13 hash-table-count 0/ 0 0.000 22 nuke-selective-display 0/ 0 0.000 1 operate-on-matching-lines 0/ 1731 0.000 1 0/2143951 canonicalize-spec-list 0/ 1 0.000 14 168/ 2800 #<compiled-function nil "...(52)" [compilation-old-error-list compilation-parsing-end compilation-mouse-motion-initiate-parsing e compilation-error-list p nil t ((compile-reinitialize-errors nil p)) found (byte-code «¤Ä＠＠!© W«¥Aª± X«§ÅÆÇ"¨ª¥ÅÆÈ"¨)ªYÈ§ [e p x l marker-position throw found t nil] 4) l] 2> 0/ 0 0.000 2 auto-show-should-take-action-p 0/ 0 0.000 2 clear-message 0/ 2 0.000 8 marker-position 0/ 0 0.000 3 run-hook-with-args 0/ 1 0.000 2 0/ 5328 fboundp 0/ 0 0.000 5 buffer-disable-undo 0/ 0 0.000 1 erc-kill-buffer-function 0/ 0 0.000 1 0/ 72 make-window-configuration 0/ 0 0.000 6 1152/ 1464 extentp 0/ 0 0.000 3 frame-properties 0/ 0 0.000 1 216/ 216 fw-frame 0/ 0 0.000 2 bufferp 0/ 0 0.000 5 let 0/ 1731 0.000 2 0/2143807 use-local-map 0/ 0 0.000 1 copy-marker 0/ 0 0.000 12 288/ 288 window-frame 0/ 0 0.000 26 browse-url-delete-temp-file 0/ 0 0.000 1 resize-minibuffer-window 0/ 1 0.000 3 0/ 128 valid-specifier-tag-p 0/ 0 0.000 14 window-buffer 0/ 0 0.000 67 raw-append-message 0/ 1 0.000 1 read-minibuffer-internal 0/ 170 0.000 1 104/ 13272 framep 0/ 0 0.000 17 cperl-lazy-hook 0/ 0 0.000 2 24/ 24 window-truncated-p 0/ 0 0.000 2 blink-cursor-callback 0/ 0 0.000 15 0/ 3192 current-time 0/ 0 0.000 10 360/ 360 point-min 0/ 0 0.000 1 handle-pre-motion-command 0/ 0 0.000 3 0/ 1032 message 0/ 3 0.000 2 12/ 76 auto-show-make-point-visible 0/ 0 0.000 2 event-over-toolbar-p 0/ 0 0.000 2 symbol-value-in-buffer 0/ 0 0.000 32 font-lock-pre-idle-hook 0/ 0 0.000 22 markerp 0/ 0 0.000 1 selected-window 0/ 0 0.000 87 command-execute 0/ 1935 0.000 0/2160915 iso-acc-minibuf-setup 0/ 0 0.000 1 24/ 24 delay-uniquify-rationalize-file-buffer-names 0/ 0 0.000 1 enlarge-window-pixels 0/ 0 0.000 1 remove-message 0/ 0 0.000 8 delete* 0/ 0 0.000 1 96/ 96 frame-reduce-to-one-window 0/ 0 0.000 1 frame-type 0/ 2 0.000 11 quote 0/ 0 0.000 2 #<compiled-function nil "...(10)" [font-lock-pending-buffer-table hash-table-count 0 font-lock-fontify-pending-extents] 2> 0/ 0 0.000 22 window-start 0/ 0 0.000 27 local-variable-p 0/ 0 0.000 2 canonicalize-inst-list 0/ 1 0.000 28 168/ 2464 boundp 0/ 0 0.000 5 display-message 0/ 3 0.000 1 0/ 24 specifierp 0/ 0 0.000 2 buffer-modified-tick 0/ 0 0.000 15 #<compiled-function (string regexp-flag &rest body) "...(18)" [body regexp-flag string let case-fold-search if (and case-fold-search search-caps-disable-folding) no-upper-case-p (case-fold-search)] 7 942133> 0/ 0 0.000 1 144/ 144 fmakunbound 0/ 0 0.000 5 glyph-property-instance 0/ 0 0.000 2 event-modeline-position 0/ 0 0.000 2 select-buffer-killed-default 0/ 0 0.000 1 set-window-dedicated-p 0/ 0 0.000 1 previous-history-element 0/ 0 0.000 2 0/ 232 local-variable-if-set-p 0/ 0 0.000 1 set-window-buffer 0/ 0 0.000 2 handle-pre-motion-command-current-command-is-motion 0/ 0 0.000 5 0/ 1920 device-console 0/ 0 0.000 11 set-buffer 0/ 0 0.000 1 really-set-window-configuration 0/ 1 0.000 1 glyph-image-instance 0/ 0 0.000 2 event-key 0/ 0 0.000 5 window-first-vchild 0/ 0 0.000 13 featurep 0/ 0 0.000 4 insert-string 0/ 0 0.000 1 event-channel 0/ 0 0.000 2 #<compiled-function (keysym) "...(31)" [mods key keysym butlast keysyms-equal last throw handle-pre-motion-command-current-command-is-motion t] 4> 0/ 0 0.000 120 0/ 1872 set-frame-pointer 0/ 0 0.000 2 set-specifier 0/ 1 0.000 14 168/ 3304 input-pending-p 0/ 0 0.000 2 noninteractive 0/ 0 0.000 1 frame-pixel-height 0/ 0 0.000 6 frame-minibuffer-only-p 0/ 0 0.000 22 keysyms-equal 0/ 0 0.000 64 0/ 1152 next-single-property-change 0/ 0 0.000 1 saved-window-equal 0/ 0 0.000 4 set-buffer-modified-p 0/ 0 0.000 1 character-to-event 0/ 0 0.000 1 window-hscroll 0/ 0 0.000 12 char-to-string 0/ 0 0.000 48 1152/ 1152 window-height 0/ 0 0.000 3 valid-specifier-tag-set-p 0/ 0 0.000 14 #<subr when> 0/ 0 0.000 3 144/ 144 buffer-size 0/ 0 0.000 4 decode-buffer 0/ 0 0.000 1 intern 0/ 0 0.000 48 window-pixel-height 0/ 0 0.000 7 minibuffer-window 0/ 0 0.000 44 stop-profiling 0/ 0 0.000 1 buffer-enable-undo 0/ 0 0.000 1 text-property-any 0/ 0 0.000 1 with-search-caps-disable-folding 0/ 1731 0.000 1 0/2143951 add-hook 0/ 0 0.000 1 12/ 12 select-window 0/ 0 0.000 3 window-configuration-equal 0/ 0 0.000 3 characterp 0/ 0 0.000 129 frame-live-p 0/ 0 0.000 14 event-toolbar-button 0/ 0 0.000 2 gutter-pixel-width 0/ 0 0.000 6 window-pixel-edges 0/ 0 0.000 12 576/ 576 enlarge-window 0/ 0 0.000 1 resize-minibuffer-setup 0/ 0 0.000 1 0/ 264 canonicalize-inst-pair 0/ 1 0.000 42 168/ 2296 append-message 0/ 2 0.000 1 24/ 24 help-keymap-with-help-key 0/ 1 0.000 1 0/ 548 #<compiled-function (buffer &rest body) "...(8)" [body buffer save-current-buffer set-buffer] 3 698228> 0/ 0 0.000 1 60/ 60 event-over-vertical-divider-p 0/ 0 0.000 2 string-match 0/ 0 0.000 1 44/ 44 #<compiled-function (regexp) "...(39)" [regexp beg end count nil region-active-p zmacs-region-buffer region-beginning region-end operate-on-matching-lines t message %i lines deleted] 6 726484 (list (read-from-minibuffer Flush lines (containing match for regexp): nil nil nil (quote regexp-history)))> 0/ 1734 0.000 1 0/2144027 event-glyph-extent 0/ 0 0.000 2 crypt-forget-encryption-key 0/ 0 0.000 1 make-local-hook 0/ 0 0.000 1 12/ 36 set-window-start 0/ 0 0.000 1 when 0/ 0 0.000 3 0/ 144 frame-visible-p 0/ 0 0.000 22 no-upper-case-p 0/ 0 0.000 1 0/ 44 windowp 0/ 0 0.000 10 next-frame 0/ 0 0.000 22 event-live-p 0/ 0 0.000 5 set-window-configuration-frame-size 0/ 1 0.000 1 frame-device 0/ 0 0.000 11 mapc-internal 0/ 0 0.000 5 0/ 1872 resize-minibuffer-count-window-lines 0/ 1 0.000 3 0/ 128 mode-motion-ensure-extent-ok 0/ 0 0.000 2 kill-all-local-variables 0/ 0 0.000 1 remove* 0/ 0 0.000 1 24/ 144 list 0/ 0 0.000 1 12/ 12 selected-frame 0/ 0 0.000 48 next-history-element 0/ 0 0.000 2 96/ 232 window-next-child 0/ 0 0.000 18 window-minibuffer-p 0/ 0 0.000 15 extent-at 0/ 0 0.000 8 specifier-instance 0/ 0 0.000 17 delq 0/ 0 0.000 5 image-instance-type 0/ 0 0.000 2 current-message-label 0/ 0 0.000 6 canonicalize-spec 0/ 1 0.000 14 168/ 2632 modeline-hscroll 0/ 0 0.000 12 last 0/ 0 0.000 4 region-active-p 0/ 0 0.000 1 make-local-variable 0/ 0 0.000 6 144/ 144 generate-new-buffer-name 0/ 0 0.000 1 lazy-lock-maybe-fontify-frame 0/ 73 0.000 22 default-mouse-motion-handler 0/ 2 0.000 2 0/ 5328 highlight-extent 0/ 0 0.000 2 detach-extent 0/ 0 0.000 2 frame-pixel-width 0/ 0 0.000 6 set-window-hscroll 0/ 0 0.000 2 butlast 0/ 0 0.000 60 720/ 720 maybe-saved-window-equal 0/ 0 0.000 12 extent-object 0/ 0 0.000 2 restore-saved-window-parameters 0/ 0 0.000 1 natnump 0/ 0 0.000 4 plist-get 0/ 0 0.000 1 ----------------------------------------------------------------------------- Total 1905 100.000 723370 2160915 Ticks/Total = Ticks this function/this function and descendants Calls = Number of calls to this function GC-Usage/Total = Lisp allocation this function/this function and descendants One tick = 1 ms I intend to commit this in a few days and would be greatful for review and testing. Best regards, Adrian lisp/ChangeLog addition: 2005-02-20 Adrian Aichner <adrian(a)xemacs.org> * replace.el (operate-on-non-matching-lines): Append matching lines to temp buffer to avoid prohibitive GC as a result of enormous string consing. * replace.el (operate-on-matching-lines): Ditto. * replace.el (delete-non-matching-lines): Honor region only when active in current buffer. * replace.el (kill-non-matching-lines): Ditto. * replace.el (copy-non-matching-lines): Ditto. * replace.el (delete-matching-lines): Ditto. * replace.el (kill-matching-lines): Ditto. * replace.el (copy-matching-lines): Ditto. * replace.el (perform-replace): Ditto. Index: replace.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/replace.el,v retrieving revision 1.10 diff -u -u -r1.10 replace.el --- replace.el 12 May 2003 05:12:10 -0000 1.10 +++ replace.el 20 Feb 2005 22:06:59 -0000 ＠＠ -247,7 +247,9 ＠＠ (let ((matched-text nil) (curmatch-start (point)) - (limit (copy-marker (point-max)))) + (limit (copy-marker (point-max))) + (matched-text-buffer (generate-new-buffer " *matched-text*")) + lines-matched) ;; Limit search if limits were specified. (when end (setq limit (copy-marker end))) ＠＠ -259,32 +261,33 ＠＠ ;; curmatch-start is first char not preserved by previous match. (if (not (re-search-forward regexp limit 'move)) (let ((curmatch-end limit)) - (setq matched-text (concat matched-text (buffer-substring curmatch-start curmatch-end))) + (append-to-buffer matched-text-buffer curmatch-start curmatch-end) (if delete (delete-region curmatch-start curmatch-end))) (let ((curmatch-end (save-excursion (goto-char (match-beginning 0)) - (beginning-of-line) - (point)))) + (beginning-of-line) + (point)))) ;; Now curmatch-end is first char preserved by the new match. (if (< curmatch-start curmatch-end) (progn - (setq matched-text (concat matched-text (buffer-substring curmatch-start curmatch-end))) + (append-to-buffer matched-text-buffer curmatch-start curmatch-end) (if delete (delete-region curmatch-start curmatch-end)))))) (setq curmatch-start (save-excursion (forward-line 1) - (point))) + (point))) ;; If the match was empty, avoid matching again at same place. (and (not (eobp)) (= (match-beginning 0) (match-end 0)) (forward-char 1))) ;; If any lines were matched and KILL is non-nil, insert the ;; matched lines into the kill ring. + (setq matched-text (buffer-string matched-text-buffer)) (if (and matched-text kill) (kill-new matched-text)) ;; Return the number of matched lines. - (with-temp-buffer - ;; Use concat to make a string even if matched-text is nil. - (insert (concat matched-text)) - (count-lines (point-min) (point-max))) - )))) + (setq lines-matched + (with-current-buffer matched-text-buffer + (count-lines (point-min) (point-max)))) + (kill-buffer matched-text-buffer) + lines-matched)))) (define-function 'keep-lines 'delete-non-matching-lines) (defun delete-non-matching-lines (regexp) ＠＠ -296,7 +299,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t nil beg end)) ＠＠ -313,7 +317,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t t beg end)) ＠＠ -330,7 +335,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp nil t beg end)) ＠＠ -358,8 +364,9 ＠＠ (let ((matched-text nil) (curmatch-start nil) (curmatch-end nil) - (limit nil)) - + (limit nil) + (matched-text-buffer (generate-new-buffer " *matched-text*")) + lines-matched) ;; Limit search if limits were specified. (when beg (goto-char beg)) (when end (setq limit (copy-marker end))) ＠＠ -370,17 +377,17 ＠＠ (beginning-of-line) (point))) (setq curmatch-end (progn (forward-line 1) (point))) - (setq matched-text (concat matched-text (buffer-substring curmatch-start curmatch-end))) + (append-to-buffer matched-text-buffer curmatch-start curmatch-end) (if delete (delete-region curmatch-start curmatch-end))) - + (setq matched-text (buffer-string matched-text-buffer)) (if (and matched-text kill) (kill-new matched-text)) ;; Return the number of matched lines. - (with-temp-buffer - ;; Use concat to make a string even if matched-text is nil. - (insert (concat matched-text)) - (count-lines (point-min) (point-max))) - )))) + (setq lines-matched + (with-current-buffer matched-text-buffer + (count-lines (point-min) (point-max)))) + (kill-buffer matched-text-buffer) + lines-matched)))) (define-function 'flush-lines 'delete-matching-lines) (defun delete-matching-lines (regexp) ＠＠ -392,7 +399,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t nil beg end)) ＠＠ -409,7 +417,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t t beg end)) ＠＠ -426,7 +435,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp nil t beg end)) ＠＠ -831,7 +841,8 ＠＠ (substitute-command-keys "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")))) ;; If the region is active, operate on region. - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) ;; Original Per Abrahamsen's code simply narrowed the region, ;; thus providing a visual indication of the search boundary. ;; Stallman, on the other hand, handles it like this. -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

3 participants
2 comments

[AC sjt-xft] Get a sane estimate of average character width 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.8 diff -u -U0 -r1.758.2.8 ChangeLog --- src/ChangeLog 11 Feb 2005 15:50:40 -0000 1.758.2.8 +++ src/ChangeLog 20 Feb 2005 14:41:59 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-02-20 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_initialize_font_instance): Estimate average cell + width based on dimensions of "representative" string. Suppress + some excessive debug output. Get rid of spurious tests. + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.6 diff -u -r1.26.2.6 objects-x.c --- src/objects-x.c 1 Feb 2005 15:46:56 -0000 1.26.2.6 +++ src/objects-x.c 20 Feb 2005 14:42:07 -0000 ＠＠ -261,22 +261,29 ＠＠ /* #### This shit is just plain wrong unless we have a character cell font. It really hoses us on large repertoire Unicode fonts with "double-width" characters. */ - /* #### We just init'ed the memory; these are all zero to start. */ - if (f->ascent < rf->ascent) - f->ascent = rf->ascent; - if (f->descent < rf->descent) - f->descent = rf->descent; - if (f->width < rf->max_advance_width) - f->width = rf->max_advance_width; - if (f->height < rf->height) - f->height = rf->height; + f->ascent = rf->ascent; + f->descent = rf->descent; + { + /* This is an approximation that AFAIK only gets used to compute + cell size for estimating window dimensions. The test_string8 + is an ASCII string whose characters should approximate the + distribution of widths expected in real text. */ + static const char test_string8[] = "Mmneei"; + static const int len = sizeof (test_string8) - 1; + XGlyphInfo glyphinfo; + + XftTextExtents8 (dpy, rf, test_string8, len, &glyphinfo); + /* #### maybe should be glyphinfo.xOff - glyphinfo.x? */ + f->width = glyphinfo.width/len + 1; + } + f->height = rf->height; /* #### Is this right? See comment on proportional_p below. */ f->proportional_p = 1; /* we can't recognize monospaced fonts! */ - if (debug_xft > 1) - stderr_out ("initialized ascent %d descent %d width %d height %d\n", - f->ascent, f->descent, f->width, f->height); if (debug_xft > 0) + stderr_out ("initialized metrics ascent %d descent %d width %d height %d\n", + f->ascent, f->descent, f->width, f->height); + if (debug_xft > 2) /* we also output on initialization of any font below */ stderr_out ("initialized Xft font %s\n", extname); } else ＠＠ -355,10 +362,13 ＠＠ { int n = 3, d = 5; /* #### check for weirdness */ - if (n*f->height < d*f->width) - stderr_out ("width of %s is %d, larger than %d/%d its height %d\n", - extname, f->width, n, d, f->height); - stderr_out ("initialized Xft font %s\n", extname); + if (n * f->height < d * f->width) + stderr_out ("font %s: width:height is %d:%d, larger than %d:%d\n", + extname, f->width, f->height, n, d); + if (f->height <= 0 || f->width <= 0) + stderr_out ("bogus dimensions of font %s: width = %d, height = %d\n", + extname, f->width, f->height); + stderr_out ("initialized font %s\n", extname); } #else #undef rf -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[AC sjt-xft] Small fixes to configure.ac 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft Malcolm -- the hunk for xaw3d -> 3d is absolutely necessary for --with-athena=3d to work. I don't know what's going on with the AC_DEFINE_UNQUOTED -> AC_DEFINE hunk. Without the patch, autocough randomly complains about AC_DEFINE_UNQUOTED being undefined, if I run it again it usually completes without comment, but then leaves AC_DEFINE_UNQUOTED as a literal in configure, which of course chokes and dies when it gets there. yagh. Please review; maybe it's preferable to revert to Aidan's code there (from before my previous patch), but that's doing the test in the wrong place, IMHO. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.7 diff -u -U0 -r1.418.2.7 ChangeLog --- ChangeLog 19 Feb 2005 14:43:30 -0000 1.418.2.7 +++ ChangeLog 20 Feb 2005 11:54:06 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-02-20 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (athena): Spells as 3d, not xaw3d, in declaration. + (sound): quickfix: AC_DEFINE, not AC_DEFINE_UNQUOTED, at top level. + Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.5 diff -u -r1.1.14.5 configure.ac --- configure.ac 19 Feb 2005 14:43:30 -0000 1.1.14.5 +++ configure.ac 20 Feb 2005 11:54:17 -0000 ＠＠ -868,7 +868,7 ＠＠ XE_KEYWORD_ARG_WITH([athena], AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]), -[],[],[xaw,xaw3d,next,95,xpm])dnl +[],[],[xaw,3d,next,95,xpm])dnl XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl ＠＠ -4827,7 +4827,8 ＠＠ if test "$sound_found" = "yes"; then need_miscplay=yes XE_ADD_OBJS(linuxplay.o) - [AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")] + dnl I don't understand, but autoconf chokes on AC_DEFINE_UNQUOTED here + AC_DEFINE(SOUNDCARD_H_FILE, "${dir}/soundcard.h") fi fi -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[PATCH] [R21.4] Update etc/PACKAGES 19 years, 10 months

Norbert Koch

Hello Vin, Here's an update to etc/PACKAGES, announcing the new package we have and syncing another description. norbert. ../ChangeLog addition: 2005-02-19 Norbert Koch <viteno(a)xemacs.org> * etc/PACKAGES: Announce latin-euro-standards, update mule-base. 21.4-etc source patch: Diff command: cvs -f -z3 -q diff -u -N Files affected: PACKAGES Index: PACKAGES =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/Attic/PACKAGES,v retrieving revision 1.8.4.5 diff -u -r1.8.4.5 PACKAGES --- PACKAGES 2004/04/20 02:56:26 1.8.4.5 +++ PACKAGES 2005/02/19 21:08:41 ＠＠ -370,6 +370,9 ＠＠ *** egg-its MULE: Wnn (4.2 and 6) support. SJ3 support. +*** latin-euro-standards +MULE: Support for the Latin{7,8,9,10} character sets & coding systems. + *** latin-unity MULE: find single ISO 8859 character set to encode a buffer. ＠＠ -383,7 +386,7 ＠＠ MULE: Dictionary support. *** mule-base -MULE: Basic Mule support, required for building with Mule. +MULE: Basic Mule support. *** mule-ucs MULE: Extended coding systems (including Unicode) for XEmacs.

2 participants
1 comments

[PATCH] Document use of `same-window-buffer-names', `same-window-buffer-regexps's for pop-to-buffer, display-buffer 19 years, 10 months

Aidan Kehoe

lisp/ChangeLog addition: 2005-02-16 Aidan Kehoe <kehoea(a)parhasard.net> * buffer.el (pop-to-buffer): * window-xemacs.el (display-buffer): Document use of `same-window-buffer-names,' `same-window-regexps' by pop-to-buffer and display-buffer. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: lisp/window-xemacs.el lisp/buffer.el Index: lisp/buffer.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/buffer.el,v retrieving revision 1.4 diff -u -u -r1.4 buffer.el --- lisp/buffer.el 2001/04/12 18:21:11 1.4 +++ lisp/buffer.el 2005/02/16 02:33:24 ＠＠ -71,7 +71,12 ＠＠ another window even if BUFNAME is already visible in the selected window. If optional third arg is non-nil, it is the frame to pop to this buffer on. -If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged." +If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged. + +Buffers with names that are members of the `same-window-buffer-names' +list, or that match an element of the `same-window-regexps' list are +treated specially by this function--they are always selected in the +same window rather than in a different one." ;; #ifdef I18N3 ;; #### Doc string should indicate that the buffer name will get ;; translated. Index: lisp/window-xemacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/window-xemacs.el,v retrieving revision 1.20 diff -u -u -r1.20 window-xemacs.el --- lisp/window-xemacs.el 2004/08/21 17:05:51 1.20 +++ lisp/window-xemacs.el 2005/02/16 02:33:25 ＠＠ -701,6 +701,10 ＠＠ If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. +If the buffer name is a member of the `same-window-buffer-names' list, +or matches one of the `same-window-regexps' expressions, display the +buffer in the currently selected window. + Returns the window displaying BUFFER." (interactive "BDisplay buffer:\nP") -- “Ah come on now Ted, a Volkswagen with a mind of its own, driving all over the place and going mad, if that’s not scary I don’t know what is.”

3 participants
2 comments

[AC 21.5] new configure.ac, build system, and Xft docs for internals 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Unrelated to 21.4. Somewhat jumping the gun on the autoconf stuff. :-) Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.286 diff -u -U0 -r1.286 ChangeLog --- man/ChangeLog 4 Feb 2005 02:51:20 -0000 1.286 +++ man/ChangeLog 19 Feb 2005 14:59:09 -0000 ＠＠ -0,0 +1,45 ＠＠ +2005-02-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Introduction to Writing C Code): + Change "mostly warning-free" to "warning-free" to encourage + reporting warnings as bugs. + (The configure Script): + Incorporate Malcolm Purvis's notes from configure.ac. Document + his implementations of keyword and complex options, and remove + descriptions of my obsolete code. + +2005-01-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Better Rendering Support -- + Configuration with the Interim Patches): + Improve notes on configuration. + +2004-12-15 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Better Rendering Support -- + Configuration with the Interim Patches): Menubar uses xftFont + resource, too. + +2005-02-03 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (XEmacs from the Perspective of + Building): Mention autoconf. + (The Modules of XEmacs): Point Next the The Build Configuration + System and add Modules for Building XEmacs to the menu. + (A Summary of the Various XEmacs Modules): Add Modules for + Building XEmacs to menu, and Modules for Build Configuration, + Modules for Compiling XEmacs, and Modules for Preloading Lisp to + the table of sections. + (Low-Level Modules): Point Previous to Modules for Building XEmacs. + (Modules for Building XEmacs): + (Modules for Build Configuration): + (Modules for Compiling XEmacs): + (Modules for Preloading Lisp): + (The Build Configuration System): + (Adding Configurable Features): + (The configure Script): + (The Makefile Precursors): + New nodes. + (Rules When Writing New C Code): + Point Previous to The Build Configuration System. + Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.59 diff -u -r1.59 internals.texi --- man/internals/internals.texi 26 Jan 2005 09:48:27 -0000 1.59 +++ man/internals/internals.texi 19 Feb 2005 14:59:19 -0000 ＠＠ -311,6 +311,7 ＠＠ * XEmacs from the Perspective of Building:: * Build-Time Dependencies:: * The Modules of XEmacs:: +* The Build Configuration System:: * Rules When Writing New C Code:: * Regression Testing XEmacs:: * CVS Techniques:: ＠＠ -2409,7 +2410,9 ＠＠ The first step of building involves running the ＠file{configure} program and passing it various parameters to specify any optional features you want and compiler arguments and such, as described in the ＠file{INSTALL} -file. This determines what the build environment is, chooses the +file. (You may optionally run ＠file{autoconf} first to update the +＠file{configure} script. ＠xref{Modules for Build Configuration}.) +This determines what the build environment is, chooses the appropriate ＠file{s/} and ＠file{m/} file, and runs a series of tests to determine many details about your environment, such as which library functions are available and exactly how they work. The reason for ＠＠ -2520,12 +2523,13 ＠＠＠code{custom-declare-variable-list} to prevent the ＠samp{void-variable} error. (Currently this is only needed for ＠file{make-docfile.el}.) -＠node The Modules of XEmacs, Rules When Writing New C Code, Build-Time Dependencies, Top +＠node The Modules of XEmacs, The Build Configuration System, Build-Time Dependencies, Top ＠chapter The Modules of XEmacs ＠cindex modules of XEmacs ＠menu * A Summary of the Various XEmacs Modules:: +* Modules for Building XEmacs:: * Low-Level Modules:: * Basic Lisp Modules:: * Modules for Standard Editing Operations:: ＠＠ -2534,7 +2538,7 ＠＠ * Modules for Interfacing with the Operating System:: ＠end menu -＠node A Summary of the Various XEmacs Modules, Low-Level Modules, The Modules of XEmacs, The Modules of XEmacs +＠node A Summary of the Various XEmacs Modules, Modules for Building XEmacs, The Modules of XEmacs, The Modules of XEmacs ＠section A Summary of the Various XEmacs Modules ＠cindex summary of the various XEmacs modules ＠cindex modules, summary of the various XEmacs ＠＠ -2546,6 +2550,12 ＠＠＠itemize ＠bullet ＠item +＠ref{Modules for Build Configuration}. +＠item +＠ref{Modules for Compiling XEmacs}. +＠item +＠ref{Modules for Preloading Lisp}. +＠item ＠ref{Low-Level Modules}. ＠item ＠ref{Basic Lisp Modules}. ＠＠ -3022,7 +3032,65 ＠＠ -＠node Low-Level Modules, Basic Lisp Modules, A Summary of the Various XEmacs Modules, The Modules of XEmacs +＠node Modules for Building XEmacs, Low-Level Modules, A Summary of the Various XEmacs Modules, The Modules of XEmacs +＠section Modules for Building XEmacs +＠cindex modules for building XEmacs +＠cindex building XEmacs, modules for + +＠menu +* Modules for Build Configuration:: +* Modules for Compiling XEmacs:: +* Modules for Preloading Lisp:: +＠end menu + + + +＠node Modules for Build Configuration, Modules for Compiling XEmacs, Modules for Building XEmacs, Modules for Building XEmacs +＠subsection Modules for Build Configuration +＠cindex modules for build configuration +＠cindex build configuration, modules for + +＠example +＠file{configure} +(a)file{config.h.in} +(a)file{Makefile.in.in} +＠end example + +＠example +(a)file{configure.ac} +(a)file{configure.in} +＠end example + +＠xref{The configure Script}. + + + +＠node Modules for Compiling XEmacs, Modules for Preloading Lisp, Modules for Build Configuration, Modules for Building XEmacs +＠subsection Modules for Compiling XEmacs +＠cindex modules for compiling xemacs +＠cindex compiling xemacs, modules for + +＠strong{Please write this node!} ＠c #### + +This node should contain descriptions of files like the various +Makefiles, and I guess cross-references to ellcc etc. + + + +＠node Modules for Preloading Lisp, , Modules f +＠c #### Describe Alexey Gladkov and Yury Konovalov's work. However, in late 2003 Eric Knauel <knauel＠(a)informatik.uni-tuebingen.de> and Matthias Neubauer <neubauer＠(a)informatik.uni-freiburg.de> put forward ＠＠ -23255,15 +23645,15 ＠＠ one may be made available for the Knauel-Matthias patch soon. ＠menu -* Better Rendering Support -- Issues:: +* Better Rendering Support -- Review Criteria:: * Better Rendering Support -- Implementation:: * Better Rendering Support -- Current Status:: * Better Rendering Support -- Configuration with the Interim Patches:: ＠end menu -＠node Better Rendering Support -- Issues, Better Rendering Support -- Implementation, , Future Work -- Better Rendering Support -＠subsection Better Rendering Support -- Issues +＠node Better Rendering Support -- Review Criteria, Better Rendering Support -- Implementation, , Future Work -- Better Rendering Support +＠subsection Better Rendering Support -- Review Criteria ＠cindex better rendering support, issues ＠cindex issues, better rendering support ＠＠ -23300,7 +23690,7 ＠＠ to properly support display of different faces in non-buffer, non-window contexts. -＠node Better Rendering Support -- Implementation, Better Rendering Support -- Current Status, Better Rendering Support -- Issues, Future Work -- Better Rendering Support +＠node Better Rendering Support -- Implementation, Better Rendering Support -- Current Status, Better Rendering Support -- Review Criteria, Future Work -- Better Rendering Support ＠subsection Better Rendering Support -- Implementation ＠cindex better rendering support, implementation ＠cindex implementation, better rendering support ＠＠ -23324,6 +23714,15 ＠＠ of ＠file{Xft}'s rendering functionality should be separated from use of ＠file{fontconfig}. +＠item fontconfig +Fontconfig is dramatically different from the X model in several ways. +In particular, ＠emph{fontconfig always returns a font}. However, the +font returned need not be anything like the desired font. This means +that XEmacs must adopt a strategy of delegating the search to +fontconfig, then sanity-checking the return, rather than trying to use +the fontconfig API to search using techniques appropriate for the X11 +core font API. + ＠item Font menus The ＠samp{Options->Font} and ＠samp{Options->Font Sizes} menus are broken, by design, not just by ＠file{Xft}. Although they work better ＠＠ -23492,6 +23891,26 ＠＠ These menus don't work. All fonts are greyed out. All sizes are available, but many (most?) faces don't change size, in particular, ＠samp{default} does not. + +＠item Antialiased text bleeding outside of reported extent +On my PowerBook G4 Titanium 15" screen, X.org server v6.8.1, + dimensions: 1280x833 pixels (433x282 millimeters), + resolution: 75x75 dots per inch, + depth of root window: 24 planes +(yes, those dimensions are broken), +with font "Bitstream Vera Sans Mono-16:dpi=75" antialiased text may +bleed out of the extent reported by XftTextExtents and other such +facilities. This is most obvious with the underscore character in that +font. The bottom of the underscore is antialiased, and insertions or +deletions in the same line before the underscore leave a series of +"phantom" underlines. Except that it doesn't happen on the very first +such insertion or deletion after a window refresh. A similar effect +sometimes occurs with deletions at the end of the line (no, I can't +define "sometimes"). See also comments in ＠file{redisplay-x.c}, +functions ＠code{x_output_string} and ＠code{x_output_display_block}. +(Mostly duplicated here.) + +I think this is probably an Xft bug, but I'm not sure. ＠end table ＠＠ -23505,43 +23924,24 ＠＠＠itemize ＠item -The only way to configure widget fonts at the present time is to use X -resources (or hack the source and rebuild). Currently supported widgets -are -＠itemize -＠item -menubars -＠item -tab controls -＠end itemize - -Here are the resources I use. ＠strong{Warning:} ＠emph{This interface -will change.} The tab control has separate Font and XftFont resources, -and uses the X resource manager to instantiate a FontStruct from the -Font resource. The menubar on the other hand uses Font for both, but -converts to FontStruct if Xft is not compiled in, and leaves it as a -string if Xft is compiled in. There is no equivalent facility for -XftFont yet, and creating one that handles both FontStruct and XftFont -depending on XEmacs's configuration and the font name seems error-prone -at best. Probably we will revert to a simple string representation for -this resource, and convert to a face in XEmacs rather than a font in -Xt/Xft. -＠example -XEmacs*Tabs.xftFont: Bitstream Vera Sans-18 -XEmacs*menubar.font: Bitstream Vera Sans-18 -XEmacs.modeline.attributeFont: Bitstream Charter-26 -XEmacs.default.attributeFont: Bitstream Vera Sans Mono-24 -＠end example -No, I don't understand why I need to use different point sizes to get -what looks like good balance to my eyes. I do highly recommend use of a -proportional font in the modeline because it allows a lot more text to -fit there. +Although the menus don't work, it is possible to specify fonts for +＠emph{faces} using ＠code{set-face-font} (and other specifier-changing +functions). + +There currently is no explicit way to specify that a particular font be +used only for a given language. However, since many fonts support only +a limited repertoire such as ISO 8859/1, you can use the precedence of +specifications for a given specifier locale to get something of this +effect for non-Latin character sets. This will normally work rather +poorly for multiple Latin character sets, however, because the +repertoires tend to have large amounts of overlap. Support for +specifying font by ＠emph{language} as well as by character set is +planned. -＠item Because fonts supporting other languages tend to support English as well, if you want to use one font for English and another for the other language, you must use the ＠code{append} method when adding font -specifications for the other language. +specifications for the ＠emph{other} language. However, this leaves you with a problem if you want to change the other language's font: you have to remove the existing specification so it ＠＠ -23559,7 +23959,40 ＠＠ (set-face-font 'default "Mikachan-14" nil '(lang-ja) 'remove-tag-set-append) ＠end example + +＠item +The only way to configure widget fonts at the present time is to use X +resources (or hack the source and rebuild). Currently supported widgets +are +＠itemize +＠item +menubars +＠item +tab controls ＠end itemize + +Here are the resources I use. ＠strong{Warning:} ＠emph{This interface +will change.} The tab control and menubar have separate Font and +XftFont resources, and use the X resource manager to instantiate a +FontStruct from the Font resource. There is no converter facility for +XftFont yet, and creating one that handles both FontStruct and XftFont +depending on XEmacs's configuration and the font name seems error-prone +at best. Probably we will should to a simple string representation for +this resource, and convert to a face in XEmacs rather than a font in +Xt/Xft. +＠example +XEmacs*Tabs.xftFont: Bitstream Vera Sans-16 +XEmacs*menubar*xftFont: Bitstream Vera Sans-16 +XEmacs.modeline.attributeFont: Bitstream Charter-16 +XEmacs.default.attributeFont: Bitstream Vera Sans Mono-16 +＠end example +I highly recommend use of a proportional font in the modeline because it +allows a lot more text to fit there. (Previously the font sizes were +quite varied, and there was a comment that this weirdness gave good +balance. This isn't true on my main platform, Mac OS X, and needs to be +rechecked on Linux, where it was observed.) +＠end itemize + ＠node Future Work Discussion, Old Future Work, Future Work, Top -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[AC sjt-xft] configure.ac doc fiddling 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft Malcolm, you can go ahead and sync configure.ac and src/config.h.in from sjt-xft to mainline now. Don't worry about the man/internals stuff, I'm doing that myself. If you have any more questions about synching, feel free, but I think that just copying the files across to a pristine 21.5 workspace and copy/pasting the logs is the right way to go. cvs diff ChangeLog configure.ac man/ChangeLog man/internals/internals.texi Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.6 diff -u -r1.418.2.6 ChangeLog --- ChangeLog 11 Feb 2005 12:19:31 -0000 1.418.2.6 +++ ChangeLog 19 Feb 2005 13:39:43 -0000 ＠＠ -0,0 +1,16 ＠＠ +2005-02-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (XE_EXPAND_COMPLEX_OPTION): Use same name in comment. + (XEmacs keyword option support): + (XEmacs complex option support): + Move long header comments to internals.texi(The configure Script). + +2005-02-03 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac: Trap --with-style flags, now --enable. + +2005-02-03 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (Autodetect native sound): + Handle NetBSD per Aidan's patch. + Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.4 diff -u -r1.1.14.4 configure.ac --- configure.ac 11 Feb 2005 12:19:44 -0000 1.1.14.4 +++ configure.ac 19 Feb 2005 13:39:45 -0000 ＠＠ -231,20 +231,14 ＠＠ dnl ============================= dnl dnl A "keyword" option is one that accepts one of a number of pre-defined -dnl values (if more than one value is needed see "complex options" below). -dnl For example --with-mail-locking=flock. +dnl values. For example --with-mail-locking=flock. +dnl The descriptions below provide prototypes and little more. dnl -dnl Complex options used an expanded forms of AC_ARG_[WITH|ENABLE] called -dnl XE_KEYWORD_ARG_[WITH|ENABLE] both taking 5 parameters. The first 4 -dnl parameters of these macros are the same as original macros with the -dnl exception that all four paramaters are REQUIRED. The ACTION-IF-TRUE code -dnl is run after the argument list has been parsed. -dnl -dnl The 5th parameter is a list keywords. The list must be quoted but the -dnl individual macros should not. -dnl -dnl If the option value is a not a valid keyword then an error message is -dnl generated, otherwise rthe value is left untouched. +dnl For more information, +dnl (Info-goto-node "(internals)The configure Script") +dnl To edit the documentation, +dnl (progn (find-file "man/internals/internals.texi")) +dnl and search for "＠node The configure Script". dnl dnl XE_PARSE_KEYWORD_OPTION(prefix, cmdline-flag) dnl --------------------------------------------- ＠＠ -311,39 +305,19 ＠＠ dnl A "complex option" is one that takes a number of related values. dnl For example, we might use "--with-xft=all,nomenubars" for compatibility dnl with XFontSet i18n of menubars. (Silly, Xft looks much better than XFS.) -dnl Processing such an option requires a number of auxiliary variables. -dnl -dnl Complex options used an expanded forms of AC_ARG_[WITH|ENABLE] called -dnl XE_COMPLEX_ARG_[WITH|ENABLE] both taking 5 parameters. The first 4 -dnl parameters of these macros are the same as original macros with the -dnl exception that all four paramaters are REQUIRED. The ACTION-IF-TRUE code -dnl is run after the argument list has been parsed. dnl -dnl The 5th parameter is a list of XE_COMPLEX_OPTION macros that define the -dnl valid components and their default values. The list must be quoted but -dnl the individual macros should not. +dnl The descriptions below provide prototypes and little more. +dnl For more information, +dnl (Info-goto-node "(internals)The configure Script") +dnl To edit the documentation, +dnl (progn (find-file "man/internals/internals.texi")) +dnl and search for "＠node The configure Script". dnl -dnl Option values are stored in the variables with_<package>_<component> or -dnl enable_<feature>_<component> (eg with_xft_menubars). -dnl -dnl Option values are either 'yes' which means that the option must be used -dnl and an error must occur if there is a configuration problems (such as a -dnl missing library) or 'no' which means that the option must not be used. -dnl The default value can also be "", meaning maybe, which means 'yes' if the -dnl configuration is present otherwise no. Users cannot specify 'maybe' from -dnl the command line. -dnl -dnl There are two possible uses in XEmacs for this kind of facility. One is -dnl exemplified by sound: there are alternative protocols (native, ESD, NAS) -dnl and each is supported by a corresponding library. The other is a single -dnl library which may or may not be supported by multiple components of -dnl XEmacs, as exemplified by Xft. This latter usage may be more common -dnl during development of a feature. Perhaps specialized APIs should be -dnl provided, see comment on XE_COMPLEX_OPTION_HELP_STRING below. -dnl -dnl XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno) +dnl XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno) dnl --------------------------------------------------- dnl +dnl #### documented as XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno) +dnl #### in Malcolm's version? dnl Internal macro create the option's shell variable containing the default dnl value and to note the values in an option list. dnl ＠＠ -492,7 +466,33 ＠＠ dnl Error-checking on old-style flags AC_ARG_WITH([mule],[],[XE_DIE([--enable-mule, NOT --with-mule])],[]) +AC_ARG_WITH([menubars],[],[XE_DIE([--enable-menubars, NOT --with-menubars])],[]) +AC_ARG_WITH([scrollbars],[],[XE_DIE([--enable-scrollbars, NOT --with-scrollbars])],[]) +AC_ARG_WITH([dialogs],[],[XE_DIE([--enable-dialogs, NOT --with-dialogs])],[]) +AC_ARG_WITH([widgets],[],[XE_DIE([--enable-widgets, NOT --with-widgets])],[]) +AC_ARG_WITH([sound],[],[XE_DIE([--enable-sound, NOT --with-sound])],[]) +AC_ARG_WITH([default-eol-detection],[],[XE_DIE([--enable-default-eol-detection, NOT --with-default-eol-detection])],[]) +AC_ARG_WITH([clash-detection],[],[XE_DIE([--enable-clash-detection, NOT --with-clash-detection])],[]) +AC_ARG_WITH([database],[],[XE_DIE([--enable-database, NOT --with-database])],[]) +AC_ARG_WITH([modules],[],[XE_DIE([--enable-modules, NOT --with-modules])],[]) +AC_ARG_WITH([toolbars],[],[XE_DIE([--enable-toolbars, NOT --with-toolbars])],[]) + +dnl I think these will be caught by autoconf internal checks, +dnl only --with-* are unchecked +dnl --external-widget --enable-external-widget +dnl --native-sound-lib=LIB --with-native-sound-lib +dnl --mail-locking=TYPE --with-mail-locking +dnl --rel-alloc --with-rel-alloc +dnl --use-number-lib --enable-bignum +dnl --debug --enable-debug +dnl --error-checking --enable-error-checking +dnl --memory-usage-stats --enable-memory-usage-stats +dnl --quick-build --enable-quick-build +dnl --use-union-type --enable-union-type +dnl --pdump --enable-pdump +dnl --use-kkcc --enable-kkcc +dnl parse flags AC_ARG_WITH([prefix], AC_HELP_STRING([--with-prefix=no],[Don't compile the value of --prefix into the executable.]), [true], [with_prefix=yes]) ＠＠ -4807,29 +4807,37 ＠＠ dnl Check for Linux/BSD native sound (also on recent Cygwins) if test -z "$sound_found"; then for dir in "machine" "sys" "linux"; do - AC_CHECK_HEADER(${dir}/soundcard.h, + AC_CHECK_HEADER(${dir}/soundcard.h, [ sound_found=yes - need_miscplay=yes - XE_ADD_OBJS(linuxplay.o) - [AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")] - break) + case "$canonical" in + *netbsd* ) + # #### this is probably not the right way to do this + # we should port to native NetBSD stuff + AC_CHECK_LIB(ossaudio, _oss_ioctl, + [native_sound_lib=-lossaudio + AC_MSG_WARN([Using NetBSD-deprecated -lossaudio])], + [sound_found=no]) + ;; + dnl Aidan sez: OpenBSD as well can use Linux's sound API, and needs + dnl the same library. Add here! + esac + break]) done + + if test "$sound_found" = "yes"; then + need_miscplay=yes + XE_ADD_OBJS(linuxplay.o) + [AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")] + fi fi if test "$sound_found" = "yes"; then - enable_sound_native=yes - - dnl NetBSD can use Linux's sound API, but it needs an extra library at - dnl link time to do so. (OpenBSD apparently needs the same; not written - dnl or tested.) - if test "$opsys" = "netbsd" ; then - AC_CHECK_LIB(ossaudio, _oss_ioctl, native_sound_lib="-lossaudio") - fi + enable_sound_native=yes else - if test "$enable_sound_native" = "yes" ; then - AC_MSG_WARN([No native libraries found. Disabling native sound support.]) - fi - enable_sound_native=no + if test "$enable_sound_native" = "yes" ; then + AC_MSG_WARN([No native libraries found. Disabling native sound support.]) + fi + enable_sound_native=no fi fi Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.269.2.3 diff -u -r1.269.2.3 ChangeLog --- man/ChangeLog 1 Feb 2005 15:46:42 -0000 1.269.2.3 +++ man/ChangeLog 19 Feb 2005 13:39:47 -0000 ＠＠ -0,0 +1,31 ＠＠ +2005-02-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Introduction to Writing C Code): + Change "mostly warning-free" to "warning-free" to encourage + reporting warnings as bugs. + (The configure Script): + Incorporate Malcolm Purvis's notes from configure.ac. Document + his implementations of keyword and complex options, and remove + descriptions of my obsolete code. + +2005-02-03 Stephen J. Turnbull <stephen(a)xemacs.org> + * internals/internals.texi (XEmacs from the Perspective of + Building): Mention autoconf. + (The Modules of XEmacs): Point Next the The Build Configuration + System and add Modules for Building XEmacs to the menu. + (A Summary of the Various XEmacs Modules): Add Modules for + Building XEmacs to menu, and Modules for Build Configuration, + Modules for Compiling XEmacs, and Modules for Preloading Lisp to + the table of sections. + (Low-Level Modules): Point Previous to Modules for Building XEmacs. + (Modules for Building XEmacs): + (Modules for Build Configuration): + (Modules for Compiling XEmacs): + (Modules for Preloading Lisp): + (The Build Configuration System): + (Adding Configurable Features): + (The configure Script): + (The Makefile Precursors): + New nodes. + (Rules When Writing New C Code): + Point Previous to The Build Configuration System. ＠＠ -386,7 +856,7 ＠＠ (Future Work -- Lisp Engine Replacement): Add pointers to new node. -04-11-16 Ben Wing <ben(a)xemacs.org> +2004-11-16 Ben Wing <ben(a)xemacs.org> * internals/internals.texi (Top): * internals/internals.texi (Introduction): Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.52.2.3 diff -u -r1.52.2.3 internals.texi --- man/internals/internals.texi 1 Feb 2005 15:46:44 -0000 1.52.2.3 +++ man/internals/internals.texi 19 Feb 2005 13:40:09 -0000 ＠＠ -311,6 +311,7 ＠＠ * XEmacs from the Perspective of Building:: * Build-Time Dependencies:: * The Modules of XEmacs:: +* The Build Configuration System:: * Rules When Writing New C Code:: * Regression Testing XEmacs:: * CVS Techniques:: ＠＠ -2331,7 +2410,9 ＠＠ The first step of building involves running the ＠file{configure} program and passing it various parameters to specify any optional features you want and compiler arguments and such, as described in the ＠file{INSTALL} -file. This determines what the build environment is, chooses the +file. (You may optionally run ＠file{autoconf} first to update the +＠file{configure} script. ＠xref{Modules for Build Configuration}.) +This determines what the build environment is, chooses the appropriate ＠file{s/} and ＠file{m/} file, and runs a series of tests to determine many details about your environment, such as which library functions are available and exactly how they work. The reason for ＠＠ -2442,12 +2523,13 ＠＠＠code{custom-declare-variable-list} to prevent the ＠samp{void-variable} error. (Currently this is only needed for ＠file{make-docfile.el}.) -＠node The Modules of XEmacs, Rules When Writing New C Code, Build-Time Dependencies, Top +＠node The Modules of XEmacs, The Build Configuration System, Build-Time Dependencies, Top ＠chapter The Modules of XEmacs ＠cindex modules of XEmacs ＠menu * A Summary of the Various XEmacs Modules:: +* Modules for Building XEmacs:: * Low-Level Modules:: * Basic Lisp Modules:: * Modules for Standard Editing Operations:: ＠＠ -2456,7 +2538,7 ＠＠ * Modules for Interfacing with the Operating System:: ＠end menu -＠node A Summary of the Various XEmacs Modules, Low-Level Modules, The Modules of XEmacs, The Modules of XEmacs +＠node A Summary of the Various XEmacs Modules, Modules for Building XEmacs, The Modules of XEmacs, The Modules of XEmacs ＠section A Summary of the Various XEmacs Modules ＠cindex summary of the various XEmacs modules ＠cindex modules, summary of the various XEmacs ＠＠ -2468,6 +2550,12 ＠＠＠itemize ＠bullet ＠item +＠ref{Modules for Build Configuration}. +＠item +＠ref{Modules for Compiling XEmacs}. +＠item +＠ref{Modules for Preloading Lisp}. +＠item ＠ref{Low-Level Modules}. ＠item ＠ref{Basic Lisp Modules}. ＠＠ -2944,7 +3032,65 ＠＠ -＠node Low-Level Modules, Basic Lisp Modules, A Summary of the Various XEmacs Modules, The Modules of XEmacs +＠node Modules for Building XEmacs, Low-Level Modules, A Summary of the Various XEmacs Modules, The Modules of XEmacs +＠section Modules for Building XEmacs +＠cindex modules for building XEmacs +＠cindex building XEmacs, modules for + +＠menu +* Modules for Build Configuration:: +* Modules for Compiling XEmacs:: +* Modules for Preloading Lisp:: +＠end menu + + + +＠node Modules for Build Configuration, Modules for Compiling XEmacs, Modules for Building XEmacs, Modules for Building XEmacs +＠subsection Modules for Build Configuration +＠cindex modules for build configuration +＠cindex build configuration, modules for + +＠example +＠file{configure} +(a)file{config.h.in} +(a)file{Makefile.in.in} +＠end example + +＠example +(a)file{configure.ac} +(a)file{configure.in} +＠end example + +＠xref{The configure Script}. + + + +＠node Modules for Compiling XEmacs, Modules for Preloading Lisp, Modules for Build Configuration, Modules for Building XEmacs +＠subsection Modules for Compiling XEmacs +＠cindex modules for compiling xemacs +＠cindex compiling xemacs, modules for + +＠strong{Please write this node!} ＠c #### + +This node should contain descriptions of files like the various +Makefiles, and I guess cross-references to ellcc etc. + + + +＠node Modules for Preloading Lisp, , Modules for Compiling XEmacs, Modules for Building XEmacs +＠subsection Modules for Preloading Lisp +＠cindex modules for preloading lisp +＠cindex preloading lisp, modules for + +＠strong{Please write this node!} ＠c #### + +This node should contain descriptions of files like dumped-lisp.el +(maybe that goes in Modules for Build Configuration supra?), +update-elcs.el, and so on. + + + +＠node Low-Level Modules, Basic Lisp Modules, Modules for Building XEmacs, The Modules of XEmacs ＠section Low-Level Modules ＠cindex low-level modules ＠cindex modules, low-level ＠＠ -3978,7 +4124,327 ＠＠ This module provides some terminal-control code necessary on versions of AIX prior to 4.1. -＠node Rules When Writing New C Code, Regression Testing XEmacs, The Modules of XEmacs, Top + + +＠node The Build Configuration System, Rules When Writing New C Code, The Modules of XEmacs, Top +＠chapter The Build Configuration System +＠cindex build configuration +＠cindex configuration, build + +＠strong{Please write this node!} ＠c #### + +This node should describe XEmacs-specific techniques and idioms in the +configuration system. A particular example is the set of ＠samp{XE_} +macros in ＠file{configure.in} and ＠file{configure.ac}. + +＠menu +* Adding Configurable Features:: +* The configure Script:: +* The Makefile Precursors:: +＠end menu + + + +＠node Adding Configurable Features, The configure Script, The Build Configuration System, The Build Configuration System +＠section Adding Configurable Features +＠cindex adding configurable features +＠cindex configurable features, adding +＠cindex features, adding configurable + +Adding a configurable feature requires at least adding an option to the +＠file{configure} script and a macro definition to ＠file{src/config.h.in} +(＠pxref{The configure Script}), and often changes to Makefile precursors +(＠pxref{The Makefile Precursors}). + + + +＠node The configure Script, The Makefile Precursors, Adding Configurable Features, The Build Configuration System +＠section The configure Script +＠cindex configure script +＠cindex script, configure + +At the heart of the XEmacs build configuration system is the +＠file{configure} script. This beast is maintained using the Autoconf +system, which is a truly terrifying monstrosity based on a fundamentally +flawed programming model (extensive use of macros), with an +implementation about which I've never heard a nice word (GNU ＠file{m4}), +used to string together a large set of ＠emph{ad hoc} tests, to implement +a configuration language with conventions that are unimportant in simple +cases and counterintuitive when things get complicated. If that doesn't +scare you off, Welcome! I think you're ready to become a configure +hacker! (But be prepared for things to go downhill from here.) + +＠file{configure} is, of course, is written in POSIX shell language, and +autogenerated from a precursor (see? the first step was a doozy!) +Currently that precursor is called ＠file{configure.ac}, but in the +previous generation it was called ＠file{configure.in}. As of February +2005, ＠file{configure.ac} is used in the development mainline, but +because the semantics of many predefined macros changed drastically +between ＠file{autoconf} 2.13 and ＠file{autoconf} 2.50 (why not ``3.0''? +you got me), the XEmacs Project chose to stick with the devil it knew +for the stable line of XEmacs 21.4 releases. + +One reason for worrying about the semantic changes is the fact that +XEmacs uses a lot of homebrew code, including ＠file{m4} macros, to +implement special features in its ＠file{configure} script. Here are +some of the important features: + +＠itemize +＠item +Selectively enabling debugging, error checking, and tracing. +＠item +Complex options, which are set-valued (＠i{i.e.}, unordered; ordered +lists of options, for example ``take the first available from the +list,'' are neither used currently nor given special support). +＠end itemize + +Where these are implemented as ＠file{m4} macros, the prefix ＠samp{XE_} +is used to identify them as XEmacs features in the ＠file{configure} +precursor code. Here is a list of prototypes of the convenience macros +provided for performing common operations: + +＠c #### ＠var{}-ize the formal parameters of these functions? +＠table ＠code +＠item USAGE_ERROR(string) +prints a usage error and dies + +＠item PRINT_VAR(var var ...) +prints values of shell variables + +＠item XE_ADD_OBJS(foo.o ...) +＠strong{#### Please document me!} + +＠item XE_APPEND(value, varname) +＠strong{#### Please document me!} + +＠item XE_PREPEND(value, varname) +＠strong{#### Please document me!} + +＠item XE_DIE(message) +used for situations that can't lead to a successful build, such as +missing include files or conflicts between requested features. + +＠item XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2) +＠strong{#### Please document me!} + +＠item XE_STRIP_4TH_COMPONENT(var) +＠strong{#### Please document me!} + +＠item CANONICALIZE_PATH(varname) +＠strong{#### Please document me!} + +＠item XE_PROTECT_LINKER_FLAGS(shell_var) +＠strong{#### Please document me!} + +＠item COLON_TO_SPACE(path) +Allow use of either ＠samp{:} or spaces for lists of directories. + +＠item XE_ADD_RUNPATH_DIR(directory) +＠strong{#### Please document me!} + +＠item XE_COMPUTE_RUNPATH() +＠strong{#### Please document me!} + +＠item XE_SPACE(var, words) +＠strong{#### Please document me!} + +＠item XE_SHLIB_STUFF +See ＠file{aclocal.m4}. +＠end table + +＠heading XEmacs keyword option support + +A ＠dfn{keyword} option is one that accepts one of a number of +pre-defined values (if support for sets of values is needed, see +``complex options'' below). For example, +＠samp{--with-mail-locking=flock}. + +Keyword options use expanded forms of ＠samp{AC_ARG_[WITH|ENABLE]} called +＠samp{XE_KEYWORD_ARG_[WITH|ENABLE]}, both taking 5 parameters. The +first 4 parameters of these macros are the same as original macros with +the exception that all four parameters are ＠strong{required}. The +＠var{action-if-true} code is run after the argument list has been +parsed. + +The 5th parameter is a list of supported keywords. The whole list must +be quoted but the individual keywords should not. + +If the option value is a not a valid keyword then an error message is +generated, otherwise the value is left untouched. + +This support is implemented via the following ＠file{GNU m4} macros. +Macros labelled ＠dfn{internal} are not expected to be used by +(a)file{configure.ac} programmers; they are part of the implementation of +higher-level features. + +＠table ＠code +＠item XE_KEYWORD_ARG_WITH(package, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....]) +Expanded version of ＠samp{AC_ARG_WITH} for keyword options. All the +parameters are required. The last argument is a comma-separated list of +supported keywords, ＠file{m4}-quoted with ＠samp{[]}. + +＠item XE_KEYWORD_ARG_ENABLE(feature, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....]) +Expanded version of ＠samp{AC_ARG_ENABLE} for keyword options. All the +parameters are required. The last argument is a comma-separated list of +supported keywords, ＠file{m4}-quoted with ＠samp{[]}. + +＠item XE_PARSE_KEYWORD_OPTION(prefix, cmdline-flag) +Internal macro to parse the option values. If an undeclared option is +found then an error is generated. + +＠item XE_KEYWORD(keyword) +Internal macro to declare an option value. + +＠end table + +＠heading XEmacs complex option support + +A ＠dfn{complex option} is one that takes a number of related values, as +a set. For example, we might use "--with-xft=all,nomenubars" for +compatibility with XFontSet i18n of menubars. (The example is +contrived, Xft looks much better than XFS.) Processing such an option +requires a number of auxiliary variables. + +Complex options use expanded forms of ＠samp{AC_ARG_[WITH|ENABLE]} called +＠samp{XE_COMPLEX_ARG_[WITH|ENABLE]}, both taking 5 parameters. The +first 4 parameters of these macros are the same as original macros with +the exception that all four parameters are ＠strong{required}. The +＠var{action-if-true} code is run after the argument list has been +parsed. + +The 5th parameter is a list of ＠samp{XE_COMPLEX_OPTION} macro calls that +define the valid components and their default values. The list must be +quoted but the individual macro calls should not. Here is how the +＠samp{sound} flag is defined: + +＠example +XE_COMPLEX_ARG_ENABLE([sound], + AC_HELP_STRING([--enable-sound],[Compile with sound support. + Valid types are `native', `nas' and `esd'. + Prefix a type with 'no' to disable. + The first type can be `none' or `all'. `none' means + `nonative,nonas,noesd'. `all' means `native,nas,esd'. + Later options override earlier ones for the same TYPE. + The default is to autodetect all sound support except + for ESD which defaults to off.]), + [], + [enable_sound_nas=""], + [XE_COMPLEX_OPTION([native],[""]), + XE_COMPLEX_OPTION([nas],[""]), + XE_COMPLEX_OPTION([esd],[no])]) +＠end example + +(Note that the help string will be reformatted by ＠file{autoconf} so +that all whitespace is first compressed to a single space, then folded +to appear in the right-hand column as above. Thus the help string may +appear differently when ＠code{./configure --help} is invoked.) + +＠c #### verify for INSTALL and xemacs Texinfo. +Each component is interpreted as a separate feature to be enabled or +disabled. As usual, the distinction between ``with'' and ``enable'' is +that ``with'' features require specific support from the system, usually +one or more optional libraries, and ``enable'' features are supported +entirely by code in XEmacs, but the user might want to switch it off for +some reason. Option values are stored in the variables +＠samp{with_＠var{package}_＠var{component}} or +＠samp{enable_＠var{feature}_＠var{component}} (＠i{e.g.} +＠samp{with_xft_menubars}). + +The user of ＠file{configure} specifies the configuration by providing a +list of components. The special components ＠samp{all} and ＠samp{none} +may occur first in the list, setting the defaults for all components to +＠samp{yes} or ＠samp{no} respectively. + +In ＠file{configure.ac}, default values of option values may be +＠samp{yes} which means that the option must be used and an error must +occur if there is a configuration problems (such as a missing library) +or ＠samp{no} which means that the option must not be used. The default +value can also be the null string ＠samp{""}, usually meaning that +＠file{configure} will attempt to find support for the feature on the +system, and will enable the configuration if it is available. Sometimes +the null string means that ＠file{configure}'s default is +system-dependent. (This usage is not consistent, and depends on the +implementation of the feature detector rather than the argument parser.) +Users cannot specify the null string for an individual component from +the command line. + +There are two possible uses in XEmacs for this kind of facility. One is +exemplified by sound: there are alternative protocols (native, ESD, NAS) +and each is supported by a corresponding library. The other is a single +library which may or may not be supported by multiple components of +XEmacs, as exemplified by Xft. This latter usage may be more common +during development of a feature. Perhaps specialized APIs should be +provided, see comment on ＠samp{XE_COMPLEX_OPTION_HELP_STRING} below. + +＠table ＠code +＠item XE_COMPLEX_OPTION(option, yesno) +Declare a complex option and its default value. The value ＠strong{must} +be either ＠samp{yes} or ＠samp{no} or the null string ＠samp{""}. The +null string means ``maybe'', whose semantics are determined by the +implementation of the option, not by the parser. Typical semantics are +``use the library if found in the usual places'' or ``default is +platform-dependent''. + +＠item XE_COMPLEX_OPTION_HELP_STRING(flag, long, short, components, libraries) +Format a boilerplate help string for complex options. + +This was originally written for the Xft option, and doesn't read so well +for options based on alternative libraries like sound. Hackers beware: +the API may be enhanced to deal with this in the future. + +＠item XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....]) +Extended version of ＠samp{AC_ARG_WITH} for complex options. All the +parameters are required. + +＠item XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....]) +Expanded version of ＠samp{AC_ARG_ENABLE} for complex options. All the +parameters are required. + +＠item XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno) +Internal macro create the option's shell variable containing the default +value and to note the values in an option list. + +＠item XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list) +Internal macro which recursively expands an option list. + +＠item XE_INIT_COMPLEX_OPTION(prefix, option_list) +Internal macro to initialise the complex option shell variables. + +Variables of the form ＠samp{＠var{prefix}_＠var{option}} contain the +default value for that option. ＠samp{＠var{prefix}_types} contains a +space-separated list of all the options and ＠samp{＠var{prefix}_default} +contains a comma-separated list of all the default values. + +＠item XE_PARSE_COMPLEX_OPTION(prefix, cmdline-flag) +Internal macro to parse the option values. If an undeclared option is +found then an error is generated. + +＠end table + + + +＠node The Makefile Precursors, , The configure Script, The Build Configuration System +＠section The Makefile Precursors +＠cindex Makefile precursors +＠cindex precursors, Makefile + +＠strong{Please write this node!} ＠c #### + +As in other programs using a ＠file{configure} program, XEmacs's +Makefiles are not written, they are generated. The ＠file{configure} +program uses Makefile precursors, or templates, to generate the actual +Makefiles. In fact, it is a multistage process. The developer changes +the file ＠file{Makefile.in.in}, then ＠file{configure} first generates an +intermediate file ＠file{Makefile.in}, and finally produces a portable +Makefile called ＠file{Makefile}, and a Makefile optimized for ＠file{GNU +make} called ＠file{GNUmakefile}. + +This node describes XEmacs-specific techniques and idioms used in the +(a)file{Makefile.in.in} files. + + + +＠node Rules When Writing New C Code, Regression Testing XEmacs, The Build Configuration System, Top ＠chapter Rules When Writing New C Code ＠cindex writing new C code, rules when ＠cindex C code, rules when writing new ＠＠ -4012,8 +4478,8 ＠＠＠cindex coding conventions The C code is actually written in a dialect of C called ＠dfn{Clean C}, -meaning that it can be compiled, mostly warning-free, with either a C -or C++ compiler. Coding in Clean C has several advantages over plain +meaning that it can be compiled, warning-free, with either a C or C++ +compiler. Coding in Clean C has several advantages over plain C. C++ compilers are more nit-picking, and a number of coding errors have been found by compiling with C++. The ability to use both C and C++ tools means that a greater variety of development tools are ＠＠ -4024,6 +4490,7 ＠＠ classes, strictly limiting the permissible operations and catching illegal implicit casts and such. +＠c #### did Ben delete this, or just the CODING-STANDARDS file in ./etc? XEmacs follows the GNU coding standards, which are documented separately in ＠xref{top,,, standards, GNU Coding Standards}. This section mainly documents standards that are not included in that -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[AC21.5] UNUSED fix for number.c 19 years, 10 months

Jerry James

APPROVE COMMIT 21.5 Ben Wing found this problem. GCC allows this use, which is why I didn't find it. There may be a few more of these lurking. Let me know if you find one. src/ChangeLog addition: 2005-02-18 Jerry James <james(a)xemacs.org> * number.c: Define USED_IF_BIGFLOAT. * number.c (Fcoerce_number): Use it. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: src/number.c Index: src/number.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/number.c,v retrieving revision 1.14 diff -d -u -r1.14 number.c --- src/number.c 2005/02/03 16:14:07 1.14 +++ src/number.c 2005/02/18 21:33:42 ＠＠ -24,6 +24,12 ＠＠ #include <limits.h> #include "lisp.h" +#ifdef HAVE_BIGFLOAT +#define USED_IF_BIGFLOAT(decl) decl +#else +#define USED_IF_BIGFLOAT(decl) UNUSED (decl) +#endif + Lisp_Object Qrationalp, Qfloatingp, Qrealp; Lisp_Object Vdefault_float_precision; Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; ＠＠ -678,13 +684,7 ＠＠ Note that some conversions lose information. No error is signaled in such cases; the information is silently lost. */ - (number, type, -#ifdef HAVE_BIGFLOAT - precision -#else - UNUSED (precision) -#endif - )) + (number, type, USED_IF_BIGFLOAT (precision))) { CHECK_SYMBOL (type); if (EQ (type, Qfixnum)) -- Jerry James http://www.ittc.ku.edu/~james/

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 February 2005