Commit ffe832ea authored by Miles Bader's avatar Miles Bader

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
parents d8891294 ff20fdbb
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
......
......@@ -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>
......@@ -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.")
......
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:
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment