aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2009-03-11 15:59:30 +0000
committerJason Rumney2009-03-11 15:59:30 +0000
commit31358bee6396e0d62653c89bfc0b7ba5cb770d80 (patch)
tree0b0188282e4154f468f1dd45151081028da9d69c
parent4603334027d0b48633eb152c48b64b4b97eac582 (diff)
downloademacs-31358bee6396e0d62653c89bfc0b7ba5cb770d80.tar.gz
emacs-31358bee6396e0d62653c89bfc0b7ba5cb770d80.zip
(w32-initialize-window-system): Don't override
Japanese font settings. (xlfd-regexp-registry-subnum): Remove unused declaration. (w32-drag-n-drop-debug): Comment out unused debug function.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/term/w32-win.el9
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd4d8ef5475..daead11a8d4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * term/w32-win.el (w32-initialize-window-system): Don't override 3 * term/w32-win.el (w32-initialize-window-system): Don't override
4 Japanese font settings. 4 Japanese font settings.
5 (xlfd-regexp-registry-subnum): Remove unused declaration.
6 (w32-drag-n-drop-debug): Comment out unused debug function.
5 7
62009-03-11 Glenn Morris <rgm@gnu.org> 82009-03-11 Glenn Morris <rgm@gnu.org>
7 9
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7555748fee3..da3fab0132a 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -85,7 +85,6 @@
85 (&optional frame exclude-proportional)) 85 (&optional frame exclude-proportional))
86(define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1") 86(define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1")
87 87
88(defvar xlfd-regexp-registry-subnum)
89(defvar w32-color-map) ;; defined in w32fns.c 88(defvar w32-color-map) ;; defined in w32fns.c
90 89
91(declare-function w32-send-sys-command "w32fns.c") 90(declare-function w32-send-sys-command "w32fns.c")
@@ -98,10 +97,10 @@
98;; The following definition is used for debugging scroll bar events. 97;; The following definition is used for debugging scroll bar events.
99;(defun w32-handle-scroll-bar-event (event) (interactive "e") (princ event)) 98;(defun w32-handle-scroll-bar-event (event) (interactive "e") (princ event))
100 99
101(defun w32-drag-n-drop-debug (event) 100;; (defun w32-drag-n-drop-debug (event)
102 "Print the drag-n-drop EVENT in a readable form." 101;; "Print the drag-n-drop EVENT in a readable form."
103 (interactive "e") 102;; (interactive "e")
104 (princ event)) 103;; (princ event))
105 104
106(defun w32-drag-n-drop (event) 105(defun w32-drag-n-drop (event)
107 "Edit the files listed in the drag-n-drop EVENT. 106 "Edit the files listed in the drag-n-drop EVENT.