Changeset 3875

Timestamp:

09/16/05 18:33:32 (3 years ago)

Author:

horiguti

Message:

r3864 fixed the problem partially. Fix it.

Files:

• branches/2.1/lisp/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/lisp/mw32scroll.el (modified) (3 diffs)
• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/indent.c (modified) (2 diffs)

branches/2.1/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-09-16  Kyotaro HORIGUCHI <horiguti@meadowy.org>
+
+        * mw32scroll.el (w32-scroll-bar-drag-1): Bug fix of previous
+        change.  Fixed issue MW137.
+        (w32-scroll-bar-drag): Ditto.
+
-2005-09-10  Kyotaro HORIGUCHI <horiguti@meadowy.org>
-

branches/2.1/lisp/mw32scroll.el

@@ -28 +28 @@
-    (beginning-of-line)
-    (point)))
-
-;; Scroll the window to the proper position for EVENT.
-(defsubst w32-scroll-bar-drag-1 (event)
-  (let* ((start-position (event-start event))
-         (window (nth 0 start-position))
-         (portion-whole (nth 2 start-position)))
-    (save-excursion
-      (set-buffer (window-buffer window))
-      ;; Calculate position relative to the accessible part of the buffer.
-      (goto-char (+ (point-min)
-                    (scroll-bar-scale portion-whole
-                                      (- (point-max) (point-min)))))
-      (vertical-motion 0)
-      (set-window-start window (point)))))
-
-;;; for normal dragging
@@ -61 +47 @@
-      (setq before-scroll
-            (or before-scroll (point))))
-    (w32-scroll-bar-drag-1 event)
-    (save-excursion
-      (set-buffer (window-buffer window))
@@ -73 +58 @@
-                              (nth 2 start-position)
-                              (- (point-max) (point-min)))))
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-               ;; Exit when we get the drag event; store unread-command-events
-               (setq unread-command-events

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2005-09-16  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * indent.c (back-to-previous-visible-line-start): New lisp
+        function.
+
-2005-09-08  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/indent.c

@@ -1975 +1975 @@
-}
-
+#ifdef MEADOW
+DEFUN ("back-to-previous-visible-line-start",
+       Fback_to_previous_visible_line_start, 
+       Sback_to_previous_visible_line_start, 0, 1, 0,
+       "If position is invisible, back to beginning of preveous visible line.")
+  (window)
+     Lisp_Object window;
+{
+  struct window *w;
+  struct it it;
+  struct text_pos pt;
+
+  if (! NILP (window))
+    CHECK_WINDOW (window, 0);
+  else
+    window = selected_window;
+  w = XWINDOW (window);
+
+  SET_TEXT_POS (pt, PT, PT_BYTE);
+  start_display (&it, w, pt);
+  
+  while (it.selective > 0 && IT_CHARPOS (it) > BEGV)
+    {
+      double val;
+      int opt, opt_byte;
+
+      opt = PT;
+      opt_byte = PT_BYTE;
+      SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
+      while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
+        scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0);
+      
+      val = position_indentation (PT_BYTE);
+      SET_PT_BOTH (opt, opt_byte);
+      
+      if (val < (double)it.selective) break;
+
+      /* back to previous line start */
+      IT_CHARPOS (it) = find_next_newline_no_quit (IT_CHARPOS (it) - 1, -1);
+      IT_BYTEPOS (it) = CHAR_TO_BYTE (IT_CHARPOS (it));
+    }
+  SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
+
+  return Qnil;
+}
+#endif /* MEADOW */
+
-DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
-  "Move point to start of the screen line LINES lines down.\n\
@@ -2053 +2100 @@
-  indent_tabs_mode = 1;
-
+#ifdef MEADOW
+  defsubr (&Sback_to_previous_visible_line_start);
+#endif
-  defsubr (&Scurrent_indentation);
-  defsubr (&Sindent_to);