aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/w32-fns.el64
1 files changed, 32 insertions, 32 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 6303287dee2..003276c5eb1 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -170,7 +170,7 @@ You should set this to t when using a non-system shell.\n\n"))))
170 170
171(add-hook 'after-init-hook 'w32-check-shell-configuration) 171(add-hook 'after-init-hook 'w32-check-shell-configuration)
172 172
173;;; Override setting chosen at startup. 173;; Override setting chosen at startup.
174(defun set-default-process-coding-system () 174(defun set-default-process-coding-system ()
175 ;; Most programs on Windows will accept Unix line endings on input 175 ;; Most programs on Windows will accept Unix line endings on input
176 ;; (and some programs ported from Unix require it) but most will 176 ;; (and some programs ported from Unix require it) but most will
@@ -201,8 +201,8 @@ You should set this to t when using a non-system shell.\n\n"))))
201(defvar w32-valid-locales nil 201(defvar w32-valid-locales nil
202 "List of locale ids known to be supported.") 202 "List of locale ids known to be supported.")
203 203
204;;; This is the brute-force version; an efficient version is now 204;; This is the brute-force version; an efficient version is now
205;;; built-in though. 205;; built-in though.
206(if (not (fboundp 'w32-get-valid-locale-ids)) 206(if (not (fboundp 'w32-get-valid-locale-ids))
207 (defun w32-get-valid-locale-ids () 207 (defun w32-get-valid-locale-ids ()
208 "Return list of all valid Windows locale ids." 208 "Return list of all valid Windows locale ids."
@@ -227,11 +227,11 @@ You should set this to t when using a non-system shell.\n\n"))))
227 (w32-get-locale-info locale) 227 (w32-get-locale-info locale)
228 (w32-get-locale-info locale t)))))) 228 (w32-get-locale-info locale t))))))
229 229
230;;; Setup Info-default-directory-list to include the info directory 230;; Setup Info-default-directory-list to include the info directory
231;;; near where Emacs executable was installed. We used to set INFOPATH, 231;; near where Emacs executable was installed. We used to set INFOPATH,
232;;; but when this is set Info-default-directory-list is ignored. We 232;; but when this is set Info-default-directory-list is ignored. We
233;;; also cannot rely upon what is set in paths.el because they assume 233;; also cannot rely upon what is set in paths.el because they assume
234;;; that configuration during build time is correct for runtime. 234;; that configuration during build time is correct for runtime.
235(defun w32-init-info () 235(defun w32-init-info ()
236 (let* ((instdir (file-name-directory invocation-directory)) 236 (let* ((instdir (file-name-directory invocation-directory))
237 (dir1 (expand-file-name "../info/" instdir)) 237 (dir1 (expand-file-name "../info/" instdir))
@@ -245,20 +245,20 @@ You should set this to t when using a non-system shell.\n\n"))))
245 245
246(add-hook 'before-init-hook 'w32-init-info) 246(add-hook 'before-init-hook 'w32-init-info)
247 247
248;;; The variable source-directory is used to initialize Info-directory-list. 248;; The variable source-directory is used to initialize Info-directory-list.
249;;; However, the common case is that Emacs is being used from a binary 249;; However, the common case is that Emacs is being used from a binary
250;;; distribution, and the value of source-directory is meaningless in that 250;; distribution, and the value of source-directory is meaningless in that
251;;; case. Even worse, source-directory can refer to a directory on a drive 251;; case. Even worse, source-directory can refer to a directory on a drive
252;;; on the build machine that happens to be a removable drive on the user's 252;; on the build machine that happens to be a removable drive on the user's
253;;; machine. When this happens, Emacs tries to access the removable drive 253;; machine. When this happens, Emacs tries to access the removable drive
254;;; and produces the abort/retry/ignore dialog. Since we do not use 254;; and produces the abort/retry/ignore dialog. Since we do not use
255;;; source-directory, set it to something that is a reasonable approximation 255;; source-directory, set it to something that is a reasonable approximation
256;;; on the user's machine. 256;; on the user's machine.
257 257
258;(add-hook 'before-init-hook 258;;(add-hook 'before-init-hook
259; '(lambda () 259;; (lambda ()
260; (setq source-directory (file-name-as-directory 260;; (setq source-directory (file-name-as-directory
261; (expand-file-name ".." exec-directory))))) 261;; (expand-file-name ".." exec-directory)))))
262 262
263(defun convert-standard-filename (filename) 263(defun convert-standard-filename (filename)
264 "Convert a standard file's name to something suitable for the current OS. 264 "Convert a standard file's name to something suitable for the current OS.
@@ -360,12 +360,12 @@ This function is provided for backward compatibility, since
360;; w32-system-coding-system. Use that instead. 360;; w32-system-coding-system. Use that instead.
361(defvaralias 'w32-system-coding-system 'locale-coding-system) 361(defvaralias 'w32-system-coding-system 'locale-coding-system)
362 362
363;;; Set to a system sound if you want a fancy bell. 363;; Set to a system sound if you want a fancy bell.
364(set-message-beep nil) 364(set-message-beep nil)
365 365
366;;; The "Windows" keys on newer keyboards bring up the Start menu 366;; The "Windows" keys on newer keyboards bring up the Start menu
367;;; whether you want it or not - make Emacs ignore these keystrokes 367;; whether you want it or not - make Emacs ignore these keystrokes
368;;; rather than beep. 368;; rather than beep.
369(global-set-key [lwindow] 'ignore) 369(global-set-key [lwindow] 'ignore)
370(global-set-key [rwindow] 'ignore) 370(global-set-key [rwindow] 'ignore)
371 371
@@ -442,13 +442,13 @@ bit output with no translation."
442 442
443;;;; Selections and cut buffers 443;;;; Selections and cut buffers
444 444
445;;; We keep track of the last text selected here, so we can check the 445;; We keep track of the last text selected here, so we can check the
446;;; current selection against it, and avoid passing back our own text 446;; current selection against it, and avoid passing back our own text
447;;; from x-cut-buffer-or-selection-value. 447;; from x-cut-buffer-or-selection-value.
448(defvar x-last-selected-text nil) 448(defvar x-last-selected-text nil)
449 449
450;;; It is said that overlarge strings are slow to put into the cut buffer. 450;; It is said that overlarge strings are slow to put into the cut buffer.
451;;; Note this value is overridden below. 451;; Note this value is overridden below.
452(defvar x-cut-buffer-max 20000 452(defvar x-cut-buffer-max 20000
453 "Max number of characters to put in the cut buffer.") 453 "Max number of characters to put in the cut buffer.")
454 454
@@ -493,7 +493,7 @@ they were unset."
493 493
494(defalias 'x-cut-buffer-or-selection-value 'x-get-selection-value) 494(defalias 'x-cut-buffer-or-selection-value 'x-get-selection-value)
495 495
496;;; Arrange for the kill and yank functions to set and check the clipboard. 496;; Arrange for the kill and yank functions to set and check the clipboard.
497(setq interprogram-cut-function 'x-select-text) 497(setq interprogram-cut-function 'x-select-text)
498(setq interprogram-paste-function 'x-get-selection-value) 498(setq interprogram-paste-function 'x-get-selection-value)
499 499