Mercurial > hg > xemacs-beta
diff lisp/mouse.el @ 5567:3bc58dc9d688
Replace #'flet by #'labels where appropriate, core code.
lisp/ChangeLog addition:
2011-09-07 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (transpose-subr):
* specifier.el (let-specifier):
* specifier.el (derive-device-type-from-tag-set):
* test-harness.el (batch-test-emacs):
* x-compose.el (alias-colon-to-doublequote):
* mule/chinese.el (make-chinese-cns11643-charset):
* mule/mule-cmds.el (set-locale-for-language-environment):
* mule/mule-cmds.el (set-language-environment-coding-systems):
* mule/mule-x-init.el (x-use-halfwidth-roman-font):
* about.el (about-xemacs):
* about.el (about-hackers):
* diagnose.el (show-memory-usage):
* diagnose.el (show-object-memory-usage-stats):
* diagnose.el (show-mc-alloc-memory-usage):
* diagnose.el (show-gc-stats):
* dialog.el (make-dialog-box):
* faces.el:
* faces.el (Face-frob-property):
* faces.el (set-face-stipple):
* glyphs.el:
* glyphs.el (init-glyphs): Removed.
* help-macro.el (make-help-screen):
* info.el (Info-construct-menu):
* keymap.el (key-sequence-list-description):
* lisp-mode.el (construct-lisp-mode-menu):
* loadhist.el (unload-feature):
* minibuf.el (get-user-response):
* mouse.el (default-mouse-track-check-for-activation):
* mouse.el (mouse-track-insert-1):
Follow my own advice from the last commit and use #'labels instead
of #'flet in core code.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 07 Sep 2011 21:21:36 +0100 |
| parents | ac37a5f7e5be |
| children | 071b810ceb18 |
line wrap: on
line diff
--- a/lisp/mouse.el Wed Sep 07 16:26:45 2011 +0100 +++ b/lisp/mouse.el Wed Sep 07 21:21:36 2011 +0100 @@ -1246,11 +1246,11 @@ ;; `conservative-activate-function'. (defun default-mouse-track-check-for-activation (event click-count count-list button-list) - (flet ((do-activate (event property) - (let ((ex (extent-at-event event property))) - (when ex - (funcall (extent-property ex property) event ex) - t)))) + (labels ((do-activate (event property) + (let ((ex (extent-at-event event property))) + (when ex + (funcall (extent-property ex property) event ex) + t)))) (or (and (some #'(lambda (count button) (and (= click-count count) @@ -1477,23 +1477,23 @@ (let ((default-mouse-track-type-list (if line-p '(line) default-mouse-track-type-list)) s selreg) - (flet ((Mouse-track-insert-drag-up-hook (event count) - (setq selreg - (default-mouse-track-return-dragged-selection event)) - t) - (Mouse-track-insert-click-hook (event count) - (default-mouse-track-drag-hook event count nil) - (setq selreg - (default-mouse-track-return-dragged-selection event)) - t)) + (labels ((Mouse-track-insert-drag-up-hook (event count) + (setq selreg + (default-mouse-track-return-dragged-selection event)) + t) + (Mouse-track-insert-click-hook (event count) + (default-mouse-track-drag-hook event count nil) + (setq selreg + (default-mouse-track-return-dragged-selection event)) + t)) (save-excursion (save-window-excursion (mouse-track event - '(mouse-track-drag-up-hook - Mouse-track-insert-drag-up-hook - mouse-track-click-hook - Mouse-track-insert-click-hook)) + (list 'mouse-track-drag-up-hook + #'Mouse-track-insert-drag-up-hook + 'mouse-track-click-hook + #'Mouse-track-insert-click-hook)) (if (consp selreg) (let ((pair selreg)) (setq s (prog1