Mercurial > hg > xemacs-beta

comparison lisp/x-faces.el @ 5267:668c73e222fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change forms like (delq nil (mapcar ...)) to (mapcan ...). lisp/ChangeLog addition: 2010-09-16 Aidan Kehoe <kehoea@parhasard.net> * x-faces.el (x-available-font-sizes): * specifier.el (let-specifier): * package-ui.el (pui-add-required-packages): * msw-faces.el (mswindows-available-font-sizes): * modeline.el (modeline-minor-mode-menu): * minibuf.el (minibuf-directory-files): Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 16 Sep 2010 15:06:38 +0100
parents 8b2f75cecb89
children 308d34e9f07d
comparison
equal deleted inserted replaced
5266:f9ec07abdbf9 5267:668c73e222fd
432 ;; This is pretty dubious... 432 ;; This is pretty dubious...
433 (setq font 433 (setq font
434 (concat (substring font 0 (match-beginning 1)) "*" 434 (concat (substring font 0 (match-beginning 1)) "*"
435 (substring font (match-end 1) (match-end 0)))))) 435 (substring font (match-end 1) (match-end 0))))))
436 (sort 436 (sort
437 (delq nil 437 (mapcan (function
438 (mapcar (function 438 (lambda (name)
439 (lambda (name) 439 (and (string-match x-font-regexp name)
440 (and (string-match x-font-regexp name) 440 (list
441 (list 441 (list
442 (string-to-int (substring name (match-beginning 5) 442 (string-to-int (substring name (match-beginning 5)
443 (match-end 5))) 443 (match-end 5)))
444 (string-to-int (substring name (match-beginning 6) 444 (string-to-int (substring name (match-beginning 6)
445 (match-end 6))) 445 (match-end 6)))
446 name)))) 446 name)))))
447 (font-list font device))) 447 (font-list font device))
448 (function (lambda (x y) (if (= (nth 1 x) (nth 1 y)) 448 (function (lambda (x y) (if (= (nth 1 x) (nth 1 y))
449 (< (nth 0 x) (nth 0 y)) 449 (< (nth 0 x) (nth 0 y))
450 (< (nth 1 x) (nth 1 y))))))) 450 (< (nth 1 x) (nth 1 y)))))))
451 451
452 ;; Given a font name, this attempts to construct a valid font name for 452 ;; Given a font name, this attempts to construct a valid font name for