aboutsummaryrefslogtreecommitdiffstats
path: root/src/msdos.c
diff options
context:
space:
mode:
authorMiles Bader2007-05-30 14:40:46 +0000
committerMiles Bader2007-05-30 14:40:46 +0000
commit62390cbfc25653003034b812258be9cfb5f3edee (patch)
tree7ee220bf44a2e65dd80511bced7b77cfa1233b12 /src/msdos.c
parent2d423dd0a720b08c61ee10023554b2a0491f8fae (diff)
parent7a781a5480b9a1f55d28a76e1d1f89aaa2421f97 (diff)
downloademacs-62390cbfc25653003034b812258be9cfb5f3edee.tar.gz
emacs-62390cbfc25653003034b812258be9cfb5f3edee.zip
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 774-780) - Update from CVS - Merge from emacs--rel--22, gnus--rel--5.10 - Merge from emacs--rel--22 - Fix tq.el edge case * emacs--rel--22 (patch 28-32) - Update from CVS * gnus--rel--5.10 (patch 224-225) - Merge from emacs--devo--0, emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-213
Diffstat (limited to 'src/msdos.c')
-rw-r--r--src/msdos.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/msdos.c b/src/msdos.c
index d40aafdcb34..151aec5561d 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1584,7 +1584,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y)
1584 { 1584 {
1585 extern Lisp_Object Qmouse_face; 1585 extern Lisp_Object Qmouse_face;
1586 Lisp_Object mouse_face, overlay, position, *overlay_vec; 1586 Lisp_Object mouse_face, overlay, position, *overlay_vec;
1587 int noverlays, obegv, ozv;; 1587 int noverlays, obegv, ozv;
1588 struct buffer *obuf; 1588 struct buffer *obuf;
1589 1589
1590 /* If we get an out-of-range value, return now; avoid an error. */ 1590 /* If we get an out-of-range value, return now; avoid an error. */
@@ -4071,7 +4071,7 @@ getdefdir (drive, dst)
4071 int drive; 4071 int drive;
4072 char *dst; 4072 char *dst;
4073{ 4073{
4074 char in_path[4], *p = in_path, e = errno;; 4074 char in_path[4], *p = in_path, e = errno;
4075 4075
4076 /* Generate "X:." (when drive is X) or "." (when drive is 0). */ 4076 /* Generate "X:." (when drive is X) or "." (when drive is 0). */
4077 if (drive != 0) 4077 if (drive != 0)