diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-25 00:21:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-25 00:21:57 +0000 |
| commit | 23571b622c6110e07cf2da7227408989de793280 (patch) | |
| tree | 0f59d1edc49b3522b66e96b0618b74028f1e33f9 | |
| parent | a87e4823ca96c739d2ef5bc91e74ee845f0c890f (diff) | |
| parent | 85659b91a0b2d340d5c40601c01ab40a03f764b0 (diff) | |
| download | emacs-23571b622c6110e07cf2da7227408989de793280.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog.12 | 2 | ||||
| -rw-r--r-- | lisp/files.el | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32fns.c | 12 |
5 files changed, 23 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 096ea777322..c31a8b4d1ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index c0e2210fc5c..637e0b682b4 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -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> diff --git a/lisp/files.el b/lisp/files.el index 3950d5e7195..908bc95356b 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -226,12 +226,12 @@ have fast storage with limited space, such as a RAM disk." (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.") diff --git a/src/ChangeLog b/src/ChangeLog index 928a2d9fd42..71026e1d77e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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: diff --git a/src/w32fns.c b/src/w32fns.c index 838367fe399..ae6cc88ea6b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6063,6 +6063,12 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) && 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 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) 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); |