Mercurial > emacs
changeset 92175:049a396d6d9d
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 25 Feb 2008 00:21:57 +0000 |
| parents | 16d35e75634b (current diff) 5193aeec5a42 (diff) |
| children | e2a1aae77a33 |
| files | lisp/ChangeLog lisp/ChangeLog.12 lisp/files.el src/ChangeLog src/w32fns.c |
| diffstat | 5 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 25 00:01:54 2008 +0000 +++ b/lisp/ChangeLog Mon Feb 25 00:21:57 2008 +0000 @@ -1,3 +1,7 @@ +2008-02-25 Jason Rumney <jasonr@gnu.org> + + * files.el (file-name-invalid-regexp): Fix octal/decimal confusion. + 2008-02-25 Juri Linkov <juri@jurta.org> * isearch.el (isearch-fail): Use "RosyBrown1" for a light
--- a/lisp/ChangeLog.12 Mon Feb 25 00:01:54 2008 +0000 +++ b/lisp/ChangeLog.12 Mon Feb 25 00:21:57 2008 +0000 @@ -2595,7 +2595,7 @@ * bookmark.el (bookmark-buffer-file-name): Abbreviate the bookmark path. Rewrite function in `cond' style for readability. - Suggested by: Stephen Eglen <S.J.Eglen{_AT_}damtp.cam.ac.uk>. + Suggested by Stephen Eglen <S.J.Eglen{_AT_}damtp.cam.ac.uk>. (The path shortening, that is, not the rearrangement.) 2007-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
--- a/lisp/files.el Mon Feb 25 00:01:54 2008 +0000 +++ b/lisp/files.el Mon Feb 25 00:21:57 2008 +0000 @@ -226,12 +226,12 @@ (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names))) (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive "[+, ;=|<>\"?*]\\|\\[\\|\\]\\|" ; invalid characters - "[\000-\031]\\|" ; control characters + "[\000-\037]\\|" ; control characters "\\(/\\.\\.?[^/]\\)\\|" ; leading dots "\\(/[^/.]+\\.[^/.]*\\.\\)")) ; more than a single dot ((memq system-type '(ms-dos windows-nt cygwin)) (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive - "[|<>\"?*\000-\031]")) ; invalid characters + "[|<>\"?*\000-\037]")) ; invalid characters (t "[\000]")) "Regexp recognizing file names which aren't allowed by the filesystem.")
--- a/src/ChangeLog Mon Feb 25 00:01:54 2008 +0000 +++ b/src/ChangeLog Mon Feb 25 00:21:57 2008 +0000 @@ -1,3 +1,7 @@ +2008-02-25 Jason Rumney <jasonr@gnu.org> + + * w32fns.c (enum_font_cb2): Don't use raster fonts for Unicode. + 2008-02-24 Dan Nicolaescu <dann@ics.uci.edu> * s/vms4-0.h:
--- a/src/w32fns.c Mon Feb 25 00:01:54 2008 +0000 +++ b/src/w32fns.c Mon Feb 25 00:21:57 2008 +0000 @@ -6063,6 +6063,12 @@ && lpef->logfont.lfCharSet == DEFAULT_CHARSET && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET, NULL)) != 0) return 1; + + /* Reject raster fonts if we are looking for a unicode font. */ + if (charset + && FontType == RASTER_FONTTYPE + && strncmp (charset, "iso10646", 8) == 0) + return 1; } if (charset) @@ -6079,6 +6085,12 @@ Lisp_Object this_charset = Fcar (charset_list); charset = SDATA (this_charset); + /* Don't list raster fonts as unicode. */ + if (charset + && FontType == RASTER_FONTTYPE + && strncmp (charset, "iso10646", 8) == 0) + continue; + enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), charset, width);