Mercurial > emacs
comparison lisp/facemenu.el @ 109409:ff42e5c5f789
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 16 Jun 2010 22:49:55 +0000 |
parents | d94083f6e4e9 |
children | 3db1493a6f89 |
comparison
equal
deleted
inserted
replaced
109408:4eded71f4215 | 109409:ff42e5c5f789 |
---|---|
598 (setcdr lc nil))))) | 598 (setcdr lc nil))))) |
599 (let ((buf (get-buffer-create "*Colors*"))) | 599 (let ((buf (get-buffer-create "*Colors*"))) |
600 (with-current-buffer buf | 600 (with-current-buffer buf |
601 (erase-buffer) | 601 (erase-buffer) |
602 (setq truncate-lines t) | 602 (setq truncate-lines t) |
603 ;; Display buffer before generating content to allow | |
604 ;; `list-colors-print' to get the right window-width. | |
605 (pop-to-buffer buf) | |
603 (list-colors-print list callback) | 606 (list-colors-print list callback) |
604 (set-buffer-modified-p nil)) | 607 (set-buffer-modified-p nil))) |
605 (pop-to-buffer buf)) | |
606 (if callback | 608 (if callback |
607 (message "Click on a color to select it."))) | 609 (message "Click on a color to select it."))) |
608 | 610 |
609 (defun list-colors-print (list &optional callback) | 611 (defun list-colors-print (list &optional callback) |
610 (let ((callback-fn | 612 (let ((callback-fn |