(syms_of_buffer): Set up Lisp variable buffer-display-time.

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index 6827449649a159603846bfbf90dec7985a074e6f..1a6c02a309c9482a9e1c7ae75ad35079f7a30559 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -212,7 +212,7 @@ struct window
 #define WINDOW_RIGHT_MARGIN(W)                                             \
   (WINDOW_RIGHT_EDGE (W)                                                   \
    - (! FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (W)))         \
-      ? 1                                                                  \
+      ? ((WINDOW_RIGHTMOST_P (W)) ? 0 : 1)                                 \
       : FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (XFRAME (WINDOW_FRAME (W))) \
       ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W)))                  \
       : 0))
@@ -269,7 +269,7 @@ extern Lisp_Object Vmouse_event;
 
 EXFUN (Fnext_window, 3);
 EXFUN (Fselect_window, 1);
-EXFUN (Fdisplay_buffer, 2);
+EXFUN (Fdisplay_buffer, 3);
 EXFUN (Fset_window_buffer, 2);
 extern Lisp_Object make_window P_ ((void));
 extern void delete_window P_ ((Lisp_Object));