Mercurial > hg > xemacs-beta
view tests/Dnd/droptest.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 | 3ecd8885ac67 |
children | bc4f2511bbea |
line wrap: on
line source
;; a short example how to use the new Drag'n'Drop API in ;; combination with extents. ;; (defun dnd-drop-message (event object text) (message "Dropped %s with :%s" text object) ;; signal that we have done something with the data t) (defun do-nothing (event object) ;; signal that the data is still unprocessed nil) (defun start-drag (event what &optional typ) ;; short drag interface, until the real one is implemented (cond ((featurep 'offix) (if (numberp typ) (offix-start-drag event what typ) (offix-start-drag event what))) ((featurep 'cde) (if (not typ) (funcall (intern "cde-start-drag-internal") event nil (list what)) (funcall (intern "cde-start-drag-internal") event t what))) (t display-message 'error "no valid drag protocols implemented"))) (defun start-region-drag (event) (interactive "_e") (if (click-inside-extent-p event zmacs-region-extent) ;; okay, this is a drag (cond ((featurep 'offix) (offix-start-drag-region event (extent-start-position zmacs-region-extent) (extent-end-position zmacs-region-extent))) ((featurep 'cde) ;; should also work with CDE (cde-start-drag-region event (extent-start-position zmacs-region-extent) (extent-end-position zmacs-region-extent))) (t (error "No offix or CDE support compiled in"))))) (defun make-drop-targets () (let ((buf (get-buffer-create "*DND misc-user extent test buffer*")) (s nil) (e nil)) (set-buffer buf) (pop-to-buffer buf) (setq s (point)) (insert "[ DROP TARGET 1]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((do-nothing t t) (dnd-drop-message t t "on target 1"))) (set-extent-property ext 'mouse-face 'highlight) (insert " ") (setq s (point)) (insert "[ DROP TARGET 2]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((dnd-drop-message t t "on target 2"))) (set-extent-property ext 'mouse-face 'highlight) (insert " ") (setq s (point)) (insert "[ DROP TARGET 3]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((dnd-drop-message t t "on target 3"))) (set-extent-property ext 'mouse-face 'highlight) (newline 2))) (defun make-drag-starters () (let ((buf (get-buffer-create "*DND misc-user extent test buffer*")) (s nil) (e nil) (ext nil) (kmap nil)) (set-buffer buf) (pop-to-buffer buf) (erase-buffer buf) (insert "Try to drag data from one of the upper extents to one\nof the lower extents. Make sure that your minibuffer is big\ncause it is used to display the data.\n\nYou may also try to select some of this text and drag it with button2.\n\nTo ") (setq s (point)) (insert "EXIT") (setq e (point)) (insert " this demo, press 'q'.") (setq ext (make-extent s e)) (setq kmap (make-keymap)) (define-key kmap [button1] 'end-dnd-demo) (set-extent-property ext 'keymap kmap) (set-extent-property ext 'mouse-face 'highlight) (newline 2) (setq s (point)) (insert "[ TEXT DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (define-key kmap [button1] 'text-drag) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ FILE DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (if (featurep 'cde) (define-key kmap [button1] 'cde-file-drag) (define-key kmap [button1] 'file-drag)) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ FILES DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (define-key kmap [button1] 'files-drag) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ URL DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (if (featurep 'cde) (define-key kmap [button1] 'cde-file-drag) (define-key kmap [button1] 'url-drag)) (set-extent-property ext 'keymap kmap) (newline 3))) (defun text-drag (event) (interactive "@e") (start-drag event "That's a test")) (defun file-drag (event) (interactive "@e") (start-drag event "/tmp/DropTest.xpm" 2)) (defun cde-file-drag (event) (interactive "@e") (start-drag event '("/tmp/DropTest.xpm") t)) (defun url-drag (event) (interactive "@e") (start-drag event "http://www.xemacs.org/" 8)) (defun files-drag (event) (interactive "@e") (start-drag event '("/tmp/DropTest.html" "/tmp/DropTest.xpm" "/tmp/DropTest.tex") 3)) (setq experimental-dragdrop-drop-functions '((do-nothing t t) ;; CDE does not have any button info... (dnd-drop-message 0 t "cde-drop somewhere else") (dnd-drop-message 2 t "region somewhere else") (dnd-drop-message 1 t "drag-source somewhere else") (do-nothing t t))) (make-drag-starters) (make-drop-targets) (defun end-dnd-demo () (interactive) (global-set-key [button2] button2-func) (bury-buffer)) (setq lmap (make-keymap)) (use-local-map lmap) (local-set-key [q] 'end-dnd-demo) (setq button2-func (lookup-key global-map [button2])) (global-set-key [button2] 'start-region-drag)