Changeset 1711

Timestamp:

02/17/98 01:45:20 (11 years ago)

Author:

himi

Message:

FSF GNU Emacs 20.3 98/8/21 Release.

Files:

• branches/GNU/src/window.c (modified) (11 diffs)
• branches/GNU/src/window.h (modified) (3 diffs)
• branches/GNU/src/xdisp.c (modified) (2 diffs)
• branches/GNU/src/xfaces.c (modified) (3 diffs)
• branches/GNU/src/xfns.c (modified) (5 diffs)

branches/GNU/src/window.c

@@ -36 +36 @@
-#endif
-
-, Qwindow_configuration_p
+
-
-static struct window *decode_window P_ ((Lisp_Object));
@@ -1308 +1308 @@
-  DELETE_BUFFER_WINDOWS,        /* Arg is buffer */
-  GET_LARGEST_WINDOW,
-
-
+
-};
-
@@ -1376 +1375 @@
-         if that is desired, under the control of frame_arg.  */
-      if (! MINI_WINDOW_P (XWINDOW (w))
-          /* For UNSHOW_BUFFER, we must always consider all windows.  */
-          || type == UNSHOW_BUFFER
-          || (mini && minibuf_level > 0))
-        switch (type)
@@ -1520 +1517 @@
-              }
-            break;
-
-            /* Check for a window that has a killed buffer.  */
-          case CHECK_ALL_WINDOWS:
-            if (! NILP (XWINDOW (w)->buffer)
-                && NILP (XBUFFER (XWINDOW (w)->buffer)->name))
-              abort ();
-          }
-
@@ -1535 +1526 @@
-
-  return best_window;
-}
-
-/* Used for debugging.  Abort if any window has a dead buffer.  */
-
-check_all_windows ()
-{
-  window_loop (CHECK_ALL_WINDOWS, Qnil, 1, Qt);
-}
-
@@ -2397 +2381 @@
-
-                  /* Select the window that was chosen, for running the hook.  */
-
+
+
+
-                  select_window_1 (window, 0);
-                  Fset_buffer (w->buffer);
@@ -3293 +3279 @@
-}
-
-DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0,
-  "Return the frame that CONFIG, a window-configuration object, is about.")
-  (config)
-     Lisp_Object config;
-{
-  register struct save_window_data *data;
-  struct Lisp_Vector *saved_windows;
-
-  if (! WINDOW_CONFIGURATIONP (config))
-    wrong_type_argument (Qwindow_configuration_p, config);
-
-  data = (struct save_window_data *) XVECTOR (config);
-  saved_windows = XVECTOR (data->saved_windows);
-  return XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
-}
-
-DEFUN ("set-window-configuration", Fset_window_configuration,
-  Sset_window_configuration, 1, 1, 0,
-  "Set the configuration of windows and buffers as specified by CONFIGURATION.\n\
-CONFIGURATION must be a value previously returned\n\
-
-
-
-
-
+
+
-     Lisp_Object configuration;
-{
@@ -3328 +3295 @@
-
-  while (!WINDOW_CONFIGURATIONP (configuration))
-
+
+
+
+
-
-  data = (struct save_window_data *) XVECTOR (configuration);
@@ -3560 +3530 @@
-  Vminibuf_scroll_window = data->minibuf_scroll_window;
-
-(FRAME_LIVE_P (f) ? Qt : Qnil)
+Qnil
-}
-
@@ -3887 +3857 @@
-  Qwindowp = intern ("windowp");
-  staticpro (&Qwindowp);
-
-  Qwindow_configuration_p = intern ("window-configuration-p");
-  staticpro (&Qwindow_configuration_p);
-
-  Qwindow_live_p = intern ("window-live-p");
@@ -4095 +4062 @@
-  defsubr (&Smove_to_window_line);
-  defsubr (&Swindow_configuration_p);
-  defsubr (&Swindow_configuration_frame);
-  defsubr (&Sset_window_configuration);
-  defsubr (&Scurrent_window_configuration);

branches/GNU/src/window.h

@@ -140 +140 @@
-    Lisp_Object vertical_scroll_bar;
-
-    /* Some of these
+/* The rest
-    /* Frame coords of point at that time */
-    Lisp_Object last_point_x;
@@ -148 +148 @@
-    Lisp_Object last_mark_x;
-    Lisp_Object last_mark_y;
-
-    /* Number of characters in buffer past bottom of window,
-       as of last redisplay that finished. */
@@ -187 +186 @@
-       must run the redisplay-end-trigger-hook.  */
-    Lisp_Object redisplay_end_trigger;
-    /* Non-nil means don't delete this window for becoming "too small".  */
-    Lisp_Object too_small_ok;
-  };
-

branches/GNU/src/xdisp.c

@@ -336 +336 @@
-            {
-              c = STRING_CHAR (m + i, len - i);
-CHAR_BYTES (c
+XFASTINT (Fchar_bytes (make_number (c))
-              /* Truncate the character to its last byte--we can only hope
-                 the user is happy with the character he gets,
@@ -448 +448 @@
-{
-  int i;
-_BYTE - 1 - this_bol_byte
+ - 1 - this_bol
-  int seen_dots = 0;
-  unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte);

branches/GNU/src/xfaces.c

@@ -163 +163 @@
-#define FACE_DEFAULT (~0)
-
-
+, Qmouse_face
-Lisp_Object Qpixmap_spec_p;
-
@@ -175 +175 @@
-static void merge_face_list ( /* FRAME_PTR, struct face *, Lisp_Object */ );
-
-, Qmouse_face
+
-
-/* Allocating, copying, and comparing struct faces.  */
@@ -1313 +1313 @@
-  Qface = intern ("face");
-  staticpro (&Qface);
+  Qmouse_face = intern ("mouse-face");
+  staticpro (&Qmouse_face);
-  Qpixmap_spec_p = intern ("pixmap-spec-p");
-  staticpro (&Qpixmap_spec_p);

branches/GNU/src/xfns.c

@@ -195 +195 @@
-Lisp_Object Qmouse_color;
-Lisp_Object Qnone;
-Lisp_Object Qouter_window_id;
-Lisp_Object Qparent_id;
-Lisp_Object Qscroll_bar_width;
@@ -266 +265 @@
-  if (NILP (frame))
-    {
-
-
+
-        return FRAME_X_DISPLAY_INFO (selected_frame);
-      else if (x_display_list != 0)
@@ -592 +590 @@
-  fd = openp (Vx_bitmap_file_path, file, "", &found, 0);
-  if (fd < 0)
-    return -1;
-  /* XReadBitmapFile won't handle magic file names.  */
-  if (fd == 0)
-    return -1;
-  close (fd);
@@ -1061 +1056 @@
-  sprintf (buf, "%ld", (long) FRAME_X_WINDOW (f));
-  store_in_alist (alistptr, Qwindow_id,
-           build_string (buf));
-  sprintf (buf, "%ld", (long) FRAME_OUTER_WINDOW (f));
-  store_in_alist (alistptr, Qouter_window_id,
-           build_string (buf));
-  store_in_alist (alistptr, Qicon_name, f->icon_name);
@@ -5295 +5287 @@
-  Qwindow_id = intern ("window-id");
-  staticpro (&Qwindow_id);
-  Qouter_window_id = intern ("outer-window-id");
-  staticpro (&Qouter_window_id);
-  Qx_frame_parameter = intern ("x-frame-parameter");
-  staticpro (&Qx_frame_parameter);