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
597e2240
Commit
597e2240
authored
Sep 03, 2009
by
Glenn Morris
Browse files
Use default-value rather than default-enable-multibyte-characters.
parent
99b195c8
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
69 additions
and
45 deletions
+69
-45
lisp/ChangeLog
lisp/ChangeLog
+19
-0
lisp/arc-mode.el
lisp/arc-mode.el
+3
-3
lisp/dos-fns.el
lisp/dos-fns.el
+3
-3
lisp/international/mule-cmds.el
lisp/international/mule-cmds.el
+10
-9
lisp/international/mule-diag.el
lisp/international/mule-diag.el
+2
-1
lisp/mail/emacsbug.el
lisp/mail/emacsbug.el
+4
-4
lisp/mail/rmail.el
lisp/mail/rmail.el
+1
-1
lisp/mail/sendmail.el
lisp/mail/sendmail.el
+1
-1
lisp/man.el
lisp/man.el
+3
-3
lisp/menu-bar.el
lisp/menu-bar.el
+5
-5
lisp/server.el
lisp/server.el
+1
-1
lisp/startup.el
lisp/startup.el
+5
-4
lisp/tar-mode.el
lisp/tar-mode.el
+4
-3
lisp/w32-fns.el
lisp/w32-fns.el
+5
-5
lisp/x-dnd.el
lisp/x-dnd.el
+3
-2
No files found.
lisp/ChangeLog
View file @
597e2240
2009-09-03 Glenn Morris <rgm@gnu.org>
2009-09-03 Glenn Morris <rgm@gnu.org>
* arc-mode.el (archive-mode):
* dos-fns.el (set-default-process-coding-system):
* man.el (Man-getpage-in-background):
* menu-bar.el (menu-bar-describe-menu):
* server.el (server-process-filter):
* startup.el (command-line):
* tar-mode.el (tar-header-block-tokenize, tar-extract):
* w32-fns.el (set-default-process-coding-system):
* x-dnd.el (x-dnd-handle-file-name):
* international/mule-cmds.el (mule-menu-keymap)
(set-default-coding-systems, language-info-alist, set-language-info)
(set-language-environment, standard-display-european-internal)
(set-locale-environment):
* international/mule-diag.el (mule-diag):
* mail/emacsbug.el (report-emacs-bug):
* mail/rmail.el (rmail-mode):
* mail/sendmail.el (mail-setup):
Use default-value rather than default-enable-multibyte-characters.
* progmodes/f90.el: Move all safe properties into the defcustoms.
* progmodes/f90.el: Move all safe properties into the defcustoms.
(f90-get-correct-indent, f90-indent-region, f90-abbrev-start): Use memq.
(f90-get-correct-indent, f90-indent-region, f90-abbrev-start): Use memq.
...
...
lisp/arc-mode.el
View file @
597e2240
;;; arc-mode.el --- simple editing of archives
;;; arc-mode.el --- simple editing of archives
;; Copyright (C) 1995, 1997, 1998, 2001, 2002, 2003, 2004,
;; Copyright (C) 1995, 1997, 1998, 2001, 2002, 2003, 2004,
2005, 2006,
;;
2005, 2006,
2007, 2008, 2009 Free Software Foundation, Inc.
;; 2007, 2008, 2009
Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@gnu.org>
;; Author: Morten Welinder <terra@gnu.org>
;; Keywords: archives msdog editing major-mode
;; Keywords: archives msdog editing major-mode
...
@@ -698,7 +698,7 @@ archive.
...
@@ -698,7 +698,7 @@ archive.
(
or
file-name-coding-system
(
or
file-name-coding-system
default-file-name-coding-system
default-file-name-coding-system
locale-coding-system
))
locale-coding-system
))
(
if
default-enable-multibyte-characters
(
if
(
default-
value
'
enable-multibyte-characters
)
(
set-buffer-multibyte
'to
))
(
set-buffer-multibyte
'to
))
(
archive-summarize
nil
)
(
archive-summarize
nil
)
(
setq
buffer-read-only
t
))))
(
setq
buffer-read-only
t
))))
...
...
lisp/dos-fns.el
View file @
597e2240
;;; dos-fns.el --- MS-Dos specific functions
;;; dos-fns.el --- MS-Dos specific functions
;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
2005,
;;
2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
;; Maintainer: Morten Welinder <terra@diku.dk>
;; Maintainer: Morten Welinder <terra@diku.dk>
;; Keywords: internal
;; Keywords: internal
...
@@ -211,7 +211,7 @@ returned unaltered."
...
@@ -211,7 +211,7 @@ returned unaltered."
;; Override settings chosen at startup.
;; Override settings chosen at startup.
(
defun
set-default-process-coding-system
()
(
defun
set-default-process-coding-system
()
(
setq
default-process-coding-system
(
setq
default-process-coding-system
(
if
default-enable-multibyte-characters
(
if
(
default-
value
'
enable-multibyte-characters
)
'
(
undecided-dos
.
undecided-dos
)
'
(
undecided-dos
.
undecided-dos
)
'
(
raw-text-dos
.
raw-text-dos
))))
'
(
raw-text-dos
.
raw-text-dos
))))
...
...
lisp/international/mule-cmds.el
View file @
597e2240
...
@@ -127,8 +127,8 @@
...
@@ -127,8 +127,8 @@
(
define-key-after
map
[separator-input-method]
'
(
"--"
))
(
define-key-after
map
[separator-input-method]
'
(
"--"
))
(
define-key-after
map
[set-various-coding-system]
(
define-key-after
map
[set-various-coding-system]
(
list
'
menu-item
"Set Coding Systems"
set-coding-system-map
`
(
menu-item
"Set Coding Systems"
,
set-coding-system-map
:enable
'
default-enable-multibyte-characters
))
:enable
(
default-
value
'
enable-multibyte-characters
))
)
(
define-key-after
map
[view-hello-file]
(
define-key-after
map
[view-hello-file]
'
(
menu-item
"Show Multi-lingual Text"
view-hello-file
'
(
menu-item
"Show Multi-lingual Text"
view-hello-file
:enable
(
file-readable-p
:enable
(
file-readable-p
...
@@ -358,7 +358,7 @@ This also sets the following values:
...
@@ -358,7 +358,7 @@ This also sets the following values:
(
if
(
eq
system-type
'darwin
)
(
if
(
eq
system-type
'darwin
)
;; The file-name coding system on Darwin systems is always utf-8.
;; The file-name coding system on Darwin systems is always utf-8.
(
setq
default-file-name-coding-system
'utf-8
)
(
setq
default-file-name-coding-system
'utf-8
)
(
if
(
and
default-enable-multibyte-characters
(
if
(
and
(
default-
value
'
enable-multibyte-characters
)
(
or
(
not
coding-system
)
(
or
(
not
coding-system
)
(
coding-system-get
coding-system
'ascii-compatible-p
)))
(
coding-system-get
coding-system
'ascii-compatible-p
)))
(
setq
default-file-name-coding-system
coding-system
)))
(
setq
default-file-name-coding-system
coding-system
)))
...
@@ -1097,7 +1097,7 @@ Meaningful values for KEY include
...
@@ -1097,7 +1097,7 @@ Meaningful values for KEY include
`
ctext-non-standard-encodings
'
for
more
detail.
`
ctext-non-standard-encodings
'
for
more
detail.
The
following
keys
take
effect
only
when
multibyte
characters
are
The
following
keys
take
effect
only
when
multibyte
characters
are
globally
disabled,
i.e.
the
value
of
`
default-
enable-multibyte-characters
'
globally
disabled,
i.e.
the
default
value
of
`
enable-multibyte-characters
'
is
nil.
is
nil.
unibyte-display
value
is
a
coding
system
to
encode
characters
for
unibyte-display
value
is
a
coding
system
to
encode
characters
for
...
@@ -1138,7 +1138,7 @@ see `language-info-alist'."
...
@@ -1138,7 +1138,7 @@ see `language-info-alist'."
(set-language-environment-nonascii-translation lang-env))
(set-language-environment-nonascii-translation lang-env))
((eq key 'charset)
((eq key 'charset)
(set-language-environment-charset lang-env))
(set-language-environment-charset lang-env))
((and (not default-enable-multibyte-characters)
((and (not
(
default-
value '
enable-multibyte-characters)
)
(or (eq key 'unibyte-syntax) (eq key 'unibyte-display)))
(or (eq key 'unibyte-syntax) (eq key 'unibyte-display)))
(set-language-environment-unibyte lang-env)))))
(set-language-environment-unibyte lang-env)))))
...
@@ -1849,7 +1849,7 @@ specifies the character set for the major languages of Western Europe."
...
@@ -1849,7 +1849,7 @@ specifies the character set for the major languages of Western Europe."
(set-language-environment-nonascii-translation language-name)
(set-language-environment-nonascii-translation language-name)
(set-language-environment-charset language-name)
(set-language-environment-charset language-name)
;; Unibyte setups if necessary.
;; Unibyte setups if necessary.
(unless default-enable-multibyte-characters
(unless
(
default-
value '
enable-multibyte-characters
)
(set-language-environment-unibyte language-name))
(set-language-environment-unibyte language-name))
(let ((func (get-language-info language-name 'setup-function)))
(let ((func (get-language-info language-name 'setup-function)))
...
@@ -1934,7 +1934,8 @@ See `set-language-info-alist' for use in programs."
...
@@ -1934,7 +1934,8 @@ See `set-language-info-alist' for use in programs."
;; Unibyte Emacs on MS-DOS wants to display all 8-bit characters with
;; Unibyte Emacs on MS-DOS wants to display all 8-bit characters with
;; the native font, and codes 160 and 146 stand for something very
;; the native font, and codes 160 and 146 stand for something very
;; different there.
;; different there.
(or (and (eq window-system 'pc) (not default-enable-multibyte-characters))
(or (and (eq window-system 'pc) (not (default-value
'enable-multibyte-characters)))
(progn
(progn
;; Most X fonts used to do the wrong thing for latin-1 code 160.
;; Most X fonts used to do the wrong thing for latin-1 code 160.
(unless (and (eq window-system 'x)
(unless (and (eq window-system 'x)
...
@@ -2602,10 +2603,10 @@ See also `locale-charset-language-names', `locale-language-names',
...
@@ -2602,10 +2603,10 @@ See also `locale-charset-language-names', `locale-language-names',
(
unless
frame
(
unless
frame
(
set-language-environment
language-name
))
(
set-language-environment
language-name
))
;; If default
-
enable-multibyte-characters is nil,
;; If
the
default
enable-multibyte-characters is nil,
;; we are using single-byte characters,
;; we are using single-byte characters,
;; so the display table and terminal coding system are irrelevant.
;; so the display table and terminal coding system are irrelevant.
(
when
default-enable-multibyte-characters
(
when
(
default-
value
'
enable-multibyte-characters
)
(
set-display-table-and-terminal-coding-system
(
set-display-table-and-terminal-coding-system
language-name
coding-system
frame
))
language-name
coding-system
frame
))
...
...
lisp/international/mule-diag.el
View file @
597e2240
...
@@ -1088,7 +1088,8 @@ system which uses fontsets)."
...
@@ -1088,7 +1088,8 @@ system which uses fontsets)."
(insert "
Version
of
this
emacs:\n
" (emacs-version) "
\n\n
")
(insert "
Version
of
this
emacs:\n
" (emacs-version) "
\n\n
")
(insert "
Configuration
options:\n
" system-configuration-options "
\n\n
")
(insert "
Configuration
options:\n
" system-configuration-options "
\n\n
")
(insert "
Multibyte
characters
awareness:\n
"
(insert "
Multibyte
characters
awareness:\n
"
(format "
default:
%S\n
" default-enable-multibyte-characters)
(format "
default:
%S\n
" (default-value
'enable-multibyte-characters))
(format "
current-buffer:
%S\n\n
" enable-multibyte-characters))
(format "
current-buffer:
%S\n\n
" enable-multibyte-characters))
(insert "
Current
language
environment:
" current-language-environment
(insert "
Current
language
environment:
" current-language-environment
"
\n\n
")
"
\n\n
")
...
...
lisp/mail/emacsbug.el
View file @
597e2240
;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003,
;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003,
2004,
;;
2004,
2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; 2005, 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Author: K. Shane Hartman
;; Maintainer: FSF
;; Maintainer: FSF
...
@@ -166,8 +166,8 @@ usually do not have translators to read other languages for them.\n\n")
...
@@ -166,8 +166,8 @@ usually do not have translators to read other languages for them.\n\n")
'
(
"LC_ALL"
"LC_COLLATE"
"LC_CTYPE"
"LC_MESSAGES"
'
(
"LC_ALL"
"LC_COLLATE"
"LC_CTYPE"
"LC_MESSAGES"
"LC_MONETARY"
"LC_NUMERIC"
"LC_TIME"
"LANG"
"XMODIFIERS"
))
"LC_MONETARY"
"LC_NUMERIC"
"LC_TIME"
"LANG"
"XMODIFIERS"
))
(
insert
(
format
" locale-coding-system: %s\n"
locale-coding-system
))
(
insert
(
format
" locale-coding-system: %s\n"
locale-coding-system
))
(
insert
(
format
" default
-
enable-multibyte-characters: %s\n"
(
insert
(
format
" default
enable-multibyte-characters: %s\n"
default-enable-multibyte-characters
))
(
default-
value
'
enable-multibyte-characters
))
)
(
insert
"\n"
)
(
insert
"\n"
)
(
insert
(
format
"Major mode: %s\n"
(
insert
(
format
"Major mode: %s\n"
(
format-mode-line
(
format-mode-line
...
...
lisp/mail/rmail.el
View file @
597e2240
...
@@ -1234,7 +1234,7 @@ Instead, these commands are available:
...
@@ -1234,7 +1234,7 @@ Instead, these commands are available:
(
rmail-mode-2
)
(
rmail-mode-2
)
(
when
(
and
finding-rmail-file
(
when
(
and
finding-rmail-file
(
null
coding-system-for-read
)
(
null
coding-system-for-read
)
default-enable-multibyte-characters
)
(
default-
value
'
enable-multibyte-characters
)
)
(
let
((
rmail-enable-multibyte
t
))
(
let
((
rmail-enable-multibyte
t
))
(
rmail-require-mime-maybe
)
(
rmail-require-mime-maybe
)
(
rmail-convert-file-maybe
)
(
rmail-convert-file-maybe
)
...
...
lisp/mail/sendmail.el
View file @
597e2240
...
@@ -552,7 +552,7 @@ actually occur.")
...
@@ -552,7 +552,7 @@ actually occur.")
(
kill-local-variable
'buffer-file-coding-system
)
(
kill-local-variable
'buffer-file-coding-system
)
;; This doesn't work for enable-multibyte-characters.
;; This doesn't work for enable-multibyte-characters.
;; (kill-local-variable 'enable-multibyte-characters)
;; (kill-local-variable 'enable-multibyte-characters)
(
set-buffer-multibyte
default-enable-multibyte-characters
)
(
set-buffer-multibyte
(
default-
value
'
enable-multibyte-characters
)
)
(
if
current-input-method
(
if
current-input-method
(
inactivate-input-method
))
(
inactivate-input-method
))
(
setq
mail-send-actions
actions
)
(
setq
mail-send-actions
actions
)
...
...
lisp/man.el
View file @
597e2240
;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003,
;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003,
2004, 2005,
;;
2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Maintainer: FSF
;; Maintainer: FSF
...
@@ -811,7 +811,7 @@ all sections related to a subject, put something appropriate into the
...
@@ -811,7 +811,7 @@ all sections related to a subject, put something appropriate into the
;; We must decode the output by a coding system that the
;; We must decode the output by a coding system that the
;; system's locale suggests in multibyte mode.
;; system's locale suggests in multibyte mode.
(
coding-system-for-read
(
coding-system-for-read
(
if
default-enable-multibyte-characters
(
if
(
default-
value
'
enable-multibyte-characters
)
locale-coding-system
'raw-text-unix
))
locale-coding-system
'raw-text-unix
))
;; Avoid possible error by using a directory that always exists.
;; Avoid possible error by using a directory that always exists.
(
default-directory
(
default-directory
...
...
lisp/menu-bar.el
View file @
597e2240
...
@@ -982,7 +982,7 @@ mail status in mode line"))
...
@@ -982,7 +982,7 @@ mail status in mode line"))
(list 'menu-item "
Mule
(
Multilingual
Environment
)
" mule-menu-keymap
(list 'menu-item "
Mule
(
Multilingual
Environment
)
" mule-menu-keymap
;; Most of the MULE menu actually does make sense in unibyte mode,
;; Most of the MULE menu actually does make sense in unibyte mode,
;; e.g. language selection.
;; e.g. language selection.
;;;
'
:visible 'default-enable-multibyte-characters
;;; :visible '
(
default-
value '
enable-multibyte-characters
)
))
))
;(setq menu-bar-final-items (cons 'mule menu-bar-final-items))
;(setq menu-bar-final-items (cons 'mule menu-bar-final-items))
;(define-key menu-bar-options-menu [preferences]
;(define-key menu-bar-options-menu [preferences]
...
@@ -1354,18 +1354,18 @@ mail status in mode line"))
...
@@ -1354,18 +1354,18 @@ mail status in mode line"))
(define-key menu-bar-describe-menu [mule-diag]
(define-key menu-bar-describe-menu [mule-diag]
'(menu-item "
Show
All
of
Mule
Status
" mule-diag
'(menu-item "
Show
All
of
Mule
Status
" mule-diag
:visible default-enable-multibyte-characters
:visible
(
default-
value '
enable-multibyte-characters
)
:help "
Display
multilingual
environment
settings
"))
:help "
Display
multilingual
environment
settings
"))
(define-key menu-bar-describe-menu [describe-coding-system-briefly]
(define-key menu-bar-describe-menu [describe-coding-system-briefly]
'(menu-item "
Describe
Coding
System
(
Briefly
)
"
'(menu-item "
Describe
Coding
System
(
Briefly
)
"
describe-current-coding-system-briefly
describe-current-coding-system-briefly
:visible default-enable-multibyte-characters))
:visible
(
default-
value '
enable-multibyte-characters))
)
(define-key menu-bar-describe-menu [describe-coding-system]
(define-key menu-bar-describe-menu [describe-coding-system]
'(menu-item "
Describe
Coding
System...
" describe-coding-system
'(menu-item "
Describe
Coding
System...
" describe-coding-system
:visible default-enable-multibyte-characters))
:visible
(
default-
value '
enable-multibyte-characters))
)
(define-key menu-bar-describe-menu [describe-input-method]
(define-key menu-bar-describe-menu [describe-input-method]
'(menu-item "
Describe
Input
Method...
" describe-input-method
'(menu-item "
Describe
Input
Method...
" describe-input-method
:visible default-enable-multibyte-characters
:visible
(
default-
value '
enable-multibyte-characters
)
:help "
Keyboard
layout
for
specific
input
method
"))
:help "
Keyboard
layout
for
specific
input
method
"))
(define-key menu-bar-describe-menu [describe-language-environment]
(define-key menu-bar-describe-menu [describe-language-environment]
(list 'menu-item "
Describe
Language
Environment
"
(list 'menu-item "
Describe
Language
Environment
"
...
...
lisp/server.el
View file @
597e2240
...
@@ -869,7 +869,7 @@ The following commands are accepted by the client:
...
@@ -869,7 +869,7 @@ The following commands are accepted by the client:
;; supported any more.
;; supported any more.
(
assert
(
eq
(
match-end
0
)
(
length
string
)))
(
assert
(
eq
(
match-end
0
)
(
length
string
)))
(
let
((
request
(
substring
string
0
(
match-beginning
0
)))
(
let
((
request
(
substring
string
0
(
match-beginning
0
)))
(
coding-system
(
and
default-enable-multibyte-characters
(
coding-system
(
and
(
default-
value
'
enable-multibyte-characters
)
(
or
file-name-coding-system
(
or
file-name-coding-system
default-file-name-coding-system
)))
default-file-name-coding-system
)))
nowait
; t if emacsclient does not want to wait for us.
nowait
; t if emacsclient does not want to wait for us.
...
...
lisp/startup.el
View file @
597e2240
...
@@ -1015,7 +1015,7 @@ opening the first frame (e.g. open a connection to an X server).")
...
@@ -1015,7 +1015,7 @@ opening the first frame (e.g. open a connection to an X server).")
debug-on-error-should-be-set
debug-on-error-should-be-set
(debug-on-error-initial
(debug-on-error-initial
(if (eq init-file-debug t) 'startup init-file-debug))
(if (eq init-file-debug t) 'startup init-file-debug))
(orig-enable-multibyte default-enable-multibyte-characters))
(orig-enable-multibyte
(
default-
value '
enable-multibyte-characters))
)
(let ((debug-on-error debug-on-error-initial)
(let ((debug-on-error debug-on-error-initial)
;; This function actually reads the init files.
;; This function actually reads the init files.
(inner
(inner
...
@@ -1125,8 +1125,9 @@ the `--debug-init' option to view a complete error backtrace."
...
@@ -1125,8 +1125,9 @@ the `--debug-init' option to view a complete error backtrace."
debug-on-error-from-init-file debug-on-error)))
debug-on-error-from-init-file debug-on-error)))
(if debug-on-error-should-be-set
(if debug-on-error-should-be-set
(setq debug-on-error debug-on-error-from-init-file))
(setq debug-on-error debug-on-error-from-init-file))
(unless (or default-enable-multibyte-characters
(unless (or (default-value 'enable-multibyte-characters)
(eq orig-enable-multibyte default-enable-multibyte-characters))
(eq orig-enable-multibyte (default-value
'enable-multibyte-characters)))
;; Init file changed to unibyte. Reset existing multibyte
;; Init file changed to unibyte. Reset existing multibyte
;; buffers (probably *scratch*, *Messages*, *Minibuff-0*).
;; buffers (probably *scratch*, *Messages*, *Minibuff-0*).
;; Arguably this should only be done if they're free of
;; Arguably this should only be done if they're free of
...
@@ -1192,7 +1193,7 @@ the `--debug-init' option to view a complete error backtrace."
...
@@ -1192,7 +1193,7 @@ the `--debug-init' option to view a complete error backtrace."
(run-hooks 'after-init-hook)
(run-hooks 'after-init-hook)
;; Decode all default-directory.
;; Decode all default-directory.
(if (and default-enable-multibyte-characters locale-coding-system)
(if (and
(
default-
value '
enable-multibyte-characters
)
locale-coding-system)
(save-excursion
(save-excursion
(dolist (elt (buffer-list))
(dolist (elt (buffer-list))
(set-buffer elt)
(set-buffer elt)
...
...
lisp/tar-mode.el
View file @
597e2240
;;; tar-mode.el --- simple editing of tar files from GNU emacs
;;; tar-mode.el --- simple editing of tar files from GNU emacs
;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Maintainer: FSF
;; Maintainer: FSF
...
@@ -267,7 +268,7 @@ write-date, checksum, link-type, and link-name."
...
@@ -267,7 +268,7 @@ write-date, checksum, link-type, and link-name."
(
setq
name
(
concat
(
substring
string
tar-prefix-offset
(
setq
name
(
concat
(
substring
string
tar-prefix-offset
(
1-
(
match-end
0
)))
(
1-
(
match-end
0
)))
"/"
name
)))
"/"
name
)))
(
if
default-enable-multibyte-characters
(
if
(
default-
value
'
enable-multibyte-characters
)
(
setq
name
(
setq
name
(
decode-coding-string
name
coding
)
(
decode-coding-string
name
coding
)
linkname
linkname
...
@@ -819,7 +820,7 @@ appear on disk when you save the tar-file's buffer."
...
@@ -819,7 +820,7 @@ appear on disk when you save the tar-file's buffer."
(
if
(
or
(
not
coding
)
(
if
(
or
(
not
coding
)
(
eq
(
coding-system-type
coding
)
'undecided
))
(
eq
(
coding-system-type
coding
)
'undecided
))
(
setq
coding
(
detect-coding-region
start
end
t
)))
(
setq
coding
(
detect-coding-region
start
end
t
)))
(
if
(
and
default-enable-multibyte-characters
(
if
(
and
(
default-
value
'
enable-multibyte-characters
)
(
coding-system-get
coding
:for-unibyte
))
(
coding-system-get
coding
:for-unibyte
))
(
with-current-buffer
buffer
(
with-current-buffer
buffer
(
set-buffer-multibyte
nil
)))
(
set-buffer-multibyte
nil
)))
...
...
lisp/w32-fns.el
View file @
597e2240
;;; w32-fns.el --- Lisp routines for Windows NT
;;; w32-fns.el --- Lisp routines for Windows NT
;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008,
;; 200
5, 2006, 2007, 2008, 200
9 Free Software Foundation, Inc.
;; 2009
Free Software Foundation, Inc.
;; Author: Geoff Voelker <voelker@cs.washington.edu>
;; Author: Geoff Voelker <voelker@cs.washington.edu>
;; Keywords: internal
;; Keywords: internal
...
@@ -176,20 +176,20 @@ You should set this to t when using a non-system shell.\n\n"))))
...
@@ -176,20 +176,20 @@ You should set this to t when using a non-system shell.\n\n"))))
;; (and some programs ported from Unix require it) but most will
;; (and some programs ported from Unix require it) but most will
;; produce DOS line endings on output.
;; produce DOS line endings on output.
(
setq
default-process-coding-system
(
setq
default-process-coding-system
(
if
default-enable-multibyte-characters
(
if
(
default-
value
'
enable-multibyte-characters
)
'
(
undecided-dos
.
undecided-unix
)
'
(
undecided-dos
.
undecided-unix
)
'
(
raw-text-dos
.
raw-text-unix
)))
'
(
raw-text-dos
.
raw-text-unix
)))
;; Make cmdproxy default to using DOS line endings for input,
;; Make cmdproxy default to using DOS line endings for input,
;; because some Windows programs (including command.com) require it.
;; because some Windows programs (including command.com) require it.
(
add-to-list
'process-coding-system-alist
(
add-to-list
'process-coding-system-alist
`
(
"[cC][mM][dD][pP][rR][oO][xX][yY]"
`
(
"[cC][mM][dD][pP][rR][oO][xX][yY]"
.
,
(
if
default-enable-multibyte-characters
.
,
(
if
(
default-
value
'
enable-multibyte-characters
)
'
(
undecided-dos
.
undecided-dos
)
'
(
undecided-dos
.
undecided-dos
)
'
(
raw-text-dos
.
raw-text-dos
))))
'
(
raw-text-dos
.
raw-text-dos
))))
;; plink needs DOS input when entering the password.
;; plink needs DOS input when entering the password.
(
add-to-list
'process-coding-system-alist
(
add-to-list
'process-coding-system-alist
`
(
"[pP][lL][iI][nN][kK]"
`
(
"[pP][lL][iI][nN][kK]"
.
,
(
if
default-enable-multibyte-characters
.
,
(
if
(
default-
value
'
enable-multibyte-characters
)
'
(
undecided-dos
.
undecided-dos
)
'
(
undecided-dos
.
undecided-dos
)
'
(
raw-text-dos
.
raw-text-dos
)))))
'
(
raw-text-dos
.
raw-text-dos
)))))
...
...
lisp/x-dnd.el
View file @
597e2240
;;; x-dnd.el --- drag and drop support for X.
;;; x-dnd.el --- drag and drop support for X.
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
;; Maintainer: FSF
;; Maintainer: FSF
...
@@ -263,7 +264,7 @@ STRING is the uri-list as a string. The URIs are separated by \\r\\n."
...
@@ -263,7 +264,7 @@ STRING is the uri-list as a string. The URIs are separated by \\r\\n."
WINDOW is the window where the drop happened.
WINDOW is the window where the drop happened.
STRING is the file names as a string, separated by nulls."
STRING is the file names as a string, separated by nulls."
(
let
((
uri-list
(
split-string
string
"[\0\r\n]"
t
))
(
let
((
uri-list
(
split-string
string
"[\0\r\n]"
t
))
(
coding
(
and
default-enable-multibyte-characters
(
coding
(
and
(
default-
value
'
enable-multibyte-characters
)
(
or
file-name-coding-system
(
or
file-name-coding-system
default-file-name-coding-system
)))
default-file-name-coding-system
)))
retval
)
retval
)
...
...
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