Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ffe832ea
Commit
ffe832ea
authored
Feb 25, 2008
by
Miles Bader
Browse files
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
parents
d8891294
ff20fdbb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
3 deletions
+23
-3
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/ChangeLog.12
lisp/ChangeLog.12
+1
-1
lisp/files.el
lisp/files.el
+2
-2
src/ChangeLog
src/ChangeLog
+4
-0
src/w32fns.c
src/w32fns.c
+12
-0
No files found.
lisp/ChangeLog
View file @
ffe832ea
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
...
...
lisp/ChangeLog.12
View file @
ffe832ea
...
...
@@ -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>
lisp/files.el
View file @
ffe832ea
...
...
@@ -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-\03
1
]\\|"
; control characters
"[\000-\03
7
]\\|"
; 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-\03
1
]"
))
; invalid characters
"[|<>\"?*\000-\03
7
]"
))
; invalid characters
(
t
"[\000]"
))
"Regexp recognizing file names which aren't allowed by the filesystem."
)
...
...
src/ChangeLog
View file @
ffe832ea
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:
...
...
src/w32fns.c
View file @
ffe832ea
...
...
@@ -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);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment