Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
5566:4654c01af32b | 5567:3bc58dc9d688 |
---|---|
1244 ;; property, calls it and returns t. Else, it repeats the whole | 1244 ;; property, calls it and returns t. Else, it repeats the whole |
1245 ;; process with `mouse-track-conservative-activate-strokes' and | 1245 ;; process with `mouse-track-conservative-activate-strokes' and |
1246 ;; `conservative-activate-function'. | 1246 ;; `conservative-activate-function'. |
1247 (defun default-mouse-track-check-for-activation (event click-count | 1247 (defun default-mouse-track-check-for-activation (event click-count |
1248 count-list button-list) | 1248 count-list button-list) |
1249 (flet ((do-activate (event property) | 1249 (labels ((do-activate (event property) |
1250 (let ((ex (extent-at-event event property))) | 1250 (let ((ex (extent-at-event event property))) |
1251 (when ex | 1251 (when ex |
1252 (funcall (extent-property ex property) event ex) | 1252 (funcall (extent-property ex property) event ex) |
1253 t)))) | 1253 t)))) |
1254 (or | 1254 (or |
1255 (and (some #'(lambda (count button) | 1255 (and (some #'(lambda (count button) |
1256 (and (= click-count count) | 1256 (and (= click-count count) |
1257 (memq button | 1257 (memq button |
1258 mouse-track-activate-strokes))) | 1258 mouse-track-activate-strokes))) |
1475 If LINE-P, select by lines and insert before current line." | 1475 If LINE-P, select by lines and insert before current line." |
1476 (interactive "*e") | 1476 (interactive "*e") |
1477 (let ((default-mouse-track-type-list | 1477 (let ((default-mouse-track-type-list |
1478 (if line-p '(line) default-mouse-track-type-list)) | 1478 (if line-p '(line) default-mouse-track-type-list)) |
1479 s selreg) | 1479 s selreg) |
1480 (flet ((Mouse-track-insert-drag-up-hook (event count) | 1480 (labels ((Mouse-track-insert-drag-up-hook (event count) |
1481 (setq selreg | 1481 (setq selreg |
1482 (default-mouse-track-return-dragged-selection event)) | 1482 (default-mouse-track-return-dragged-selection event)) |
1483 t) | 1483 t) |
1484 (Mouse-track-insert-click-hook (event count) | 1484 (Mouse-track-insert-click-hook (event count) |
1485 (default-mouse-track-drag-hook event count nil) | 1485 (default-mouse-track-drag-hook event count nil) |
1486 (setq selreg | 1486 (setq selreg |
1487 (default-mouse-track-return-dragged-selection event)) | 1487 (default-mouse-track-return-dragged-selection event)) |
1488 t)) | 1488 t)) |
1489 (save-excursion | 1489 (save-excursion |
1490 (save-window-excursion | 1490 (save-window-excursion |
1491 (mouse-track | 1491 (mouse-track |
1492 event | 1492 event |
1493 '(mouse-track-drag-up-hook | 1493 (list 'mouse-track-drag-up-hook |
1494 Mouse-track-insert-drag-up-hook | 1494 #'Mouse-track-insert-drag-up-hook |
1495 mouse-track-click-hook | 1495 'mouse-track-click-hook |
1496 Mouse-track-insert-click-hook)) | 1496 #'Mouse-track-insert-click-hook)) |
1497 (if (consp selreg) | 1497 (if (consp selreg) |
1498 (let ((pair selreg)) | 1498 (let ((pair selreg)) |
1499 (setq s (prog1 | 1499 (setq s (prog1 |
1500 (buffer-substring (car pair) (cdr pair)) | 1500 (buffer-substring (car pair) (cdr pair)) |
1501 (if delete | 1501 (if delete |