Mercurial > hg > xemacs-beta
comparison lisp/mule/mule-x-init.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 | 308d34e9f07d |
children | 071b810ceb18 |
comparison
equal
deleted
inserted
replaced
5566:4654c01af32b | 5567:3bc58dc9d688 |
---|---|
37 | 37 |
38 Traditionally, Asian characters have been displayed so that they | 38 Traditionally, Asian characters have been displayed so that they |
39 occupy exactly twice the screen space of ASCII (`halfwidth') | 39 occupy exactly twice the screen space of ASCII (`halfwidth') |
40 characters. On many systems, e.g. Sun CDE systems, this can only be | 40 characters. On many systems, e.g. Sun CDE systems, this can only be |
41 achieved by using a national variant roman font to display ASCII." | 41 achieved by using a national variant roman font to display ASCII." |
42 (flet ((charset-font-width (charset) | 42 (labels ((charset-font-width (charset) |
43 (font-instance-width | 43 (font-instance-width |
44 (face-font-instance 'default (selected-device) charset))) | 44 (face-font-instance 'default (selected-device) charset))) |
45 | 45 |
46 (twice-as-wide (cs1 cs2) | 46 (twice-as-wide (cs1 cs2) |
47 (let ((width1 (charset-font-width cs1)) | 47 (let ((width1 (charset-font-width cs1)) |
48 (width2 (charset-font-width cs2))) | 48 (width2 (charset-font-width cs2))) |
49 (and width1 width2 (eq (+ width1 width1) width2))))) | 49 (and width1 width2 (eq (+ width1 width1) width2))))) |
50 | 50 |
51 (when (eq 'x (device-type)) | 51 (when (eq 'x (device-type)) |
52 (let ((original-registries (charset-registries 'ascii))) | 52 (let ((original-registries (charset-registries 'ascii))) |
53 (condition-case nil | 53 (condition-case nil |
54 (unless (twice-as-wide 'ascii fullwidth-charset) | 54 (unless (twice-as-wide 'ascii fullwidth-charset) |