comparison lisp/simple.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
2636 (transpose-subr 'Simple-transpose-lines-mover arg) 2636 (transpose-subr 'Simple-transpose-lines-mover arg)
2637 (forward-line -1))) 2637 (forward-line -1)))
2638 2638
2639 (defun transpose-subr (mover arg &optional move-region) 2639 (defun transpose-subr (mover arg &optional move-region)
2640 (let (start1 end1 start2 end2) 2640 (let (start1 end1 start2 end2)
2641 ;; XEmacs -- use flet instead of defining a separate function and 2641 ;; XEmacs -- use labels instead of defining a separate function and
2642 ;; relying on dynamic scope; use (mark t) etc; add code to support 2642 ;; relying on dynamic scope; use (mark t) etc; add code to support
2643 ;; the new MOVE-REGION arg. 2643 ;; the new MOVE-REGION arg.
2644 (flet ((transpose-subr-1 () 2644 (labels ((transpose-subr-1 ()
2645 (if (> (min end1 end2) (max start1 start2)) 2645 (if (> (min end1 end2) (max start1 start2))
2646 (error "Don't have two things to transpose")) 2646 (error "Don't have two things to transpose"))
2647 (let ((word1 (buffer-substring start1 end1)) 2647 (let ((word1 (buffer-substring start1 end1))
2648 (word2 (buffer-substring start2 end2))) 2648 (word2 (buffer-substring start2 end2)))
2649 (delete-region start2 end2) 2649 (delete-region start2 end2)
2650 (goto-char start2) 2650 (goto-char start2)
2651 (insert word1) 2651 (insert word1)
2652 (goto-char (if (< start1 start2) start1 2652 (goto-char (if (< start1 start2) start1
2653 (+ start1 (- (length word1) (length word2))))) 2653 (+ start1 (- (length word1) (length word2)))))
2654 (delete-char (length word1)) 2654 (delete-char (length word1))
2655 (insert word2)))) 2655 (insert word2))))
2656 (if (= arg 0) 2656 (if (= arg 0)
2657 (progn 2657 (progn
2658 (save-excursion 2658 (save-excursion
2659 (funcall mover 1) 2659 (funcall mover 1)
2660 (setq end2 (point)) 2660 (setq end2 (point))