Mercurial > emacs
changeset 107006:8cf74d7922ce
Merge from trunk
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 08 Jan 2010 22:31:37 +0800 |
| parents | fb234c5a45ed (current diff) 89ca5bbe8e71 (diff) |
| children | e8989fe0a353 |
| files | |
| diffstat | 5 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jan 07 21:54:07 2010 +0800 +++ b/lisp/ChangeLog Fri Jan 08 22:31:37 2010 +0800 @@ -1,3 +1,15 @@ +2010-01-08 Kenichi Handa <handa@m17n.org> + + * international/fontset.el (build-default-fontset-data): Exclude + characters in scripts kana, hangul, han, or cjk-misc. + +2010-01-07 Juanma Barranquero <lekktu@gmail.com> + + * vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename + to `create-file-buffer' as it expects, not just a buffer name. + (vc-dir-mode): Include the buffer name in `list-buffers-directory', + to help uniquify. (Bug#3224) + 2010-01-06 Jan Djärv <jan.h.d@swipnet.se> * font-setting.el (font-setting-change-default-font): Use user-spec
--- a/lisp/international/fontset.el Thu Jan 07 21:54:07 2010 +0800 +++ b/lisp/international/fontset.el Fri Jan 08 22:31:37 2010 +0800 @@ -361,8 +361,10 @@ (let ((from (car range)) (to (cdr range))) (if (< to #x110000) (while (<= from to) - (aset cjk-table from - (logior (or (aref cjk-table from) 0) mask)) + (or (memq (aref char-script-table from) + '(kana hangul han cjk-misc)) + (aset cjk-table from + (logior (or (aref cjk-table from) 0) mask))) (setq from (1+ from)))))) (nth 1 elt) nil (nth 2 elt) (nth 3 elt))) (setq i (1+ i)))
--- a/lisp/vc-dir.el Thu Jan 07 21:54:07 2010 +0800 +++ b/lisp/vc-dir.el Fri Jan 08 22:31:37 2010 +0800 @@ -101,7 +101,9 @@ (return buffer)))))))) (or buf ;; Create a new buffer named BNAME. - (with-current-buffer (create-file-buffer bname) + ;; We pass a filename to create-file-buffer because it is what + ;; the function expects, and also what uniquify needs (if active) + (with-current-buffer (create-file-buffer (expand-file-name bname dir)) (cd dir) (vc-setup-buffer (current-buffer)) ;; Reset the vc-parent-buffer-name so that it does not appear @@ -928,7 +930,7 @@ (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-printer)) (set (make-local-variable 'revert-buffer-function) 'vc-dir-revert-buffer-function) - (setq list-buffers-directory default-directory) + (setq list-buffers-directory (expand-file-name "*vc-dir*" default-directory)) (add-to-list 'vc-dir-buffers (current-buffer)) ;; Make sure that if the directory buffer is killed, the update ;; process running in the background is also killed.
--- a/src/ChangeLog Thu Jan 07 21:54:07 2010 +0800 +++ b/src/ChangeLog Fri Jan 08 22:31:37 2010 +0800 @@ -1,3 +1,8 @@ +2010-01-08 Jan Djärv <jan.h.d@swipnet.se> + + * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must + also be true before we can return early (bug #5339). + 2010-01-06 David Reitter <david.reitter@gmail.com> * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS.
--- a/src/dispnew.c Thu Jan 07 21:54:07 2010 +0800 +++ b/src/dispnew.c Fri Jan 08 22:31:37 2010 +0800 @@ -6340,8 +6340,11 @@ check_frame_size (f, &newheight, &newwidth); /* If we're not changing the frame size, quit now. */ + /* Frame width may be unchanged but the text portion may change, for example, + fullscreen and remove/add scroll bar. */ if (newheight == FRAME_LINES (f) - && new_frame_total_cols == FRAME_TOTAL_COLS (f)) + && newwidth == FRAME_COLS (f) // text portion unchanged + && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged return; BLOCK_INPUT;