Mercurial > hg > xemacs-beta
view tests/glyph-test.el @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 0784d089fdc9 |
children | 8a653fbe5c27 |
line wrap: on
line source
(set-extent-begin-glyph (make-extent (point) (point)) (setq im (make-glyph [xbm :file "xemacsicon.xbm"]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [string :data "xemacs"])) (defun foo () (interactive) (setq ok-select (not ok-select))) (defun fee () (interactive) (message "hello")) ;; button in a group (setq ok-select nil) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button1 [button :face widget :descriptor ["ok1" (setq ok-select t) :style radio :selected ok-select]]))) ;; button in a group (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button2 [button :descriptor ["ok2" (setq ok-select nil) :style radio :selected (not ok-select)]]))) ;; toggle button (set-extent-begin-glyph (make-extent (point) (point)) (setq tbutton (make-glyph [button :descriptor ["ok3" (setq ok-select nil) :style toggle :selected (not ok-select)]]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq toggle-button [button :descriptor ["ok4" :style toggle :callback (setq ok-select (not ok-select)) :selected ok-select]]))) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq push-button (make-glyph [button :width 10 :height 2 :face modeline-mousable :descriptor "ok" :callback foo :selected t]))) ;; tree view (set-extent-begin-glyph (make-extent (point) (point)) (setq tree (make-glyph [tree-view :width 10 :descriptor "My Tree" :items (["One" foo] (["Two" foo] ["Four" foo] "Six") "Three")]))) ;; tab control (set-extent-begin-glyph (make-extent (point) (point)) (setq tab (make-glyph [tab-control :descriptor "My Tab" :face highlight :orientation right :items (["One" foo :selected t] ["Two" fee :selected nil] ["Three" foo :selected nil])]))) ;; progress gauge (set-extent-begin-glyph (make-extent (point) (point)) (setq pgauge (make-glyph [progress-gauge :width 10 :height 2 :value 0 :descriptor "ok"]))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pgauge `[progress-gauge :width 10 :height 2 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (sit-for 0.1))) ;; progress gauge in the modeline (setq global-mode-string (cons (make-extent nil nil) (setq pg (make-glyph [progress-gauge :width 5 :pixel-height 16 :descriptor "ok"])))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pg `[progress-gauge :width 5 :pixel-height 16 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (redisplay-frame) (sit-for 0.1))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [button :face modeline-mousable :descriptor "ok" :callback foo :image [xpm :file "../etc/xemacs-icon.xpm"]])) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq pbutton (make-glyph [button :descriptor ["A Big Button" foo ]]))) ;; edit box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq edit-field [edit-field :pixel-width 50 :pixel-height 30 :face bold-italic :descriptor ["Hello"]]))) ;; combo box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq combo-box [combo-box :width 10 :descriptor ["Hello"] :items ("One" "Two" "Three")]))) ;; label (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq label [label :pixel-width 150 :descriptor "Hello"]))) ;; string (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq str [string :data "Hello There"]))) ;; scrollbar ;(set-extent-begin-glyph ; (make-extent (point) (point)) ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]])) ;; generic subwindow (setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70])) (set-extent-begin-glyph (make-extent (point) (point)) sw) ;; layout (setq layout (make-glyph `[layout :descriptor "The Layout" :orientation vertical :justify left :border [string :data "Hello There Mrs"] :items ([layout :orientation horizontal :items (,radio-button1 ,radio-button2)] ,edit-field ,toggle-button ,label ,str)])) ;(set-glyph-face layout 'gui-element) (set-extent-begin-glyph (make-extent (point) (point)) layout) ;; another test layout (set-extent-begin-glyph (make-extent (point) (point)) (setq layout-2 (make-glyph `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 0 :width 10 :height 2 :descriptor "ok"])]))) (set-glyph-image layout-2 `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 4 :width 10 :height 2 :descriptor "ok"])]) (setq test-toggle-widget nil) (defun test-toggle (widget) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (vector 'button :descriptor "ok" :style 'toggle :selected `(funcall test-toggle-value ,widget) :callback `(funcall test-toggle-action ,widget))))) (defun test-toggle-action (widget &optional event) (if widget (message "Widget is t") (message "Widget is nil"))) (defun test-toggle-value (widget) (setq widget (not widget)) (not widget))