aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-11-21 08:37:31 +0000
committerDan Nicolaescu2007-11-21 08:37:31 +0000
commit99c715160b5a9907fab928095d445ccc580d81d3 (patch)
tree8ff8b9bab04d431fcafc693d5b0bbb1df2c9c8d6
parentb62a39c41d4b2a0f04207449edfb647118ce0568 (diff)
downloademacs-99c715160b5a9907fab928095d445ccc580d81d3.tar.gz
emacs-99c715160b5a9907fab928095d445ccc580d81d3.zip
* frame.el (msdos-mouse-p):
* files.el (msdos-long-file-names, w32-long-file-name) (msdos-long-file-names): * term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data) (mac-resume-apple-event, mac-font-panel-mode) (mac-atsu-font-face-attributes, mac-ae-set-reply-parameter) (mac-clear-font-name-table): * term/pc-win.el (msdos-remember-default-colors) (w16-set-clipboard-data, w16-get-clipboard-data): * term/w32-win.el (w32-send-sys-command, w32-select-font) (set-message-beep): * net/browse-url.el (w32-shell-execute): * dos-fns.el (int86, msdos-long-file-names): * dos-w32.el (default-printer-name): Undo previous change.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/dos-fns.el3
-rw-r--r--lisp/dos-w32.el2
-rw-r--r--lisp/files.el3
-rw-r--r--lisp/frame.el2
-rw-r--r--lisp/net/browse-url.el1
-rw-r--r--lisp/term/mac-win.el8
-rw-r--r--lisp/term/pc-win.el4
-rw-r--r--lisp/term/w32-win.el4
9 files changed, 17 insertions, 27 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31437fb1a38..6a8e8e75186 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
12007-11-21 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * frame.el (msdos-mouse-p):
4 * files.el (msdos-long-file-names, w32-long-file-name)
5 (msdos-long-file-names):
6 * term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data)
7 (mac-resume-apple-event, mac-font-panel-mode)
8 (mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
9 (mac-clear-font-name-table):
10 * term/pc-win.el (msdos-remember-default-colors)
11 (w16-set-clipboard-data, w16-get-clipboard-data):
12 * term/w32-win.el (w32-send-sys-command, w32-select-font)
13 (set-message-beep):
14 * net/browse-url.el (w32-shell-execute):
15 * dos-fns.el (int86, msdos-long-file-names):
16 * dos-w32.el (default-printer-name): Undo previous change.
17
12007-11-21 Eli Zaretskii <eliz@gnu.org> 182007-11-21 Eli Zaretskii <eliz@gnu.org>
2 19
3 * international/mule-cmds.el (set-locale-environment): Set 20 * international/mule-cmds.el (set-locale-environment): Set
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 62b71640017..c66cbc7933a 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -29,9 +29,6 @@
29 29
30;;; Code: 30;;; Code:
31 31
32(declare-function int86) ;; Defined in C.
33(declare-function msdos-long-file-names) ;; Defined in C.
34
35;; This overrides a trivial definition in files.el. 32;; This overrides a trivial definition in files.el.
36(defun convert-standard-filename (filename) 33(defun convert-standard-filename (filename)
37 "Convert a standard file's name to something suitable for the current OS. 34 "Convert a standard file's name to something suitable for the current OS.
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 4b307423fb5..28cab4ccbcb 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -370,8 +370,6 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
370 370
371(defvar printer-name) 371(defvar printer-name)
372 372
373(declare-function default-printer-name) ;; Defined in C.
374
375(defun direct-print-region-function (start end 373(defun direct-print-region-function (start end
376 &optional lpr-prog 374 &optional lpr-prog
377 delete-text buf display 375 delete-text buf display
diff --git a/lisp/files.el b/lisp/files.el
index 7575948b9db..276366a796f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -213,9 +213,6 @@ have fast storage with limited space, such as a RAM disk."
213;; The system null device. (Should reference NULL_DEVICE from C.) 213;; The system null device. (Should reference NULL_DEVICE from C.)
214(defvar null-device "/dev/null" "The system null device.") 214(defvar null-device "/dev/null" "The system null device.")
215 215
216(declare-function msdos-long-file-names) ;; Defined in C.
217(declare-function w32-long-file-name) ;; Defined in C.
218(declare-function msdos-long-file-names) ;; Defined in C.
219(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep)) 216(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
220(declare-function dired-unmark "dired" (arg)) 217(declare-function dired-unmark "dired" (arg))
221(declare-function dired-do-flagged-delete "dired" (&optional nomessage)) 218(declare-function dired-do-flagged-delete "dired" (&optional nomessage))
diff --git a/lisp/frame.el b/lisp/frame.el
index 6e660b1b5e5..1c11829475b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1126,8 +1126,6 @@ bars (top, bottom, or nil)."
1126 "Return the terminal that is now selected." 1126 "Return the terminal that is now selected."
1127 (frame-terminal (selected-frame))) 1127 (frame-terminal (selected-frame)))
1128 1128
1129(declare-function msdos-mouse-p) ;; Defined in C only for on platform.
1130
1131(defun display-mouse-p (&optional display) 1129(defun display-mouse-p (&optional display)
1132 "Return non-nil if DISPLAY has a mouse available. 1130 "Return non-nil if DISPLAY has a mouse available.
1133DISPLAY can be a display name, a frame, or nil (meaning the selected 1131DISPLAY can be a display name, a frame, or nil (meaning the selected
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 977639eec55..523588ec7c2 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -825,7 +825,6 @@ to use."
825;; --- Default MS-Windows browser --- 825;; --- Default MS-Windows browser ---
826 826
827(defvar dos-windows-version) 827(defvar dos-windows-version)
828(declare-function w32-shell-execute) ;; Defined in C.
829 828
830(defun browse-url-default-windows-browser (url &optional new-window) 829(defun browse-url-default-windows-browser (url &optional new-window)
831 (interactive (browse-url-interactive-arg "URL: ")) 830 (interactive (browse-url-interactive-arg "URL: "))
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 050bd04d59e..c84614d2246 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -85,14 +85,6 @@
85(defvar mac-ts-active-input-overlay) 85(defvar mac-ts-active-input-overlay)
86(defvar x-invocation-args) 86(defvar x-invocation-args)
87 87
88(declare-function mac-code-convert-string) ;; Defined in C.
89(declare-function mac-coerce-ae-data) ;; Defined in C.
90(declare-function mac-resume-apple-event) ;; Defined in C.
91(declare-function mac-font-panel-mode) ;; Defined in C.
92(declare-function mac-atsu-font-face-attributes) ;; Defined in C.
93(declare-function mac-ae-set-reply-parameter) ;; Defined in C.
94(declare-function mac-clear-font-name-table) ;; Defined in C.
95
96(defvar x-command-line-resources nil) 88(defvar x-command-line-resources nil)
97 89
98;; Handler for switches of the form "-switch value" or "-switch". 90;; Handler for switches of the form "-switch value" or "-switch".
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index d9ed7385514..ecbda7d9c1e 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -29,10 +29,6 @@
29 29
30(load "term/internal" nil t) 30(load "term/internal" nil t)
31 31
32(declare-function msdos-remember-default-colors) ;; Defined in C.
33(declare-function w16-set-clipboard-data) ;; Defined in C.
34(declare-function w16-get-clipboard-data) ;; Defined in C.
35
36;;; This is copied from etc/rgb.txt, except that some values were changed 32;;; This is copied from etc/rgb.txt, except that some values were changed
37;;; a bit to make them consistent with DOS console colors, and the RGB 33;;; a bit to make them consistent with DOS console colors, and the RGB
38;;; values were scaled up to 16 bits, as `tty-define-color' requires. 34;;; values were scaled up to 16 bits, as `tty-define-color' requires.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7fd84a898fc..b98326dcd3e 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -88,10 +88,6 @@
88(defvar xlfd-regexp-registry-subnum) 88(defvar xlfd-regexp-registry-subnum)
89(defvar w32-color-map) ;; defined in w32fns.c 89(defvar w32-color-map) ;; defined in w32fns.c
90 90
91(declare-function w32-send-sys-command) ;; Defined in C.
92(declare-function w32-select-font) ;; Defined in C.
93(declare-function set-message-beep) ;; Defined in C.
94
95;; Conditional on new-fontset so bootstrapping works on non-GUI compiles 91;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
96(if (fboundp 'new-fontset) 92(if (fboundp 'new-fontset)
97 (require 'fontset)) 93 (require 'fontset))