aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1991-08-05 22:46:55 +0000
committerJim Blandy1991-08-05 22:46:55 +0000
commit67dbf5b0de22df451a1187766cae66b677d180f2 (patch)
tree8c62be37fa4b7be239be057714b403d69714f152
parent200f684ed77de1b1b366daaf73d4bc95161765dc (diff)
downloademacs-67dbf5b0de22df451a1187766cae66b677d180f2.tar.gz
emacs-67dbf5b0de22df451a1187766cae66b677d180f2.zip
*** empty log message ***
-rw-r--r--lisp/term/x-win.el1
-rw-r--r--src/dired.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 30f5fa9b2e3..99b99c4ef1b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -634,6 +634,7 @@ This returns ARGS with the arguments that have been processed removed."
634;; the display. 634;; the display.
635(set-input-mode t nil t) 635(set-input-mode t nil t)
636 636
637(setq screen-creation-function 'x-create-screen)
637(x-read-resources) 638(x-read-resources)
638(setq command-line-args (x-handle-args command-line-args)) 639(setq command-line-args (x-handle-args command-line-args))
639(x-pop-initial-window) 640(x-pop-initial-window)
diff --git a/src/dired.c b/src/dired.c
index feb68ed0506..0cdc062c699 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -53,7 +53,6 @@ extern struct direct *readdir ();
53#include "commands.h" 53#include "commands.h"
54 54
55#include "regex.h" 55#include "regex.h"
56#include "search.h"
57 56
58#define min(a, b) ((a) < (b) ? (a) : (b)) 57#define min(a, b) ((a) < (b) ? (a) : (b))
59 58